From a28dd09c4eac11ce406525ffd871df7605d5175f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 27 Aug 2009 17:04:48 -0700
Subject: Properly deal with invalid images.  This fixes ticket #611 which
 shows a BMP masquerading as a .jpg causing us to be unable to rebuild resizes
 and thumbnails.  Now if that happens, we discard the file, log it and move
 on.

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

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/simple_uploader.html.php b/modules/gallery/views/simple_uploader.html.php
index 38ac518c..29a0dfe8 100644
--- a/modules/gallery/views/simple_uploader.html.php
+++ b/modules/gallery/views/simple_uploader.html.php
@@ -218,7 +218,7 @@
     var fp = new File_Progress(file);
     switch (error_code) {
     case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
-      fp.set_status("error", "<?= t("Upload error: ") ?>" + message);
+      fp.set_status("error", "<?= t("Upload error: bad image file") ?>");
       break;
     case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
       fp.set_status("error", "<?= t("Upload failed") ?>");
-- 
cgit v1.2.3


From 3d2e36f5b601b5a274efd0c55bf161448409682a Mon Sep 17 00:00:00 2001
From: jhilden <jakobhilden@gmail.com>
Date: Thu, 27 Aug 2009 20:34:42 -0400
Subject: fixed CSS bug in the simple uploader  #629 and improved permissions
 UI to include breadcrumbs (consistent with the uploader dialog)

---
 modules/gallery/views/permissions_browse.html.php | 42 +++++++++++------------
 themes/default/css/screen.css                     | 19 ++++++----
 2 files changed, 34 insertions(+), 27 deletions(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/permissions_browse.html.php b/modules/gallery/views/permissions_browse.html.php
index 888a27f7..f990896c 100644
--- a/modules/gallery/views/permissions_browse.html.php
+++ b/modules/gallery/views/permissions_browse.html.php
@@ -5,8 +5,9 @@
     $.ajax({
       url: form_url.replace("__ITEM__", id),
       success: function(data) {
-        $("div.form").slideUp();
-        $("div#edit-" + id).html(data).slideDown();
+		    $("#gEditPermissionForm").html(data);
+		    $(".active").removeClass("active");
+		    $("#item-" + id).addClass("active");
       }
     });
   }
@@ -18,7 +19,7 @@
       url: action_url.replace("__CMD__", cmd).replace("__GROUP__", group_id).
            replace("__PERM__", perm_id).replace("__ITEM__", item_id),
       success: function(data) {
-        $("div#edit-" + item_id).load(form_url.replace("__ITEM__", item_id));
+        $("#gEditPermissionForm").load(form_url.replace("__ITEM__", item_id));
       }
     });
   }
@@ -31,26 +32,25 @@
     </li>
   </ul>
   <? endif ?>
-  <ul>
+  
+  <p>Edit permissions for album:</p>
+  
+  <ul class="gBreadcrumbs">
     <? foreach ($parents as $parent): ?>
-    <li>
+    <li id="item-<?= $parent->id ?>">
       <a href="javascript:show(<?= $parent->id ?>)">
-        <?= p::clean($parent->title) ?>
+        <?= p::purify($parent->title) ?>
       </a>
-      <div class="form" id="edit-<?= $parent->id ?>"></div>
-      <ul>
-        <? endforeach ?>
-        <li>
-          <a href="javascript:show(<?= $item->id ?>)">
-            <?= p::purify($item->title) ?>
-          </a>
-          <div class="form" id="edit-<?= $item->id ?>">
-            <?= $form ?>
-          </div>
-        </li>
-        <? foreach ($parents as $parent): ?>
-      </ul>
     </li>
+    <? endforeach ?>
+    <li class="active" id="item-<?= $item->id ?>">
+      <a href="javascript:show(<?= $item->id ?>)">
+    	<?= p::purify($item->title) ?></li>
+	  </a>
+	</li>
   </ul>
-  <? endforeach ?>
-</div>
+  
+  <div id="gEditPermissionForm">
+    <?= $form ?>
+  </div>
+</div>
\ No newline at end of file
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 55839c57..ecae2bb2 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -718,7 +718,7 @@ form .gError,
   font-weight: bold;
 }
 
-#gAddPhotos .gBreadcrumbs {
+#gDialog .gBreadcrumbs li {
   font-size: .9em;
 }
 
@@ -901,6 +901,10 @@ form .gError,
   display: none;
 }
 
+#gDialog p {
+	margin: 0;
+}
+
 /* jQuery UI ThemeRoller buttons */
 
 .gButtonLink {
@@ -1001,6 +1005,14 @@ form .gError,
 
 /* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#gEditPermissionForm {
+	clear: both;
+}
+#gEditPermissionForm fieldset {
+	border: 1px solid #cccccc;
+	padding: 0;
+}
+
 #gPermissions .gDenied,
 #gPermissions .gAllowed {
   text-align: center;
@@ -1022,11 +1034,6 @@ form .gError,
   display: inline-block;
 }
 
-#gAddPhotos p {
-  margin: 0;
-  padding: 0;
-}
-
 #gAddPhotosCanvas {
   height: 325px;
   width: 450px;
-- 
cgit v1.2.3