diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2010-07-27 21:35:14 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2010-07-27 21:35:14 -0700 |
| commit | c3a92df6e6ee88c9fd57c3da8a6703d994cb55b2 (patch) | |
| tree | 47c7fbefb7d979bd47ca660cb3f5becbf4f5c75d /modules/organize | |
| parent | c2100d1d2d7d4a5570ed454f5de078d6595de768 (diff) | |
| parent | dd955781aaa9c1ee9e780b6b2c545878a47bbf21 (diff) | |
Merge branch 'master' into dialog
Diffstat (limited to 'modules/organize')
| -rw-r--r--[-rwxr-xr-x] | modules/organize/lib/Gallery3WebClient.swf | bin | 760853 -> 147776 bytes | |||
| -rw-r--r-- | modules/organize/views/organize_dialog.html.php | 22 |
2 files changed, 10 insertions, 12 deletions
diff --git a/modules/organize/lib/Gallery3WebClient.swf b/modules/organize/lib/Gallery3WebClient.swf Binary files differindex e6b70922..40249a73 100755..100644 --- a/modules/organize/lib/Gallery3WebClient.swf +++ b/modules/organize/lib/Gallery3WebClient.swf diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php index 4e8ada80..4cc6385e 100644 --- a/modules/organize/views/organize_dialog.html.php +++ b/modules/organize/views/organize_dialog.html.php @@ -127,16 +127,14 @@ <!-- 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"> - <p> - <?= t("To use the Organize feature, please ensure that Adobe Flash Player version %flash_minimum_version " . - "or greater is installed.", array("flash_minimum_version" => $flash_minimum_version)) ?> - </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 id="flashContent"> + <p> + <?= t("To use the Organize feature, please ensure that Adobe Flash Player version %flash_minimum_version " . + "or greater is installed.", array("flash_minimum_version" => $flash_minimum_version)) ?> + </p> + <a href="http://www.adobe.com/go/getflashplayer"> + <img src="<?= request::protocol() ?>://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" + alt=<?= t("Get Adobe Flash Player")->for_js() ?> /> + </a> + </div> </div> |