Merge branch 'master' of github.com:gallery/gallery3

gallery · Jul 16, 2010 · 5fd1667 · 5fd1667
2 parents 5839506 + bd969a6
commit 5fd1667
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
@@ -88,7 +88,6 @@
 </ul>
 <? endif ?>
 
-<? if (!empty($album)): ?>
 <div>
   <p>
     <?= t("Photos will be uploaded to album: ") ?>
@@ -100,7 +99,6 @@
     <li class="g-active"> <?= html::purify($album->title) ?> </li>
   </ul>
 </div>
-<? endif ?>
 
 <div id="g-add-photos-canvas">
   <button id="g-add-photos-button" class="g-button ui-state-default ui-corner-all" href="#"><?= t("Select photos...") ?></button>

diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
@@ -2,7 +2,7 @@
 <script type="text/javascript" src="<?= url::file("lib/swfobject.js") ?>"></script>
 <style type="text/css" media="screen">
   #flashContent {
-    display:none;
+  //display:none;
   }
 
   .g-organize {
@@ -102,7 +102,7 @@ function getGalleryParameters() {
     For version detection, set to min. required Flash Player version, or 0 (or 0.0.0),
     for no version detection.
   */
-  var swfVersionStr = "0.0.0";
+  var swfVersionStr = "10.0.0";
   /* To use express install, set to playerProductInstall.swf, otherwise the empty string.*/
   var xiSwfUrlStr = "";
   var flashvars = {};
@@ -127,5 +127,14 @@ function getGalleryParameters() {
     <!-- The following spans are placeholders so we can load the hover and active styles for the flex component -->
     <span id="g-organize-hover" /><span id="g-organize-active" />
   <h1 style="display:none"><?= t("Organize :: %name", array("name" => html::purify($album->title))) ?></h1>
-    <div id="flashContent">&nbsp;</div>
+    <div id="flashContent">
+      <p>
+      <?= t("To view the organize dialog ensure that Adobe Flash Player version 10.0.0 or greater is installed.") ?>
+      </p>
+      <script type="text/javascript">
+	var pageHost = ((document.location.protocol == "https:") ? "https://" :	"http://");
+        $("#flashContent").append("<a href='http://www.adobe.com/go/getflashplayer'><img src='"	+ pageHost +
+                                  "www.adobe.com/images/shared/download_buttons/get_flash_player.gif' alt='<?= t("Get Adobe Flash player") ?>' /></a>" );
+     </script>
+</div>
 </div>