From 399c5c21f6da5dc02e55be6d5b453b43ae4cf158 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Wed, 30 Dec 2009 11:47:34 -0800
Subject: Force the 'Select Photos...' button to always be in the center of the
 upload dialog with the flash object overtop of it. Fixes ticket: #908.

---
 modules/gallery/views/form_uploadify.html.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'modules/gallery/views/form_uploadify.html.php')

diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index d856c464..43b73033 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -1,15 +1,19 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <style>
 #g-add-photos-canvas object {
-  left: -50px;
+  height: 33px;
+  left: -60px;
   position: relative;
   z-index: 100;
 }
 #g-add-photos-button {
-  left: 55px;
+  float: left;
+  left: 175px;
+  padding-bottom: .5em;
+  padding-top: .5em;
   position: relative;
-  top: -15px;
-  z-index: -1;
+  width: 110px;
+  z-index: 1;
 }
 </style>
 <script type="text/javascript" src="<?= url::file("lib/swfobject.js") ?>"></script>
@@ -23,7 +27,6 @@
       fileExt: "*.gif;*.jpg;*.jpeg;*.png;*.flv;*.mp4;*.GIF;*.JPG;*.JPEG;*.PNG;*.FLV;*.MP4",
       fileDesc: <?= t("Photos and movies")->for_js() ?>,
       cancelImg: "<?= url::file("lib/uploadify/cancel.png") ?>",
-      buttonText: <?= t("Select photos...")->for_js() ?>,
       simUploadLimit: <?= $simultaneous_upload_limit ?>,
       wmode: "transparent",
       hideButton: true, /* should be true */
@@ -77,7 +80,6 @@
         $("#g-add-photos-status ul").append(
           "<li class=\"g-error\">" + fileObj.name + msg + "</li>");
         $("#g-uploadify" + queueID).remove();
-        //return false;
       },
       onSelect: function(event) {
         if ($("#g-upload-cancel-all").hasClass("ui-state-disabled")) {
@@ -114,7 +116,7 @@
 </div>
 
 <div id="g-add-photos-canvas" style="text-align: center;">
-  <a id="g-add-photos-button" class="ui-corner-all" style="padding-bottom: 1em;" href="#"><?= t("Select photos...") ?></a>
+  <a id="g-add-photos-button" class="ui-corner-all" href="#"><?= t("Select photos...") ?></a>
   <span id="g-uploadify"></span>
 </div>
 <div id="g-add-photos-status" style="text-align: center;">
-- 
cgit v1.2.3


From 1b3d20a0fbb114423bf52ef8fc8b7c7aae150391 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 2 Jan 2010 08:42:06 -0800
Subject: Correct formatting in the uploadify dialog box for safari.

---
 modules/gallery/views/form_uploadify.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery/views/form_uploadify.html.php')

diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 43b73033..f3b9c883 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -115,7 +115,7 @@
   </ul>
 </div>
 
-<div id="g-add-photos-canvas" style="text-align: center;">
+<div id="g-add-photos-canvas" style="text-align: center;clear: both">
   <a id="g-add-photos-button" class="ui-corner-all" href="#"><?= t("Select photos...") ?></a>
   <span id="g-uploadify"></span>
 </div>
-- 
cgit v1.2.3