From 201883101595d5954cf45ffac6e2c376e5ecce35 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 16:39:01 -0700
Subject: 1) Rename "Cancel All" -> "Cancel uploads" to clarify what we're   
 talking about and follow our capitalization standards. 2) Grey out the Done
 button when uploads are in progress. Fixes ticket #1302.

---
 modules/gallery/views/form_uploadify.html.php         | 9 +++++++++
 modules/gallery/views/form_uploadify_buttons.html.php | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/views/form_uploadify.html.php b/modules/gallery/views/form_uploadify.html.php
index 9bd02f9b..96cc0e26 100644
--- a/modules/gallery/views/form_uploadify.html.php
+++ b/modules/gallery/views/form_uploadify.html.php
@@ -21,12 +21,18 @@
         $("#g-upload-cancel-all")
           .addClass("ui-state-disabled")
           .attr("disabled", "disabled");
+        $("#g-upload-done")
+          .removeClass("ui-state-disabled")
+          .attr("disabled", null);
         return true;
       },
       onClearQueue: function(event) {
         $("#g-upload-cancel-all")
           .addClass("ui-state-disabled")
           .attr("disabled", "disabled");
+        $("#g-upload-done")
+          .removeClass("ui-state-disabled")
+          .attr("disabled", null);
         return true;
       },
       onComplete: function(event, queueID, fileObj, response, data) {
@@ -71,6 +77,9 @@
           $("#g-upload-cancel-all")
             .removeClass("ui-state-disabled")
             .attr("disabled", null);
+          $("#g-upload-done")
+            .addClass("ui-state-disabled")
+            .attr("disabled", "disabled");
         }
         return true;
       }
diff --git a/modules/gallery/views/form_uploadify_buttons.html.php b/modules/gallery/views/form_uploadify_buttons.html.php
index d88bb6aa..98729bd7 100644
--- a/modules/gallery/views/form_uploadify_buttons.html.php
+++ b/modules/gallery/views/form_uploadify_buttons.html.php
@@ -4,5 +4,5 @@
   <?= t("Done") ?>
 </button>
 <button id="g-upload-cancel-all" class="ui-state-default ui-corner-all ui-state-disabled" onclick="$('#g-uploadify').uploadifyClearQueue();return false;" disabled="disabled">
-  <?= t("Cancel All") ?>
+  <?= t("Cancel uploads") ?>
 </button>
-- 
cgit v1.2.3


From bc0d5e79cbf02a2b51c196c0105677a316e0c8bc Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 23:09:52 -0700
Subject: Revert "Change the theme option page to display using tabs if the
 site theme has an admin page."

This reverts commit d66c496fb1007bbd0b1640496808000c573d95fd.

Conflicts:

	modules/gallery/helpers/theme.php
	modules/gallery/views/admin_theme_options.html.php
	themes/admin_wind/css/screen.css
---
 .../gallery/controllers/admin_theme_options.php    |  3 +--
 modules/gallery/views/admin_theme_options.html.php | 31 ----------------------
 themes/admin_wind/css/screen.css                   | 20 --------------
 3 files changed, 1 insertion(+), 53 deletions(-)

(limited to 'modules/gallery/views')

diff --git a/modules/gallery/controllers/admin_theme_options.php b/modules/gallery/controllers/admin_theme_options.php
index 58ed723e..57f32f96 100644
--- a/modules/gallery/controllers/admin_theme_options.php
+++ b/modules/gallery/controllers/admin_theme_options.php
@@ -102,8 +102,7 @@ class Admin_Theme_Options_Controller extends Admin_Controller {
 
     module::event("theme_edit_form", $form);
 
-    $group = $form->group("buttons")
-      ->set_attr("style","border: none");
+    $group = $form->group("buttons");
     $group->submit("")->value(t("Save"));
     return $form;
   }
diff --git a/modules/gallery/views/admin_theme_options.html.php b/modules/gallery/views/admin_theme_options.html.php
index b4a90682..e452913e 100644
--- a/modules/gallery/views/admin_theme_options.html.php
+++ b/modules/gallery/views/admin_theme_options.html.php
@@ -1,35 +1,4 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<script type="text/javascript">
-  $("#g-theme-options-form").ready(function() {
-     var contents = $("#g-theme-options-form fieldset:not(:last-child)");
-     if (contents.length > 1) {
-       $("<div id='g-theme-options-form-tabs'>" +
-         "  <ul class='tabnav'></ul>" +
-         "</div>").insertBefore("#g-theme-options-form fieldset:last-child");
-       $(contents).each(function(index) {
-         var text = $("legend", this).text();
-         var tabId = "tab_" + index;
-         var tabContentId = "tab_content_" + index;
-         if (text == "") {
-           text = <?= t("Tab_")->for_js() ?> + index;
-         }
-         $(".tabnav").append(
-           "<li><a id='" + tabId + "' href='#" + tabContentId + "'>" + text + "</a></li>");
-         $("#g-theme-options-form-tabs").append(
-           "<div id='" + tabContentId + "' class='tabdiv'></div>");
-         if ($("li.g-error", this).length > 0) {
-           $("#" + tabId).addClass("g-error");
-         }
-         $("#" + tabContentId).append($("ul", this));
-         $(this).remove();
-       });
-       $("#g-theme-options-form-tabs").tabs({});
-     } else {
-       $("#g-theme-options-form fieldset:first legend").hide();
-     }
-  });
-</script>
-
 <div class="g-block">
   <h1> <?= t("Theme options") ?> </h1>
   <div class="g-block-content">
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 2ea60402..81b1a896 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -399,26 +399,6 @@ th {
   background-color: #FFF;
 }
 
-/* Theme options  ~~~~~~~~~~~~~~~~~~~~~~~~ */
-#g-theme-options-form {
-  border: 1px solid #a6c9e2;
-}
-#g-theme-options-form-tabs {
-  border: none !important;
-}
-#g-theme-options-form fieldset {
-  border: none;
-}
-
-.ui-tabs .ui-tabs-nav li a {
-  padding: 0 1em;
-}
-
-.ui-tabs .ui-tabs-nav li a.g-error {
-  background: none no-repeat scroll 0 0 transparent;
-  color: #FF0000 !important;
-}
-
 /* Language options  ~~~~~~~~~~~~~~~~~~~~~~~~ */
 #g-share-translations-form fieldset {
   border: 0px;
-- 
cgit v1.2.3