From 6e4fe792174dfa15ec38cbec8c07c0fbc124e446 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 17 Oct 2009 16:40:55 -0600
Subject: White space fixes.

---
 modules/tag/views/tag_block.html.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/tag/views/tag_block.html.php b/modules/tag/views/tag_block.html.php
index 8c79b74a..ad36b297 100644
--- a/modules/tag/views/tag_block.html.php
+++ b/modules/tag/views/tag_block.html.php
@@ -6,8 +6,9 @@
       url, {
         max: 30,
         multiple: true,
-          multipleSeparator: ',',
-          cacheLength: 1}
+        multipleSeparator: ',',
+        cacheLength: 1
+      }
     );
   });
 </script>
-- 
cgit v1.2.3


From 08a22f4a39a1dad4b63f1303aa9cb3e758a784f3 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sat, 17 Oct 2009 21:59:53 -0600
Subject: Add tag.css to tag admin page.

---
 modules/tag/helpers/tag_theme.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules')

diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php
index e3743824..ac0dd016 100644
--- a/modules/tag/helpers/tag_theme.php
+++ b/modules/tag/helpers/tag_theme.php
@@ -26,6 +26,7 @@ class tag_theme_Core {
   }
 
   static function admin_head($theme) {
+    $theme->css("tag.css");
     $theme->script("tag.js");
   }
 
-- 
cgit v1.2.3


From c9ccc2461880de141c37c3c7a7df3b26530ce806 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 18 Oct 2009 10:32:08 -0600
Subject: Moved the short_form init function to gallery.common and made it
 jQuery plugin. Dropped gallery.form.js. Applied short forms to server_add and
 tag admin pages. Added tag.css to admin views. Added .g-wide {}.

---
 lib/gallery.common.css                             | 42 +++++++++++
 lib/gallery.common.js                              | 36 ++++++++++
 lib/gallery.form.js                                | 34 ---------
 .../server_add/controllers/admin_server_add.php    |  2 +-
 modules/tag/css/tag.css                            | 34 ++-------
 modules/tag/helpers/tag.php                        |  3 +-
 modules/tag/js/tag.js                              | 33 +++++----
 modules/tag/views/admin_tags.html.php              | 81 +++++++++++-----------
 themes/admin_wind/css/screen.css                   | 50 +------------
 themes/admin_wind/js/ui.init.js                    | 16 ++---
 themes/night_wind/js/ui.init.js                    | 14 ----
 themes/night_wind/views/page.html.php              |  1 -
 themes/wind/css/screen.css                         | 25 ++-----
 themes/wind/js/ui.init.js                          |  5 +-
 themes/wind/views/page.html.php                    |  1 -
 15 files changed, 164 insertions(+), 213 deletions(-)
 delete mode 100644 lib/gallery.form.js

(limited to 'modules')

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 74a9642f..1fe85d46 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -33,6 +33,9 @@
 .g-narrow {
 }
 
+.g-wide {
+}
+
 /** *******************************************************************
  * 3) States and interactions
  **********************************************************************/
@@ -214,9 +217,15 @@ form .g-error {
 }
 
 #g-action-status {
+  margin-bottom: 1em;
   width: 100% !important;
 }
 
+#g-action-status li {
+  padding-top: .4em;
+  padding-bottom: .3em;
+}
+
 #g-site-status li {
   border-bottom: 1px solid #ccc;
   padding: .3em .3em .3em 30px;
@@ -324,3 +333,36 @@ form .g-error {
 #g-dialog .g-cancel {
   margin: .4em 1em;
 }
+
+/* Inline layout (forms, lists) ~~~~~~~~~~ */
+
+.g-short-form label {
+  display: none;
+}
+
+.g-short-form fieldset {
+  border: none;
+  padding: 0 !important;
+}
+
+.g-short-form li {
+  float: left;
+  padding: .4em 0;
+}
+
+.g-short-form input[type="text"] {
+  color: #666;
+  padding: .3em .6em;
+  width: auto;
+}
+
+.g-short-form .g-cancel {
+  display: block;
+  padding: .2em .8em;
+}
+
+/* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */
+
+.rtl .g-short-form li {
+  float: right;
+}
diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index 5721c779..7c52fef0 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -172,4 +172,40 @@
       };
   };
 
+  // Initialize a short form. Short forms may contain only one text input.
+  $.fn.gallery_short_form = function() {
+    return this.each(function(i){
+      var label = $(this).find("label:first");
+      var input = $(this).find("input[type=text]:first");
+      var button = $(this).find("input[type=submit]");
+
+      $(".g-short-form").addClass("ui-helper-clearfix");
+      $(".g-short-form input[type=text]").addClass("ui-corner-left");
+      $(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right");
+
+      // Set the input value equal to label text
+      if (input.val() == "") {
+        input.val(label.html());
+        button.enable(false);
+      }
+
+      // Attach event listeners to the input
+      input.bind("focus", function(e) {
+        // Empty input value if it equals it's label
+        if ($(this).val() == label.html()) {
+          $(this).val("");
+        }
+        button.enable(true);
+      });
+
+      input.bind("blur", function(e){
+        // Reset the input value if it's empty
+        if ($(this).val() == "") {
+          $(this).val(label.html());
+          button.enable(false);
+        }
+      });
+    });
+  };
+
 })(jQuery);
diff --git a/lib/gallery.form.js b/lib/gallery.form.js
deleted file mode 100644
index 77ce3b7d..00000000
--- a/lib/gallery.form.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Initialize a short form. Short forms may contain only one text input.
- *
- * @param form_id string The form's CSS id
- */
-function short_form_init(form_id) {
-  var form = $(form_id);
-  var label = form.find("label:first");
-  var input = form.find("input[type=text]:first");
-  var button = form.find("input[type=submit]");
-
-  // Set the input value equal to label text
-  if (input.val() == "") {
-    input.val(label.html());
-    button.enable(false);
-  }
-
-  // Attach event listeners to the input
-  input.bind("focus", function(e) {
-    // Empty input value if it equals it's label
-    if ($(this).val() == label.html()) {
-      $(this).val("");
-    }
-    button.enable(true);
-  });
-
-  input.bind("blur", function(e){
-    // Reset the input value if it's empty
-    if ($(this).val() == "") {
-      $(this).val(label.html());
-      button.enable(false);
-    }
-  });
-}
diff --git a/modules/server_add/controllers/admin_server_add.php b/modules/server_add/controllers/admin_server_add.php
index 837a2c00..cb71e1f1 100644
--- a/modules/server_add/controllers/admin_server_add.php
+++ b/modules/server_add/controllers/admin_server_add.php
@@ -83,7 +83,7 @@ class Admin_Server_Add_Controller extends Admin_Controller {
 
   private function _get_admin_form() {
     $form = new Forge("admin/server_add/add_path", "", "post",
-                      array("id" => "g-server-add-admin-form"));
+                      array("id" => "g-server-add-admin-form", "class" => "g-short-form g-wide"));
     $add_path = $form->group("add_path");
     $add_path->input("path")->label(t("Path"))->rules("required")
       ->error_messages("not_readable", t("This directory is not readable by the webserver"))
diff --git a/modules/tag/css/tag.css b/modules/tag/css/tag.css
index b718de05..6dfba946 100644
--- a/modules/tag/css/tag.css
+++ b/modules/tag/css/tag.css
@@ -1,3 +1,5 @@
+/* Tag cloud ~~~~~~~~~~~~~~ */
+
 #g-tag-cloud ul {
   font-size: 1.2em;
   text-align: justify;
@@ -75,40 +77,18 @@
 }
 
 #g-tag-admin ul {
-  padding-bottom: .3em;
+  margin-bottom: 2em;
 }
 
 #g-tag-admin li {
-  padding: .1em 0 .2em .3em;
-}
-
-#g-tag-admin .g-column {
-  float: left;
-  width: 200px;
+  padding: .1em 0 .2em 0;
 }
 
-#g-edit-tag-form input {
-  padding: 0 .2em 0 .2em;
-  clear: none;
-  float: left;
-  margin: 0 .2em 0 0;
+#g-rename-tag-form ul {
+  margin-bottom: 0;
 }
 
-#g-edit-tag-form input[type="text"].g-error {
+#g-rename-tag-form input[type="text"].g-error {
   border: 2px solid red;
   background: none;
 }
-
-#g-edit-tag-form input[type="submit"] {
-  height: 25px;
-}
-
-#g-edit-tag-form a, #g-edit-tag-form span {
-  display: block;
-  float: left;
-  padding: .2em .2em 0 .1em;
-}
-
-#g-edit-tag-form span {
-  float: right;
-}
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
index b1d79458..01972a65 100644
--- a/modules/tag/helpers/tag.php
+++ b/modules/tag/helpers/tag.php
@@ -79,7 +79,6 @@ class tag_Core {
     }
   }
 
-
   /**
    * Return all the tags for a given item.
    * @return array
@@ -111,7 +110,7 @@ class tag_Core {
   }
 
   static function get_rename_form($tag) {
-    $form = new Forge("admin/tags/rename/$tag->id", "", "post", array("id" => "g-edit-tag-form", "class" => "g-short-form"));
+    $form = new Forge("admin/tags/rename/$tag->id", "", "post", array("id" => "g-rename-tag-form", "class" => "g-short-form"));
     $group = $form->group("rename_tag")->label(t("Rename Tag"));
     $group->input("name")->label(t("Tag name"))->value($tag->name)->rules("required|length[1,64]");
     $group->inputs["name"]->error_messages("in_use", t("There is already a tag with that name"));
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index 17845272..41fa4d41 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -18,10 +18,10 @@ function ajaxify_tag_form() {
 
 function closeEditInPlaceForms() {
   // closes currently open inplace edit forms
-  if ($("#g-edit-tag-form").length) {
+  if ($("#g-rename-tag-form").length) {
     $("#g-edit-error-message").remove();
-    var li = $("#g-edit-tag-form").parent();
-    $("#g-edit-tag-form").parent().html($("#g-edit-tag-form").parent().data("revert"));
+    var li = $("#g-rename-tag-form").parent();
+    $("#g-rename-tag-form").parent().html($("#g-rename-tag-form").parent().data("revert"));
     li.height("");
     $(".g-editable", li).bind("click", editInPlace);
     $(".g-dialog-link", li).gallery_dialog();
@@ -41,34 +41,37 @@ function editInPlace(element) {
   var tag_name = $(this).html();
   var tag_width = $(this).width();
   $(this).parent().data("revert", $(this).parent().html());
-  var form = '<form id="g-edit-tag-form" method="post" class="g-inline ui-helper-clearfix" ';
+  var form = '<form id="g-rename-tag-form" method="post" class="g-short-form" ';
   form += 'action="' + TAG_RENAME_URL.replace('__ID__', tag_id) + '">';
   form += '<input name="csrf" type="hidden" value="' + csrf_token + '" />';
-  form += '<input id="name" name="name" type="text" class="textbox" value="' +
-          str_replace('"', "&quot;", tag_name) + '" />';
-  form += '<input type="submit" class="submit ui-state-default ui-corner-all" value="' + save_i18n + '" i/>';
-  form += '<a href="#">' + cancel_i18n + '</a>';
+  form += '<ul>';
+  form += '<li><input id="name" name="name" type="text" class="textbox" value="' +
+          str_replace('"', "&quot;", tag_name) + '" /></li>';
+  form += '<li><input type="submit" class="submit ui-state-default" value="' + save_i18n + '" /></li>';
+  form += '<li><a href="#" class="g-cancel">' + cancel_i18n + '</a></li>';
+  form += '</ul>';
   form += '</form>';
 
   // add edit form
   $(this).parent().html(form);
-  $("#g-edit-tag-form #name")
-    .width(tag_width+30)
+  $("#g-rename-tag-form #name")
+    .width(tag_width)
     .focus();
-  //$("#g-edit-tag-form").parent().height( $("#g-edit-tag-form").height() );
-  $("#g-edit-tag-form a").bind("click", closeEditInPlaceForms);
+  $(".g-short-form").gallery_short_form();
+  $("#g-rename-tag-form .g-cancel").bind("click", closeEditInPlaceForms);
 
   ajaxify_editInPlaceForm = function() {
-    $("#g-edit-tag-form").ajaxForm({
+    $("#g-rename-tag-form").ajaxForm({
       dataType: "json",
       success: function(data) {
+    console.log("success");
         if (data.result == "success") {
           closeEditInPlaceForms(); // close form
           $("#g-tag-" + data.tag_id).text(data.new_tagname); // update tagname
-          console.log(data);
           window.location.reload();
         } else if (data.result == "error") {
-          $("#g-edit-tag-form #name")
+    console.log("error");
+          $("#g-rename-tag-form #name")
             .addClass("g-error")
             .focus();
           $("#g-tag-admin").before("<p id=\"g-edit-error-message\" class=\"g-error\">" + data.message + "</p>");
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index edc466bb..7771f7fe 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -14,51 +14,50 @@
   var save_i18n = <?= html::js_string(t("save")->for_html_attr()) ?>;
   var cancel_i18n = <?= html::js_string(t("cancel")->for_html_attr()) ?>;
 </script>
-<div class="g-block">
-  <h2>
-    <?= t("Tag Admin") ?>
-  </h2>
 
-  <? $tags_per_column = $tags->count()/5 ?>
-  <? $column_tag_count = 0 ?>
+<h2>
+  <?= t("Tag Admin") ?>
+</h2>
 
-  <table id="g-tag-admin" class="g-block-content">
-    <caption class="g-understate">
-      <?= t2("There is one tag", "There are %count tags", $tags->count()) ?>
-    </caption>
-    <tr>
-      <td>
-        <? foreach ($tags as $i => $tag): ?>
-          <? $current_letter = strtoupper(mb_substr($tag->name, 0, 1)) ?>
+<? $tags_per_column = $tags->count()/5 ?>
+<? $column_tag_count = 0 ?>
 
-          <? if ($i == 0): /* first letter */ ?>
-            <strong><?= html::clean($current_letter) ?></strong>
-            <ul>
-          <? elseif ($last_letter != $current_letter): /* new letter */ ?>
-            <? if ($column_tag_count > $tags_per_column): /* new column */ ?>
-               </td>
-              <td>
-              <? $column_tag_count = 0 ?>
-            <? endif ?>
+<table id="g-tag-admin">
+  <caption class="g-understate">
+    <?= t2("There is one tag", "There are %count tags", $tags->count()) ?>
+  </caption>
+  <tr>
+    <td>
+      <? foreach ($tags as $i => $tag): ?>
+        <? $current_letter = strtoupper(mb_substr($tag->name, 0, 1)) ?>
 
-            </ul>
-            <strong><?= html::clean($current_letter) ?></strong>
-            <ul>
+        <? if ($i == 0): /* first letter */ ?>
+          <strong><?= html::clean($current_letter) ?></strong>
+          <ul>
+        <? elseif ($last_letter != $current_letter): /* new letter */ ?>
+          <? if ($column_tag_count > $tags_per_column): /* new column */ ?>
+             </td>
+            <td>
+            <? $column_tag_count = 0 ?>
           <? endif ?>
 
-          <li>
-            <span id="g-tag-<?= $tag->id ?>" class="g-editable g-tag-name"><?= html::clean($tag->name) ?></span>
-            <span class="g-understate">(<?= $tag->count ?>)</span>
-            <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
-               class="g-dialog-link g-delete-link g-button">
-                <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
-          </li>
+          </ul>
+          <strong><?= html::clean($current_letter) ?></strong>
+          <ul>
+        <? endif ?>
 
-          <? $column_tag_count++ ?>
-          <? $last_letter = $current_letter ?>
-        <? endforeach /* $tags */ ?>
-        </ul>
-      </td>
-    </tr>
-  </table>
-</div>
+        <li>
+          <span id="g-tag-<?= $tag->id ?>" class="g-editable g-tag-name"><?= html::clean($tag->name) ?></span>
+          <span class="g-understate">(<?= $tag->count ?>)</span>
+          <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
+             class="g-dialog-link g-delete-link g-button">
+              <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
+        </li>
+
+        <? $column_tag_count++ ?>
+        <? $last_letter = $current_letter ?>
+      <? endforeach /* $tags */ ?>
+      </ul>
+    </td>
+  </tr>
+</table>
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 78358e84..1d60d392 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -122,8 +122,7 @@ fieldset {
 }
 
 #g-header fieldset,
-#g-sidebar fieldset,
-.g-short-form fieldset {
+#g-sidebar fieldset {
   border: none;
 }
 
@@ -135,8 +134,7 @@ legend {
 #g-header legend,
 #g-sidebar legend,
 #g-content #g-search-form legend,
-input[type="hidden"],
-.g-short-form label {
+input[type="hidden"] {
   display: none;
 }
 
@@ -298,19 +296,6 @@ tr.g-warning {
   background-color: #fff;
 }
 
-/* Inline layout (forms, lists) ~~~~~~~~~~ */
-
-.g-short-form li {
-  float: left;
-  padding: .4em 0;
-}
-
-.g-short-form input[type="text"] {
-  color: #666;
-  padding: .3em .6em;
-  width: 11em;
-}
-
 /*** ******************************************************************
  * 3) Page layout containers
  *********************************************************************/
@@ -811,36 +796,6 @@ li.g-default-group h4, li.g-default-group .g-user {
   padding: .5em
 }
 
-#g-server-add-admin {
-  margin:auto;
-  text-align: left;
-}
-
-#g-server-add-admin form fieldset {
-  border: medium none;
-}
-
-#g-server-add-admin legend {
-  display: none;
-}
-
-#g-server-add-admin .g-warning {
-  background-color: #FFFF99;
-}
-
-#g-authorized-path {
-  margin: 0 !important;
-  padding: 0.3em 1.5em 0.3em 1em;
-}
-
-#g-server-add-admin #path {
-  width: 80%;
-}
-
-.g-remove-dir:hover {
-  cursor: pointer;
-}
-
 #g-languages-form table {
 	width: 400px;
 	float: left;
@@ -904,7 +859,6 @@ li.g-default-group h4, li.g-default-group .g-user {
 .rtl form ul ul li,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
-.rtl .g-short-form li,
 .rtl #g-content #g-album-grid .g-item,
 .rtl #g-site-admin-menu,
 .rtl .g-pager li,
diff --git a/themes/admin_wind/js/ui.init.js b/themes/admin_wind/js/ui.init.js
index 0954b63c..e0210ce5 100644
--- a/themes/admin_wind/js/ui.init.js
+++ b/themes/admin_wind/js/ui.init.js
@@ -1,5 +1,6 @@
 /**
  * Initialize jQuery UI and Gallery Plugins
+ * @todo Move ui-corner-all assignments to theme admin views
  */
 
 $(document).ready(function(){
@@ -22,6 +23,9 @@ $(document).ready(function(){
   // Initialize modal dialogs
   $(".g-dialog-link").gallery_dialog();
 
+  // Initialize short forms
+  $(".g-short-form").gallery_short_form();
+
   // Initialize ajax links
   $(".g-ajax-link").gallery_ajax();
 
@@ -50,13 +54,7 @@ $(document).ready(function(){
   $(".g-available .g-block").addClass("ui-corner-all");
   $(".g-unavailable").addClass("ui-corner-all");
 
-  // Add hover state for buttons
-  $(".ui-state-default").hover(
-    function() {
-      $(this).addClass("ui-state-hover");
-    },
-    function() {
-      $(this).removeClass("ui-state-hover");
-    }
-  );
+  // Initialize button hover effect
+  $.fn.gallery_hover_init();
+
 });
diff --git a/themes/night_wind/js/ui.init.js b/themes/night_wind/js/ui.init.js
index 27fb9664..bddf50c3 100644
--- a/themes/night_wind/js/ui.init.js
+++ b/themes/night_wind/js/ui.init.js
@@ -29,20 +29,6 @@ $(document).ready(function() {
     $("#g-view-menu a").addClass("ui-icon");
   }
 
-  // Initialize short forms
-  var short_forms = new Array(
-    "#g-quick-search-form",
-    "#g-add-tag-form",
-    "#g-search-form"
-  );
-
-  for (var i in short_forms) {
-    short_form_init(short_forms[i]);
-    $(short_forms[i]).addClass("g-short-form");
-  }
-  $(".g-short-form input[type=text]").addClass("ui-corner-left");
-  $(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right");
-
   // Apply jQuery UI button css to submit inputs
   $("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all");
 
diff --git a/themes/night_wind/views/page.html.php b/themes/night_wind/views/page.html.php
index c8b08129..f5c6b0df 100644
--- a/themes/night_wind/views/page.html.php
+++ b/themes/night_wind/views/page.html.php
@@ -56,7 +56,6 @@
     </script>
     <?= $theme->script("gallery.ajax.js") ?>
     <?= $theme->script("gallery.dialog.js") ?>
-    <?= $theme->script("gallery.form.js") ?>
     <?= $theme->script("superfish/js/superfish.js") ?>
     <?= $theme->script("jquery.localscroll.js") ?>
     <?= $theme->script("ui.init.js") ?>
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 36231b0d..d7eb19e6 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -120,14 +120,18 @@ td {
 
 /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#g-sidebar form {
+  padding-left: 0;
+  padding-right: 0;
+}
+
 fieldset {
   border: 1px solid #ccc;
   padding: .8em 1em !important;
 }
 
 #g-banner fieldset,
-#g-sidebar fieldset,
-.g-short-form fieldset {
+#g-sidebar fieldset {
   border: none;
 }
 
@@ -139,8 +143,7 @@ legend {
 #g-banner legend,
 #g-sidebar legend,
 #g-content #g-search-form legend,
-input[type="hidden"],
-.g-short-form label {
+input[type="hidden"] {
   display: none;
 }
 
@@ -234,19 +237,6 @@ li.g-error select {
   margin-top: 1em;
 }
 
-/* Inline layout (forms, lists) ~~~~~~~~~~ */
-
-.g-short-form li {
-  float: left;
-  padding: .4em 0;
-}
-
-.g-short-form input[type="text"] {
-  color: #666;
-  padding: .3em .6em;
-  width: 11em;
-}
-
 /*** ******************************************************************
  * 3) Page layout containers
  *********************************************************************/
@@ -821,7 +811,6 @@ li.g-error select {
 .rtl form ul ul li,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
-.rtl .g-short-form li,
 .rtl #g-header #g-logo img,
 .rtl #g-content #g-album-grid .g-item,
 .rtl #g-site-menu,
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index e9dd1dd9..0126c36b 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -22,9 +22,10 @@ $(document).ready(function() {
   // Initialize dialogs
   $(".g-dialog-link").gallery_dialog();
 
+  // Initialize short forms
+  $(".g-short-form").gallery_short_form();
+
   // Apply jQuery UI icon, hover, and rounded corner styles
-  $(".g-short-form input[type=text]").addClass("ui-corner-left");
-  $(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right");
   $("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all");
   if ($("#g-view-menu").length) {
     $("#g-view-menu ul").removeClass("g-menu").removeClass("sf-menu");
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index c8b08129..f5c6b0df 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -56,7 +56,6 @@
     </script>
     <?= $theme->script("gallery.ajax.js") ?>
     <?= $theme->script("gallery.dialog.js") ?>
-    <?= $theme->script("gallery.form.js") ?>
     <?= $theme->script("superfish/js/superfish.js") ?>
     <?= $theme->script("jquery.localscroll.js") ?>
     <?= $theme->script("ui.init.js") ?>
-- 
cgit v1.2.3


From 8cd8fa2b99e92af94df7081fc398172eec48ba2a Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 18 Oct 2009 10:53:18 -0600
Subject: Fixed add tag short form layout.

---
 lib/gallery.common.css  |  5 +++++
 modules/tag/css/tag.css | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 1fe85d46..c574279c 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -361,6 +361,11 @@ form .g-error {
   padding: .2em .8em;
 }
 
+#g-sidebar .g-short-form li {
+  padding-left: 0;
+  padding-right: 0;
+}
+
 /* Right to left styles ~~~~~~~~~~~~~~~~~~~~ */
 
 .rtl .g-short-form li {
diff --git a/modules/tag/css/tag.css b/modules/tag/css/tag.css
index 6dfba946..ec16251d 100644
--- a/modules/tag/css/tag.css
+++ b/modules/tag/css/tag.css
@@ -1,4 +1,4 @@
-/* Tag cloud ~~~~~~~~~~~~~~ */
+/* Tag cloud ~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-tag-cloud ul {
   font-size: 1.2em;
@@ -66,7 +66,13 @@
   text-decoration: underline;
 }
 
-/* Tag admin ~~~~~~~~~~~~~~ */
+/* Add tag form ~~~~~~~~~~~~~~~~~~~~ */
+
+#g-sidebar .g-short-form .textbox {
+  width: 11em;
+}
+
+/* Tag admin ~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-tag-admin {
   table-layout: fixed;
-- 
cgit v1.2.3


From 91ab6f161fa1e118418922fbf0a42f1924d7df0e Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 18 Oct 2009 18:01:42 -0600
Subject: Apply g-block and g-block-content, remove hover effect, alternate row
 color.

---
 .../gallery/views/admin_advanced_settings.html.php | 61 ++++++++++++----------
 1 file changed, 32 insertions(+), 29 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/views/admin_advanced_settings.html.php b/modules/gallery/views/admin_advanced_settings.html.php
index 70ecd261..e3ae5f58 100644
--- a/modules/gallery/views/admin_advanced_settings.html.php
+++ b/modules/gallery/views/admin_advanced_settings.html.php
@@ -1,38 +1,41 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-admin-advanced-settings">
+<div id="g-admin-advanced-settings" class="g-block">
   <h1> <?= t("Advanced Settings") ?> </h1>
   <p>
     <?= t("Here are internal Gallery configuration settings.  Most of these settings are accessible elsewhere in the administrative console.") ?>
   </p>
+  
   <ul id="g-action-status" class="g-message-block">
-    <li class="g-warning">
-      <b><?= t("Change these values at your own risk!") ?></b>
-    </li>
+    <li class="g-warning"><?= t("Change these values at your own risk!") ?></li>
   </ul>
 
-  <table>
-    <tr>
-      <th> <?= t("Module") ?> </th>
-      <th> <?= t("Name") ?> </th>
-      <th> <?= t("Value") ?></th>
-    </tr>
-    <? foreach ($vars as $var): ?>
-    <? if ($var->module_name == "gallery" && $var->name == "_cache") continue ?>
-    <tr class="setting">
-      <td> <?= $var->module_name ?> </td>
-      <td> <?= html::clean($var->name) ?> </td>
-      <td>
-        <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . html::clean($var->name)) ?>"
-          class="g-dialog-link"
-          title="<?= t("Edit %var (%module_name)", array("var" => $var->name, "module_name" => $var->module_name))->for_html_attr() ?>">
-          <? if ($var->value): ?>
-          <?= html::clean($var->value) ?>
-          <? else: ?>
-          <i> <?= t("empty") ?> </i>
-          <? endif ?>
-      </a>
-      </td>
-    </tr>
-    <? endforeach ?>
-  </table>
+  <div class="g-block-content">
+    <table>
+      <tr>
+        <th> <?= t("Module") ?> </th>
+        <th> <?= t("Name") ?> </th>
+        <th> <?= t("Value") ?></th>
+      </tr>
+      <? $i = 0; ?>
+      <? foreach ($vars as $var): ?>
+      <? if ($var->module_name == "gallery" && $var->name == "_cache") continue ?>
+      <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
+        <td> <?= $var->module_name ?> </td>
+        <td> <?= html::clean($var->name) ?> </td>
+        <td>
+          <a href="<?= url::site("admin/advanced_settings/edit/$var->module_name/" . html::clean($var->name)) ?>"
+            class="g-dialog-link"
+            title="<?= t("Edit %var (%module_name)", array("var" => $var->name, "module_name" => $var->module_name))->for_html_attr() ?>">
+            <? if ($var->value): ?>
+            <?= html::clean($var->value) ?>
+            <? else: ?>
+            <i> <?= t("empty") ?> </i>
+            <? endif ?>
+        </a>
+        </td>
+      </tr>
+      <? $i++ ?>
+      <? endforeach ?>
+    </table>
+  </div>
 </div>
-- 
cgit v1.2.3


From 5f56cbf997c12ab1aaf14403873fd9dfc33690ef Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 18 Oct 2009 20:22:10 -0600
Subject: Wrap all admin views in g-block and g-block content. This provides
 the means to visually separate the view's title and description from
 everything else. Primary admin view title should always be h1, and only one
 h1 per view. Removed some unused admin CSS id's.

---
 lib/gallery.common.css                             |   5 +
 modules/akismet/views/admin_akismet.html.php       |  15 +-
 modules/comment/views/admin_comments.html.php      | 305 ++++++++---------
 modules/digibug/views/admin_digibug.html.php       |  10 +-
 modules/g2_import/views/admin_g2_import.html.php   | 142 ++++----
 modules/gallery/controllers/admin_languages.php    |   3 +-
 modules/gallery/views/admin_graphics.html.php      |  30 +-
 modules/gallery/views/admin_languages.html.php     | 187 ++++++-----
 modules/gallery/views/admin_maintenance.html.php   | 368 +++++++++++----------
 modules/gallery/views/admin_modules.html.php       |  52 +--
 modules/gallery/views/admin_sidebar.html.php       |  43 +--
 modules/gallery/views/admin_theme_options.html.php |   4 +-
 modules/gallery/views/admin_themes.html.php        | 139 ++++----
 modules/recaptcha/views/admin_recaptcha.html.php   |  44 +--
 modules/server_add/views/admin_server_add.html.php |  21 +-
 modules/tag/js/tag.js                              |   4 +-
 modules/tag/views/admin_tags.html.php              |  83 ++---
 modules/user/views/admin_users.html.php            | 159 ++++-----
 modules/watermark/views/admin_watermarks.html.php  |  58 ++--
 themes/admin_wind/css/screen.css                   |  67 +---
 20 files changed, 871 insertions(+), 868 deletions(-)

(limited to 'modules')

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index c574279c..a700c359 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -31,9 +31,11 @@
  **********************************************************************/
 
 .g-narrow {
+  width: 25%;
 }
 
 .g-wide {
+  width: 100%;
 }
 
 /** *******************************************************************
@@ -107,9 +109,12 @@ form .g-error {
 }
 
 .g-installed {
+  background-color: #eeeeee;
 }
 
 .g-default {
+	background-color: #c5dbec;
+	font-weight: bold;
 }
 
 .g-draggable,
diff --git a/modules/akismet/views/admin_akismet.html.php b/modules/akismet/views/admin_akismet.html.php
index 22c60c97..d273be5b 100644
--- a/modules/akismet/views/admin_akismet.html.php
+++ b/modules/akismet/views/admin_akismet.html.php
@@ -1,17 +1,18 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-admin-akismet">
+<div id="g-admin-akismet" class="g-block">
   <h1> <?= t("Akismet Spam Filtering") ?> </h1>
   <p>
   <?= t("Akismet is a free, automated spam filtering service.  In order to use it, you need to sign up for a <a href=\"%api_key_url\">Wordpress.com API Key</a>, which is also free.  Your comments will be automatically relayed to <a href=\"%akismet_url\">Akismet.com</a> where they'll be scanned for spam.  Spam messages will be flagged accordingly and hidden from your vistors until you approve or delete them.",
         array("api_key_url" => "http://wordpress.com/api-keys",
               "akismet_url" => "http://akismet.com")) ?>
   </p>
+  <div class="g-block-content">
+    <? if ($valid_key): ?>
+    <div class="g-module-status g-success">
+      <?= t("Your API Key is valid.  Your comments will be filtered!") ?>
+    </div>
+    <? endif ?>
 
-  <? if ($valid_key): ?>
-  <div class="g-module-status g-success">
-    <?= t("Your API Key is valid.  Your comments will be filtered!") ?>
+    <?= $form ?>
   </div>
-  <? endif ?>
-
-  <?= $form ?>
 </div>
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 8f719f05..82e071a8 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -34,165 +34,168 @@
   }
 </script>
 
-<div id="g-admin-comments">
+<div id="g-admin-comments" class="g-block">
   <h1> <?= t("Manage Comments") ?> </h1>
 
-  <!-- @todo: Highlight active menu option -->
-  <div id="g-admin-comments-menu" class="ui-helper-clearfix">
-    <?= $menu ?>
-  </div>
+  <div class="g-block-content">
+    <!-- @todo: Highlight active menu option -->
+    <div id="g-admin-comments-menu" class="ui-helper-clearfix">
+      <?= $menu ?>
+    </div>
 
-  <!-- @todo: Remove after setting active option? -->
-  <h2>
-    <? if ($state == "published"): ?>
-    <?= t("Approved Comments") ?>
-    <? elseif ($state == "unpublished"): ?>
-    <?= t("Comments Awaiting Moderation") ?>
-    <? elseif ($state == "spam"): ?>
-    <?= t("Spam Comments") ?>
-    <? elseif ($state == "deleted"): ?>
-    <?= t("Recently Deleted Comments") ?>
-    <? endif ?>
-  </h2>
+    <!-- @todo: Remove after setting active option? -->
+    <h2>
+      <? if ($state == "published"): ?>
+      <?= t("Approved Comments") ?>
+      <? elseif ($state == "unpublished"): ?>
+      <?= t("Comments Awaiting Moderation") ?>
+      <? elseif ($state == "spam"): ?>
+      <?= t("Spam Comments") ?>
+      <? elseif ($state == "deleted"): ?>
+      <?= t("Recently Deleted Comments") ?>
+      <? endif ?>
+    </h2>
 
-  <? if ($state == "spam"): ?>
-  <div>
-    <? $spam_caught = module::get_var("comment", "spam_caught") ?>
-    <? if ($spam_caught > 0): ?>
-    <p>
-      <?= t2("Gallery has caught %count spam for you since you installed spam filtering.",
-             "Gallery has caught %count spam for you since you installed spam filtering.",
-             $spam_caught) ?>
-    </p>
-    <? endif ?>
-    <p>
-      <? if ($counts->spam): ?>
-      <?= t2("There is currently one comment in your spam queue.  You can delete it with a single click, but there is no undo operation so you may want to check the message first to make sure that it really is spam.",
-             "There are currently %count comments in your spam queue.  You can delete them all with a single click, but there is no undo operation so you may want to check the messages first to make sure that they really are spam.  All spam messages will be deleted after 7 days automatically.",
-             $counts->spam) ?>
-    </p>
-    <p>
-      <a href="<?= url::site("admin/comments/delete_all_spam?csrf=$csrf") ?>">
-        <?= t("Delete all spam") ?>
-      </a>
-      <? else: ?>
-      <?= t("Your spam queue is empty!") ?>
+    <? if ($state == "spam"): ?>
+    <div>
+      <? $spam_caught = module::get_var("comment", "spam_caught") ?>
+      <? if ($spam_caught > 0): ?>
+      <p>
+        <?= t2("Gallery has caught %count spam for you since you installed spam filtering.",
+               "Gallery has caught %count spam for you since you installed spam filtering.",
+               $spam_caught) ?>
+      </p>
       <? endif ?>
-    </p>
-  </div>
-  <? endif ?>
+      <p>
+        <? if ($counts->spam): ?>
+        <?= t2("There is currently one comment in your spam queue.  You can delete it with a single click, but there is no undo operation so you may want to check the message first to make sure that it really is spam.",
+               "There are currently %count comments in your spam queue.  You can delete them all with a single click, but there is no undo operation so you may want to check the messages first to make sure that they really are spam.  All spam messages will be deleted after 7 days automatically.",
+               $counts->spam) ?>
+      </p>
+      <p>
+        <a href="<?= url::site("admin/comments/delete_all_spam?csrf=$csrf") ?>">
+          <?= t("Delete all spam") ?>
+        </a>
+        <? else: ?>
+        <?= t("Your spam queue is empty!") ?>
+        <? endif ?>
+      </p>
+    </div>
+    <? endif ?>
 
-  <? if ($state == "deleted"): ?>
-  <div>
-    <p>
-      <?= t("These are messages that have been recently deleted.  They will be permanently erased automatically after 7 days.") ?>
-    </p>
-  </div>
-  <? endif ?>
+    <? if ($state == "deleted"): ?>
+    <div>
+      <p>
+        <?= t("These are messages that have been recently deleted.  They will be permanently erased automatically after 7 days.") ?>
+      </p>
+    </div>
+    <? endif ?>
 
-  <table id="g-admin-comments-list">
-    <tr>
-      <th>
-        <?= t("Author") ?>
-      </th>
-      <th>
-        <?= t("Comment") ?>
-      </th>
-      <th>
-        <?= t("Actions") ?>
-      </th>
-    </tr>
-    <? foreach ($comments as $i => $comment): ?>
-    <tr id="g-comment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
-      <td>
-        <a href="#">
-          <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
-               class="g-avatar"
-               alt="<?= html::clean_attribute($comment->author_name()) ?>"
-               width="40"
-               height="40" />
-        </a>
-        <p><a href="mailto:<?= html::clean_attribute($comment->author_email()) ?>"
-              title="<?= html::clean_attribute($comment->author_email()) ?>"> <?= html::clean($comment->author_name()) ?> </a></p>
-      </td>
-      <td>
-        <div class="g-right">
-          <? $item = $comment->item() ?>
-          <div class="g-item g-photo">
-            <a href="<?= $item->url() ?>">
-              <? if ($item->has_thumb()): ?>
-              <img src="<?= $item->thumb_url() ?>"
-                 alt="<?= html::purify($item->title)->for_html_attr() ?>"
-                 <?= photo::img_dimensions($item->thumb_width, $item->thumb_height, 75) ?>
-              />
-              <? else: ?>
-              <?= t("No thumbnail") ?>
-              <? endif ?>
-            </a>
+    <table id="g-admin-comments-list">
+      <tr>
+        <th>
+          <?= t("Author") ?>
+        </th>
+        <th>
+          <?= t("Comment") ?>
+        </th>
+        <th>
+          <?= t("Actions") ?>
+        </th>
+      </tr>
+      <? foreach ($comments as $i => $comment): ?>
+      <tr id="g-comment-<?= $comment->id ?>" class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
+        <td>
+          <a href="#">
+            <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
+                 class="g-avatar"
+                 alt="<?= html::clean_attribute($comment->author_name()) ?>"
+                 width="40"
+                 height="40" />
+          </a>
+          <p><a href="mailto:<?= html::clean_attribute($comment->author_email()) ?>"
+                title="<?= html::clean_attribute($comment->author_email()) ?>"> <?= html::clean($comment->author_name()) ?> </a></p>
+        </td>
+        <td>
+          <div class="g-right">
+            <? $item = $comment->item() ?>
+            <div class="g-item g-photo">
+              <a href="<?= $item->url() ?>">
+                <? if ($item->has_thumb()): ?>
+                <img src="<?= $item->thumb_url() ?>"
+                   alt="<?= html::purify($item->title)->for_html_attr() ?>"
+                   <?= photo::img_dimensions($item->thumb_width, $item->thumb_height, 75) ?>
+                />
+                <? else: ?>
+                <?= t("No thumbnail") ?>
+                <? endif ?>
+              </a>
+            </div>
           </div>
-        </div>
-        <p><?= gallery::date($comment->created) ?></p>
-           <?= nl2br(html::purify($comment->text)) ?>
-      </td>
-      <td>
-        <ul class="g-buttonset-vertical">
-        <? if ($comment->state != "unpublished"): ?>
-          <li>
-            <a href="javascript:set_state('unpublished',<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-check"></span>
-              <?= t("Unapprove") ?>
-            </a>
-          </li>
-        <? endif ?>
-        <? if ($comment->state != "published"): ?>
-          <li>
-            <a href="javascript:set_state('published',<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-check"></span>
-              <?= t("Approve") ?>
-            </a>
-          </li>
-        <? endif ?>
-        <? if ($comment->state != "spam"): ?>
-          <li>
-            <a href="javascript:set_state('spam',<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-cancel"></span>
-              <?= t("Spam") ?>
-            </a>
-          </li>
-        <? endif ?>
-          <!--
-          <li>
-            <a href="javascript:reply(<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-arrowreturnthick-1-w"></span>
-              <?= t("Reply") ?>
-            </a>
-          </li>
-          <li>
-            <a href="javascript:Edit(<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-pencil"></span>
-              <?= t("Edit") ?>
-            </a>
-          </li>
-          -->
-          <li>
-            <a href="javascript:set_state('deleted',<?=$comment->id?>)"
-                class="g-button ui-state-default ui-icon-left">
-              <span class="ui-icon ui-icon-trash"></span>
-              <?= t("Delete") ?>
-            </a>
-          </li>
-        </ul>
-      </td>
-    </tr>
-    <? endforeach ?>
-  </table>
+          <p><?= gallery::date($comment->created) ?></p>
+             <?= nl2br(html::purify($comment->text)) ?>
+        </td>
+        <td>
+          <ul class="g-buttonset-vertical">
+          <? if ($comment->state != "unpublished"): ?>
+            <li>
+              <a href="javascript:set_state('unpublished',<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-check"></span>
+                <?= t("Unapprove") ?>
+              </a>
+            </li>
+          <? endif ?>
+          <? if ($comment->state != "published"): ?>
+            <li>
+              <a href="javascript:set_state('published',<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-check"></span>
+                <?= t("Approve") ?>
+              </a>
+            </li>
+          <? endif ?>
+          <? if ($comment->state != "spam"): ?>
+            <li>
+              <a href="javascript:set_state('spam',<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-cancel"></span>
+                <?= t("Spam") ?>
+              </a>
+            </li>
+          <? endif ?>
+            <!--
+            <li>
+              <a href="javascript:reply(<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-arrowreturnthick-1-w"></span>
+                <?= t("Reply") ?>
+              </a>
+            </li>
+            <li>
+              <a href="javascript:Edit(<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-pencil"></span>
+                <?= t("Edit") ?>
+              </a>
+            </li>
+            -->
+            <li>
+              <a href="javascript:set_state('deleted',<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-trash"></span>
+                <?= t("Delete") ?>
+              </a>
+            </li>
+          </ul>
+        </td>
+      </tr>
+      <? endforeach ?>
+    </table>
 
-  <div class="g-pager">
-    <?= $pager ?>
+    <div class="g-pager">
+      <?= $pager ?>
+    </div>
+    
   </div>
 </div>
diff --git a/modules/digibug/views/admin_digibug.html.php b/modules/digibug/views/admin_digibug.html.php
index f75adc60..5d07eb68 100644
--- a/modules/digibug/views/admin_digibug.html.php
+++ b/modules/digibug/views/admin_digibug.html.php
@@ -1,18 +1,16 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-admin-digibug">
-  <div class="g-admin-digibug-intro">
-    <img id="Digibug-logo" src="<?= url::file("modules/digibug/images/digibug_logo.png") ?>">
-    <h2> <?= t("Digibug Photo Printing") ?> </h2>
+<div class="g-block">
+  <img src="<?= url::file("modules/digibug/images/digibug_logo.png") ?>" alt="Digibug logo" class="g-right"/>
+  <h1> <?= t("Digibug Photo Printing") ?> </h1>
+  <div class="g-block-content">
     <p>
       <?= t("Turn your photos into a wide variety of prints, gifts and games!") ?>
     </p>
-
     <ul>
       <li class="g-module-status g-success">
         <?= t("You're ready to print photos!") ?>
       </li>
     </ul>
-
     <p>
       <?= t("You don't need an account with Digibug, but if you <a href=\"%signup_url\">register with Digibug</a> and enter your Digibug id in the <a href=\"%advanced_settings_url\">Advanced Settings</a> page you can make money off of your photos!",
           array("signup_url" => "http://www.digibug.com/signup.php",
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index fd8ae63c..e1443aa7 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -1,94 +1,96 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-admin-g2-import">
+<div id="g-admin-g2-import" class="g-block">
   <h1> <?= t("Gallery 2 Import") ?> </h1>
   <p>
     <?= t("Import your Gallery 2 users, photos, movies, comments and tags into your new Gallery 3 installation.") ?>
   </p>
 
-  <div id="g-admin-g2-import-notes">
-    <h2> <?= t("Notes") ?> </h2>
-    <p>
-      <?= t("The import process is a work in progress with some known issues:") ?>
-    </p>
-    <ul>
-      <li>
-        <?= t("Permissions are <b>not imported</b>.  You will have to set them again manually (for now).") ?>
-      </li>
-      <li>
-        <?= t("The only supported image formats are JPG, PNG and GIF.  Other formats will be skipped.") ?>
-      </li>
-      <li>
-        <?= t("The only supported movie formats are FLV and MP4.  Other formats will be skipped.") ?>
-      </li>
-      <li>
-        <?= t("The eAccelerator PHP performance extension is known to cause issues.  If you're using eAccelerator and having problems, please disable it while you do your import.  One way to do that is to put <code>php_value eaccelerator.enable 0</code> in gallery3/.htaccess") ?>
-      </li>
-    </ul>
-  </div>
-  <?= $form ?>
-
-  <? if (g2_import::is_initialized()): ?>
-  <div id="g-admin-g2-import-details">
-    <h2> <?= t("Import") ?> </h2>
-    <ul id="g-action-status" class="g-message-block">
-      <li class="g-success">
-        <?= t("Gallery version %version detected", array("version" => g2_import::version())) ?>
-      </li>
-      <? if ($g2_sizes["thumb"]["size"] && $thumb_size != $g2_sizes["thumb"]["size"]): ?>
-      <li class="g-warning">
-        <?= t("Your most common thumbnail size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
-              array("g2_pixels" => $g2_sizes["thumb"]["size"],
-                    "g3_pixels" => $thumb_size,
-                    "url" => html::mark_clean(url::site("admin/theme_options")))) ?>
-      </li>
-      <? endif ?>
-
-      <? if ($g2_sizes["resize"]["size"] && $resize_size != $g2_sizes["resize"]["size"]): ?>
-      <li class="g-warning">
-        <?= t("Your most common intermediate size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
-            array("g2_pixels" => $g2_sizes["resize"]["size"],
-                  "g3_pixels" => $resize_size,
-                  "url" => html::mark_clean(url::site("admin/theme_options")))) ?>
-      </li>
-      <? endif ?>
-    </ul>
-
-    <div class="g-info">
+  <div class="g-block-content">
+    <div id="g-admin-g2-import-notes">
+      <h2> <?= t("Notes") ?> </h2>
       <p>
-        <?= t("Your Gallery 2 has the following importable data in it") ?>
+        <?= t("The import process is a work in progress with some known issues:") ?>
       </p>
       <ul>
         <li>
-          <?= t2("1 user", "%count users", $g2_stats["users"]) ?>
+          <?= t("Permissions are <b>not imported</b>.  You will have to set them again manually (for now).") ?>
         </li>
         <li>
-          <?= t2("1 group", "%count groups", $g2_stats["groups"]) ?>
+          <?= t("The only supported image formats are JPG, PNG and GIF.  Other formats will be skipped.") ?>
         </li>
         <li>
-          <?= t2("1 album", "%count albums", $g2_stats["albums"]) ?>
+          <?= t("The only supported movie formats are FLV and MP4.  Other formats will be skipped.") ?>
         </li>
         <li>
-          <?= t2("1 photo", "%count photos", $g2_stats["photos"]) ?>
+          <?= t("The eAccelerator PHP performance extension is known to cause issues.  If you're using eAccelerator and having problems, please disable it while you do your import.  One way to do that is to put <code>php_value eaccelerator.enable 0</code> in gallery3/.htaccess") ?>
         </li>
-        <li>
-          <?= t2("1 movie", "%count movies", $g2_stats["movies"]) ?>
+      </ul>
+    </div>
+    <?= $form ?>
+
+    <? if (g2_import::is_initialized()): ?>
+    <div id="g-admin-g2-import-details">
+      <h2> <?= t("Import") ?> </h2>
+      <ul id="g-action-status" class="g-message-block">
+        <li class="g-success">
+          <?= t("Gallery version %version detected", array("version" => g2_import::version())) ?>
         </li>
-        <li>
-          <?= t2("1 comment", "%count comments", $g2_stats["comments"]) ?>
+        <? if ($g2_sizes["thumb"]["size"] && $thumb_size != $g2_sizes["thumb"]["size"]): ?>
+        <li class="g-warning">
+          <?= t("Your most common thumbnail size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
+                array("g2_pixels" => $g2_sizes["thumb"]["size"],
+                      "g3_pixels" => $thumb_size,
+                      "url" => html::mark_clean(url::site("admin/theme_options")))) ?>
         </li>
-        <li>
-          <?= t2("1 tagged photo/movie/album",
-              "%count tagged photos/movies/albums", $g2_stats["tags"]) ?>
+        <? endif ?>
+
+        <? if ($g2_sizes["resize"]["size"] && $resize_size != $g2_sizes["resize"]["size"]): ?>
+        <li class="g-warning">
+          <?= t("Your most common intermediate size in Gallery 2 is %g2_pixels pixels, but your Gallery 3 thumbnail size is set to %g3_pixels pixels. <a href=\"%url\">Using the same value</a> will speed up your import.",
+              array("g2_pixels" => $g2_sizes["resize"]["size"],
+                    "g3_pixels" => $resize_size,
+                    "url" => html::mark_clean(url::site("admin/theme_options")))) ?>
         </li>
+        <? endif ?>
       </ul>
-    </div>
 
-    <p>
-      <a class="g-button g-dialog-link ui-state-default ui-corner-all"
-         href="<?= url::site("admin/maintenance/start/g2_import_task::import?csrf=$csrf") ?>">
-        <?= t("Begin import!") ?>
-      </a>
-    </p>
+      <div class="g-info">
+        <p>
+          <?= t("Your Gallery 2 has the following importable data in it") ?>
+        </p>
+        <ul>
+          <li>
+            <?= t2("1 user", "%count users", $g2_stats["users"]) ?>
+          </li>
+          <li>
+            <?= t2("1 group", "%count groups", $g2_stats["groups"]) ?>
+          </li>
+          <li>
+            <?= t2("1 album", "%count albums", $g2_stats["albums"]) ?>
+          </li>
+          <li>
+            <?= t2("1 photo", "%count photos", $g2_stats["photos"]) ?>
+          </li>
+          <li>
+            <?= t2("1 movie", "%count movies", $g2_stats["movies"]) ?>
+          </li>
+          <li>
+            <?= t2("1 comment", "%count comments", $g2_stats["comments"]) ?>
+          </li>
+          <li>
+            <?= t2("1 tagged photo/movie/album",
+                "%count tagged photos/movies/albums", $g2_stats["tags"]) ?>
+          </li>
+        </ul>
+      </div>
+
+      <p>
+        <a class="g-button g-dialog-link ui-state-default ui-corner-all"
+           href="<?= url::site("admin/maintenance/start/g2_import_task::import?csrf=$csrf") ?>">
+          <?= t("Begin import!") ?>
+        </a>
+      </p>
+    </div>
+    <? endif ?>
   </div>
-  <? endif ?>
 </div>
diff --git a/modules/gallery/controllers/admin_languages.php b/modules/gallery/controllers/admin_languages.php
index 8af1dd85..ccc631c7 100644
--- a/modules/gallery/controllers/admin_languages.php
+++ b/modules/gallery/controllers/admin_languages.php
@@ -112,7 +112,8 @@ class Admin_Languages_Controller extends Admin_Controller {
     $server_link = l10n_client::server_api_key_url();
     $group->input("api_key")
       ->label(empty($api_key)
-              ? t("This is a unique key that will allow you to send translations to the remote server. To get your API key go to %server-link.",
+              ? t("This is a unique key that will allow you to send translations to the remote
+                  server. To get your API key go to %server-link.",
                   array("server-link" => html::mark_clean(html::anchor($server_link))))
               : t("API Key"))
       ->value($api_key)
diff --git a/modules/gallery/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php
index 95d0618c..0f4c0dd8 100644
--- a/modules/gallery/views/admin_graphics.html.php
+++ b/modules/gallery/views/admin_graphics.html.php
@@ -12,26 +12,28 @@
   });
 </script>
 
-<div id="g-admin-graphics">
+<div id="g-admin-graphics" class="g-block ui-helper-clearfix">
   <h1> <?= t("Graphics Settings") ?> </h1>
   <p>
     <?= t("Gallery needs a graphics toolkit in order to manipulate your photos.  Please choose one from the list below.") ?>
   </p>
 
-  <h2> <?= t("Active Toolkit") ?> </h2>
-  <? if ($active == "none"): ?>
-  <?= new View("admin_graphics_none.html") ?>
-  <? else: ?>
-  <?= new View("admin_graphics_$active.html", array("tk" => $tk->$active, "is_active" => true)) ?>
-  <? endif ?>
-
-  <div class="g-available">
-    <h2> <?= t("Available Toolkits") ?> </h2>
-    <? foreach (array_keys((array)$tk) as $id): ?>
-    <? if ($id != $active): ?>
-    <?= new View("admin_graphics_$id.html", array("tk" => $tk->$id, "is_active" => false)) ?>
+  <div class="g-block-content">
+    <h2> <?= t("Active Toolkit") ?> </h2>
+    <? if ($active == "none"): ?>
+    <?= new View("admin_graphics_none.html") ?>
+    <? else: ?>
+    <?= new View("admin_graphics_$active.html", array("tk" => $tk->$active, "is_active" => true)) ?>
     <? endif ?>
-    <? endforeach ?>
+
+    <div class="g-available">
+      <h2> <?= t("Available Toolkits") ?> </h2>
+      <? foreach (array_keys((array)$tk) as $id): ?>
+      <? if ($id != $active): ?>
+      <?= new View("admin_graphics_$id.html", array("tk" => $tk->$id, "is_active" => false)) ?>
+      <? endif ?>
+      <? endforeach ?>
+    </div>
   </div>
 </div>
 
diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index 74f48b76..311672de 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -1,103 +1,112 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-languages">
-  <h1> <?= t("Languages") ?> </h1>
-  <p>
-    <?= t("Install new languages, update installed ones and set the default language for your Gallery.") ?>
-  </p>
+<script type="text/javascript">
+  var old_default_locale = <?= html::js_string($default_locale) ?>;
 
-  <form id="g-languages-form" method="post" action="<?= url::site("admin/languages/save") ?>">
-    <?= access::csrf_form_field() ?>
-    <table>
-      <tr>
-        <th> <?= t("Installed") ?> </th>
-        <th> <?= t("Language") ?> </th>
-        <th> <?= t("Default language") ?> </th>
-      </tr>
-      <? $i = 0 ?>
-      <? foreach ($available_locales as $code => $display_name):  ?>
-      <? if ($i == (count($available_locales)/2)): ?>
-      <table>
-        <tr>
-          <th> <?= t("Installed") ?> </th>
-          <th> <?= t("Language") ?> </th>
-          <th> <?= t("Default language") ?> </th>
-        </tr>
-      <? endif ?>
+  $("input[name='installed_locales[]']").change(function (event) {
+    if (this.checked) {
+      $("input[type='radio'][value='" + this.value + "']").enable();
+    } else {
+      if ($("input[type='radio'][value='" + this.value + "']").selected()) { // if you deselect your default language, switch to some other installed language
+        $("input[type='radio'][value='" + old_default_locale + "']").attr("checked", "checked");
+      }
+      $("input[type='radio'][value='" + this.value + "']").attr("disabled", "disabled");
+    }
+  });
 
-      <tr class="<?= (isset($installed_locales[$code])) ? "installed" : "" ?><?= ($default_locale == $code) ? " default" : "" ?>">
-        <td> <?= form::checkbox("installed_locales[]", $code, isset($installed_locales[$code])) ?> </td>
-        <td> <?= $display_name ?> </td>
-        <td>
-        <?= form::radio("default_locale", $code, ($default_locale == $code), ((isset($installed_locales[$code]))?'':'disabled="disabled"') ) ?>
-        </td>
-      </tr>
-      <? $i++ ?>
+  $("g-languages-form").ajaxForm({
+    dataType: "json",
+    success: function(data) {
+      if (data.result == "success") {
+        el = $('<a href="' + <?= html::js_string(url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf")) ?> + '"></a>'); // this is a little hack to trigger the update_l10n task in a dialog
+        el.gallery_dialog();
+        el.trigger('click');
+      }
+    }
+  });
+</script>
 
-      <? endforeach ?>
-    </table>
-    <input type="submit" value="<?= t("Update languages")->for_html_attr() ?>" />
-  </form>
+<div class="g-block">
+  <h1> <?= t("Languages and Translation") ?> </h1>
 
-  <script type="text/javascript">
-    var old_default_locale = <?= html::js_string($default_locale) ?>;
+  <div class="g-block-content">
 
-    $("input[name='installed_locales[]']").change(function (event) {
-      if (this.checked) {
-        $("input[type='radio'][value='" + this.value + "']").enable();
-      } else {
-        if ($("input[type='radio'][value='" + this.value + "']").selected()) { // if you deselect your default language, switch to some other installed language
-          $("input[type='radio'][value='" + old_default_locale + "']").attr("checked", "checked");
-        }
-        $("input[type='radio'][value='" + this.value + "']").attr("disabled", "disabled");
-      }
-    });
-    
-    $("g-languages-form").ajaxForm({
-      dataType: "json",
-      success: function(data) {
-        if (data.result == "success") {
-          el = $('<a href="' + <?= html::js_string(url::site("admin/maintenance/start/gallery_task::update_l10n?csrf=$csrf")) ?> + '"></a>'); // this is a little hack to trigger the update_l10n task in a dialog
-          el.gallery_dialog();
-          el.trigger('click');
-        }
-      }
-    });
-  </script>
-</div>
-
-<div id="g-translations">
-  <h1> <?= t("Translations") ?> </h1>
-  <p>
-    <?= t("Create your own translations and share them with the rest of the Gallery community.") ?>
-  </p>
+    <div id="g-languages" class="g-block">
+      <h2> <?= t("Languages") ?> </h2>
+      <p>
+        <?= t("Install new languages, update installed ones and set the default language for your Gallery.") ?>
+      </p>
 
-  <h3><?= t("Translating Gallery") ?></h3>
+      <div class="g-block-content ui-helper-clearfix">
+        <form id="g-languages-form" method="post" action="<?= url::site("admin/languages/save") ?>">
+          <?= access::csrf_form_field() ?>
+          <table class="g-left">
+            <tr>
+              <th> <?= t("Installed") ?> </th>
+              <th> <?= t("Language") ?> </th>
+              <th> <?= t("Default language") ?> </th>
+            </tr>
+            <? $i = 0 ?>
+            <? foreach ($available_locales as $code => $display_name):  ?>
+            <? if ($i == (count($available_locales)/2)): ?>
+            <table>
+              <tr>
+                <th> <?= t("Installed") ?> </th>
+                <th> <?= t("Language") ?> </th>
+                <th> <?= t("Default language") ?> </th>
+              </tr>
+            <? endif ?>
+            <tr class="<?= (isset($installed_locales[$code])) ? "g-installed" : "" ?><?= ($default_locale == $code) ? " g-default" : "" ?>">
+              <td> <?= form::checkbox("installed_locales[]", $code, isset($installed_locales[$code])) ?> </td>
+              <td> <?= $display_name ?> </td>
+              <td>
+              <?= form::radio("default_locale", $code, ($default_locale == $code), ((isset($installed_locales[$code]))?'':'disabled="disabled"') ) ?>
+              </td>
+            </tr>
+            <? $i++ ?>
+            <? endforeach ?>
+          </table>
+          <input type="submit" value="<?= t("Update languages")->for_html_attr() ?>" />
+        </form>
+      </div>
+    </div>
 
-  <div class="g-block">
-    <a href="http://codex.gallery2.org/Gallery3:Localization" target="_blank"
-       class="g-doc-link ui-state-default ui-corner-all ui-icon ui-icon-help"
-       title="<?= t("Localization documentation")->for_html_attr() ?>">
-      <?= t("Localization documentation") ?>
-    </a>
+    <div id="g-translations" class="g-block">
+      <h2> <?= t("Translations") ?> </h2>
+      <p>
+        <?= t("Create your own translations and share them with the rest of the Gallery community.") ?>
+      </p>
 
-    <p><?= t("<strong>Step 1:</strong> Make sure the target language is installed and up to date (check above).") ?></p>
+      <div class="g-block-content">
+        <a href="http://codex.gallery2.org/Gallery3:Localization" target="_blank"
+            class="g-right ui-state-default ui-corner-all ui-icon ui-icon-help"
+            title="<?= t("Localization documentation")->for_html_attr() ?>">
+          <?= t("Localization documentation") ?>
+        </a>
 
-    <p><?= t("<strong>Step 2:</strong> Make sure you have selected the right  target language (currently %default_locale).",
-             array("default_locale" => locales::display_name())) ?></p>
+        <h3><?= t("Translating Gallery") ?></h3>
 
-    <p><?= t("<strong>Step 3:</strong> Start the translation mode and the translation interface will appear at the bottom of each Gallery page.") ?></p>
+        <p><?= t("Follow these steps to begin translating Gallery.") ?></p>
 
-    <a href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>"
-       class="g-button ui-state-default ui-corner-all ui-icon-left">
-      <span class="ui-icon ui-icon-power"></span>
-      <? if (Session::instance()->get("l10n_mode", false)): ?>
-      <?= t("Stop translation mode") ?>
-      <? else: ?>
-      <?= t("Start translation mode") ?>
-      <? endif ?>
-   </a>
-</div>
+        <ul>
+          <li><?= t("Make sure the target language is installed and up to date (check above).") ?></li>
+          <li><?= t("Make sure you have selected the right target language (currently %default_locale).",
+               array("default_locale" => locales::display_name())) ?></li>
+          <li><?= t("Start the translation mode and the translation interface will appear at the bottom of each Gallery page.") ?></li>
+        </ul>
+        <a href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>"
+           class="g-button ui-state-default ui-corner-all ui-icon-left">
+          <span class="ui-icon ui-icon-power"></span>
+          <? if (Session::instance()->get("l10n_mode", false)): ?>
+          <?= t("Stop translation mode") ?>
+          <? else: ?>
+          <?= t("Start translation mode") ?>
+          <? endif ?>
+        </a>
 
-<h3><?= t("Sharing your translations") ?></h3>
-  <?= $share_translations_form ?>
+        <h3><?= t("Sharing your translations") ?></h3>
+        <?= $share_translations_form ?>
+      </div>
+    </div>
+    
+  </div>
 </div>
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index 94582dc8..73a4bef8 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -1,193 +1,195 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-admin-maintenance">
+<div id="g-admin-maintenance" class="g-block">
   <h1> <?= t("Maintenance Tasks") ?> </h1>
   <p>
     <?= t("Occasionally your Gallery will require some maintenance.  Here are some tasks you can use to keep it running smoothly.") ?>
   </p>
 
-  <div id="g-available-tasks">
-    <h2> <?= t("Available Tasks") ?> </h2>
-    <table>
-      <tr>
-        <th>
-          <?= t("Name") ?>
-        </th>
-        <th>
-          <?= t("Description") ?>
-        </th>
-        <th>
-          <?= t("Action") ?>
-        </th>
-      </tr>
-      <? $i = 0; ?>
-      <? foreach ($task_definitions as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= log::severity_class($task->severity) ?>">
-        <td class="<?= log::severity_class($task->severity) ?>">
-          <?= $task->name ?>
-        </td>
-        <td>
-          <?= $task->description ?>
-        </td>
-        <td>
-          <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>"
-            class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all">
-            <?= t("run") ?>
-          </a>
-        </td>
-      </tr>
-      <? $i++ ?>
-      <? endforeach ?>
-    </table>
-  </div>
-
-  <? if ($running_tasks->count()): ?>
-  <div id="g-running-tasks">
-    <h2> <?= t("Running Tasks") ?> </h2>
-    <table>
-      <tr>
-        <th>
-          <?= t("Last Updated") ?>
-        </th>
-        <th>
-          <?= t("Name") ?>
-        </th>
-        <th>
-          <?= t("Status") ?>
-        </th>
-        <th>
-          <?= t("Info") ?>
-        </th>
-        <th>
-          <?= t("Owner") ?>
-        </th>
-        <th>
-          <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
-             class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
-            <?= t("cancel all") ?></a>
-          <?= t("Action") ?>
-        </th>
-      </tr>
-      <? $i = 0; ?>
-      <? foreach ($running_tasks as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "stalled" ? "g-warning" : "" ?>">
-        <td class="<?= $task->state == "stalled" ? "g-warning" : "" ?>">
-          <?= gallery::date_time($task->updated) ?>
-        </td>
-        <td>
-          <?= $task->name ?>
-        </td>
-        <td>
-          <? if ($task->done): ?>
-          <? if ($task->state == "cancelled"): ?>
-          <?= t("Cancelled") ?>
-          <? endif ?>
-          <?= t("Close") ?>
-          <? elseif ($task->state == "stalled"): ?>
-          <?= t("Stalled") ?>
-          <? else: ?>
-          <?= t("%percent_complete% Complete", array("percent_complete" => $task->percent_complete)) ?>
-          <? endif ?>
-        </td>
-        <td>
-          <?= $task->status ?>
-        </td>
-        <td>
-          <?= html::clean($task->owner()->name) ?>
-        </td>
-        <td>
-          <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>"
-             class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
-            <?= t("cancel") ?>
-          </a>
-          <? if ($task->state == "stalled"): ?>
-          <a class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"
-             href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>">
-            <?= t("resume") ?>
-          </a>
-          <? endif ?>
-        </td>
-      </tr>
-      <? $i++ ?>
-      <? endforeach ?>
-    </table>
-  </div>
-  <? endif ?>
+  <div class="g-block-content">
+    <div id="g-available-tasks">
+      <h2> <?= t("Available Tasks") ?> </h2>
+      <table>
+        <tr>
+          <th>
+            <?= t("Name") ?>
+          </th>
+          <th>
+            <?= t("Description") ?>
+          </th>
+          <th>
+            <?= t("Action") ?>
+          </th>
+        </tr>
+        <? $i = 0; ?>
+        <? foreach ($task_definitions as $task): ?>
+        <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= log::severity_class($task->severity) ?>">
+          <td class="<?= log::severity_class($task->severity) ?>">
+            <?= $task->name ?>
+          </td>
+          <td>
+            <?= $task->description ?>
+          </td>
+          <td>
+            <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>"
+              class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all">
+              <?= t("run") ?>
+            </a>
+          </td>
+        </tr>
+        <? $i++ ?>
+        <? endforeach ?>
+      </table>
+    </div>
 
-  <? if ($finished_tasks->count()): ?>
-  <div id="g-finished-tasks">
-    <h2> <?= t("Finished Tasks") ?> </h2>
-    <table>
-      <tr>
-        <th>
-          <?= t("Last Updated") ?>
-        </th>
-        <th>
-          <?= t("Name") ?>
-        </th>
-        <th>
-          <?= t("Status") ?>
-        </th>
-        <th>
-          <?= t("Info") ?>
-        </th>
-        <th>
-          <?= t("Owner") ?>
-        </th>
-        <th>
-          <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
+    <? if ($running_tasks->count()): ?>
+    <div id="g-running-tasks">
+      <h2> <?= t("Running Tasks") ?> </h2>
+      <table>
+        <tr>
+          <th>
+            <?= t("Last Updated") ?>
+          </th>
+          <th>
+            <?= t("Name") ?>
+          </th>
+          <th>
+            <?= t("Status") ?>
+          </th>
+          <th>
+            <?= t("Info") ?>
+          </th>
+          <th>
+            <?= t("Owner") ?>
+          </th>
+          <th>
+            <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
                class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
-             <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
-          <?= t("Action") ?>
-        </th>
-      </tr>
-      <? $i = 0; ?>
-      <? foreach ($finished_tasks as $task): ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "success" ? "g-success" : "g-error" ?>">
-        <td class="<?= $task->state == "success" ? "g-success" : "g-error" ?>">
-          <?= gallery::date_time($task->updated) ?>
-        </td>
-        <td>
-          <?= $task->name ?>
-        </td>
-        <td>
-          <? if ($task->state == "success"): ?>
-          <?= t("Success") ?>
-          <? elseif ($task->state == "error"): ?>
-          <?= t("Failed") ?>
-          <? elseif ($task->state == "cancelled"): ?>
-          <?= t("Cancelled") ?>
-          <? endif ?>
-        </td>
-        <td>
-          <?= $task->status ?>
-        </td>
-        <td>
-          <?= html::clean($task->owner()->name) ?>
-        </td>
-        <td>
-          <? if ($task->done): ?>
-          <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all">
-            <?= t("remove") ?>
-          </a>
-          <? if ($task->get_log()): ?>
-          <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="g-dialog-link g-button ui-state-default ui-corner-all">
-            <?= t("browse log") ?>
-          </a>
-          <? endif ?>
-          <? else: ?>
-          <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="g-dialog-link g-button" ui-state-default ui-corner-all>
-            <?= t("resume") ?>
-          </a>
-          <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all">
-            <?= t("cancel") ?>
-          </a>
-          <? endif ?>
-          </ul>
-        </td>
-      </tr>
-      <? endforeach ?>
-      <? $i++ ?>
-    </table>
+              <?= t("cancel all") ?></a>
+            <?= t("Action") ?>
+          </th>
+        </tr>
+        <? $i = 0; ?>
+        <? foreach ($running_tasks as $task): ?>
+        <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "stalled" ? "g-warning" : "" ?>">
+          <td class="<?= $task->state == "stalled" ? "g-warning" : "" ?>">
+            <?= gallery::date_time($task->updated) ?>
+          </td>
+          <td>
+            <?= $task->name ?>
+          </td>
+          <td>
+            <? if ($task->done): ?>
+            <? if ($task->state == "cancelled"): ?>
+            <?= t("Cancelled") ?>
+            <? endif ?>
+            <?= t("Close") ?>
+            <? elseif ($task->state == "stalled"): ?>
+            <?= t("Stalled") ?>
+            <? else: ?>
+            <?= t("%percent_complete% Complete", array("percent_complete" => $task->percent_complete)) ?>
+            <? endif ?>
+          </td>
+          <td>
+            <?= $task->status ?>
+          </td>
+          <td>
+            <?= html::clean($task->owner()->name) ?>
+          </td>
+          <td>
+            <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>"
+               class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
+              <?= t("cancel") ?>
+            </a>
+            <? if ($task->state == "stalled"): ?>
+            <a class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"
+               href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>">
+              <?= t("resume") ?>
+            </a>
+            <? endif ?>
+          </td>
+        </tr>
+        <? $i++ ?>
+        <? endforeach ?>
+      </table>
+    </div>
+    <? endif ?>
+
+    <? if ($finished_tasks->count()): ?>
+    <div id="g-finished-tasks">
+      <h2> <?= t("Finished Tasks") ?> </h2>
+      <table>
+        <tr>
+          <th>
+            <?= t("Last Updated") ?>
+          </th>
+          <th>
+            <?= t("Name") ?>
+          </th>
+          <th>
+            <?= t("Status") ?>
+          </th>
+          <th>
+            <?= t("Info") ?>
+          </th>
+          <th>
+            <?= t("Owner") ?>
+          </th>
+          <th>
+            <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
+                 class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
+               <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
+            <?= t("Action") ?>
+          </th>
+        </tr>
+        <? $i = 0; ?>
+        <? foreach ($finished_tasks as $task): ?>
+        <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?> <?= $task->state == "success" ? "g-success" : "g-error" ?>">
+          <td class="<?= $task->state == "success" ? "g-success" : "g-error" ?>">
+            <?= gallery::date_time($task->updated) ?>
+          </td>
+          <td>
+            <?= $task->name ?>
+          </td>
+          <td>
+            <? if ($task->state == "success"): ?>
+            <?= t("Success") ?>
+            <? elseif ($task->state == "error"): ?>
+            <?= t("Failed") ?>
+            <? elseif ($task->state == "cancelled"): ?>
+            <?= t("Cancelled") ?>
+            <? endif ?>
+          </td>
+          <td>
+            <?= $task->status ?>
+          </td>
+          <td>
+            <?= html::clean($task->owner()->name) ?>
+          </td>
+          <td>
+            <? if ($task->done): ?>
+            <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all">
+              <?= t("remove") ?>
+            </a>
+            <? if ($task->get_log()): ?>
+            <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="g-dialog-link g-button ui-state-default ui-corner-all">
+              <?= t("browse log") ?>
+            </a>
+            <? endif ?>
+            <? else: ?>
+            <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="g-dialog-link g-button" ui-state-default ui-corner-all>
+              <?= t("resume") ?>
+            </a>
+            <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all">
+              <?= t("cancel") ?>
+            </a>
+            <? endif ?>
+            </ul>
+          </td>
+        </tr>
+        <? endforeach ?>
+        <? $i++ ?>
+      </table>
+    </div>
+    <? endif ?>
   </div>
-  <? endif ?>
 </div>
diff --git a/modules/gallery/views/admin_modules.html.php b/modules/gallery/views/admin_modules.html.php
index 75f4f0c5..4c4976f8 100644
--- a/modules/gallery/views/admin_modules.html.php
+++ b/modules/gallery/views/admin_modules.html.php
@@ -1,32 +1,34 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-modules">
+<div class="g-block ui-helper-clearfix">
   <h1> <?= t("Gallery Modules") ?> </h1>
   <p>
     <?= t("Power up your Gallery by adding more modules! Each module provides new cool features.") ?>
   </p>
 
-  <form method="post" action="<?= url::site("admin/modules/save") ?>">
-    <?= access::csrf_form_field() ?>
-    <table>
-      <tr>
-        <th> <?= t("Installed") ?> </th>
-        <th> <?= t("Name") ?> </th>
-        <th> <?= t("Version") ?> </th>
-        <th> <?= t("Description") ?> </th>
-      </tr>
-      <? $i = 0 ?>
-      <? foreach ($available as $module_name => $module_info):  ?>
-      <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
-        <? $data = array("name" => $module_name); ?>
-        <? if ($module_info->locked) $data["disabled"] = 1; ?>
-        <td> <?= form::checkbox($data, '1', module::is_active($module_name)) ?> </td>
-        <td> <?= t($module_info->name) ?> </td>
-        <td> <?= $module_info->version ?> </td>
-        <td> <?= t($module_info->description) ?> </td>
-      </tr>
-      <? $i++ ?>
-      <? endforeach ?>
-    </table>
-    <input type="submit" value="<?= t("Update")->for_html_attr() ?>"/>
-  </form>
+  <div class="g-block-content">
+    <form method="post" action="<?= url::site("admin/modules/save") ?>">
+      <?= access::csrf_form_field() ?>
+      <table>
+        <tr>
+          <th> <?= t("Installed") ?> </th>
+          <th> <?= t("Name") ?> </th>
+          <th> <?= t("Version") ?> </th>
+          <th> <?= t("Description") ?> </th>
+        </tr>
+        <? $i = 0 ?>
+        <? foreach ($available as $module_name => $module_info):  ?>
+        <tr class="<?= ($i % 2 == 0) ? "g-odd" : "g-even" ?>">
+          <? $data = array("name" => $module_name); ?>
+          <? if ($module_info->locked) $data["disabled"] = 1; ?>
+          <td> <?= form::checkbox($data, '1', module::is_active($module_name)) ?> </td>
+          <td> <?= t($module_info->name) ?> </td>
+          <td> <?= $module_info->version ?> </td>
+          <td> <?= t($module_info->description) ?> </td>
+        </tr>
+        <? $i++ ?>
+        <? endforeach ?>
+      </table>
+      <input type="submit" value="<?= t("Update")->for_html_attr() ?>" />
+    </form>
+  </div>
 </div>
diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php
index b4f339ae..ea950b54 100644
--- a/modules/gallery/views/admin_sidebar.html.php
+++ b/modules/gallery/views/admin_sidebar.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   $(function() {
-    $(".g-admin-blocks-list ul").sortable({
+    $(".g-blocks-list ul").sortable({
       connectWith: ".g-sortable-blocks",
       opacity: .7,
       placeholder: "g-target",
@@ -11,7 +11,7 @@
           $("ul#g-active-blocks li").each(function(i) {
             active_blocks += "&block["+i+"]="+$(this).attr("ref");
           });
-          $.getJSON($("#g-site-blocks").attr("ref").replace("__ACTIVE__", active_blocks), function(data) {
+          $.getJSON($("#g-admin-blocks").attr("ref").replace("__ACTIVE__", active_blocks), function(data) {
             if (data.result == "success") {
               $("ul#g-available-blocks").html(data.available);
               $("ul#g-active-blocks").html(data.active);
@@ -22,25 +22,28 @@
     }).disableSelection();
   });
 </script>
-<h1> <?= t("Manage Sidebar") ?> </h1>
-<p>
-  <?= t("Select and drag blocks from the available column to the active column to add to the sidebar; remove by dragging the other way.") ?>
-</p>
-    <div id="g-site-blocks" ref="<?= url::site("admin/sidebar/update?csrf={$csrf}__ACTIVE__") ?>">
-  <div class="g-admin-blocks-list">
-    <div><h3><?= t("Available Blocks") ?></h3></div>
-    <div>
-      <ul id="g-available-blocks" class="g-sortable-blocks">
-      <?= $available ?>
-      </ul>
+<div class="g-block">
+  <h1> <?= t("Manage Sidebar") ?> </h1>
+  <p>
+    <?= t("Select and drag blocks from the available column to the active column to add to the sidebar; remove by dragging the other way.") ?>
+  </p>
+
+  <div id="g-admin-blocks" class="g-block-content ui-helper-clearfix" ref="<?= url::site("admin/sidebar/update?csrf={$csrf}__ACTIVE__") ?>">
+    <div class="g-block g-left">
+      <h3><?= t("Available Blocks") ?></h3>
+      <div class="g-blocks-list g-block-content">
+        <ul id="g-available-blocks" class="g-sortable-blocks">
+        <?= $available ?>
+        </ul>
+      </div>
     </div>
-  </div>
-  <div class="g-admin-blocks-list">
-    <div><h3><?= t("Active Blocks") ?></h3></div>
-    <div>
-      <ul id="g-active-blocks" class="g-sortable-blocks">
-      <?= $active ?>
-      </ul>
+    <div class="g-block g-left">
+      <h3><?= t("Active Blocks") ?></h3>
+      <div class="g-blocks-list g-block-content">
+        <ul id="g-active-blocks" class="g-sortable-blocks">
+        <?= $active ?>
+        </ul>
+      </div>
     </div>
   </div>
 </div>
diff --git a/modules/gallery/views/admin_theme_options.html.php b/modules/gallery/views/admin_theme_options.html.php
index e09be728..a4bf1c4e 100644
--- a/modules/gallery/views/admin_theme_options.html.php
+++ b/modules/gallery/views/admin_theme_options.html.php
@@ -1,6 +1,8 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-admin-theme-options">
+<div class="g-block">
   <h1> <?= t("Theme Options") ?> </h1>
 
+  <div class="g-block-content">
   <?= $form ?>
+  </div>
 </div>
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php
index f7e77a01..dda18265 100644
--- a/modules/gallery/views/admin_themes.html.php
+++ b/modules/gallery/views/admin_themes.html.php
@@ -7,83 +7,88 @@
   }
 </script>
 
-<h1> <?= t("Theme Choice") ?> </h1>
-<p>
-  <?= t("Gallery allows you to choose a theme for browsing your Gallery, as well as a special theme for the administration interface.  Click a theme to preview and activate it.") ?>
-</p>
+<div class="g-block ui-helper-clearfix">
+  <h1> <?= t("Theme Choice") ?> </h1>
+  <p>
+    <?= t("Gallery allows you to choose a theme for browsing your Gallery, as well as a special theme for the administration interface.  Click a theme to preview and activate it.") ?>
+  </p>
 
-<div id="g-site-theme">
-  <h2> <?= t("Gallery theme") ?> </h2>
-  <div class="g-block g-selected ui-helper-clearfix">
-    <img src="<?= url::file("themes/{$site}/thumbnail.png") ?>"
-         alt="<?= html::clean_attribute($themes[$site]->name) ?>" />
-    <h3> <?= $themes[$site]->name ?> </h3>
-    <p>
-      <?= $themes[$site]->description ?>
-    </p>
-  </div>
+  <div class="g-block-content">
+    <div id="g-site-theme">
+      <h2> <?= t("Gallery theme") ?> </h2>
+      <div class="g-block g-selected ui-helper-clearfix">
+        <img src="<?= url::file("themes/{$site}/thumbnail.png") ?>"
+             alt="<?= html::clean_attribute($themes[$site]->name) ?>" />
+        <h3> <?= $themes[$site]->name ?> </h3>
+        <p>
+          <?= $themes[$site]->description ?>
+        </p>
+      </div>
 
-  <h2> <?= t("Available Gallery themes") ?> </h2>
-  <div class="g-available">
-    <? $count = 0 ?>
-    <? foreach ($themes as $id => $info): ?>
-    <? if (!$info->site) continue ?>
-    <? if ($id == $site) continue ?>
-    <div class="g-block ui-helper-clearfix">
-      <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
-        <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
-             alt="<?= html::clean_attribute($info->name) ?>" />
-        <h3> <?= $info->name ?> </h3>
+      <h2> <?= t("Available Gallery themes") ?> </h2>
+      <div class="g-available">
+        <? $count = 0 ?>
+        <? foreach ($themes as $id => $info): ?>
+        <? if (!$info->site) continue ?>
+        <? if ($id == $site) continue ?>
+        <div class="g-block ui-helper-clearfix">
+          <a href="<?= url::site("admin/themes/preview/site/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
+            <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
+                 alt="<?= html::clean_attribute($info->name) ?>" />
+            <h3> <?= $info->name ?> </h3>
+            <p>
+              <?= $info->description ?>
+            </p>
+          </a>
+        </div>
+        <? $count++ ?>
+        <? endforeach ?>
+
+        <? if (!$count): ?>
         <p>
-          <?= $info->description ?>
+          <?= t("There are no other site themes available.") ?>
         </p>
-      </a>
+        <? endif ?>
+      </div>
     </div>
-    <? $count++ ?>
-    <? endforeach ?>
 
-    <? if (!$count): ?>
-    <p>
-      <?= t("There are no other site themes available.") ?>
-    </p>
-    <? endif ?>
-  </div>
-</div>
+    <div id="g-admin-theme">
+      <h2> <?= t("Admin theme") ?> </h2>
+      <div class="g-block g-selected ui-helper-clearfix">
+        <img src="<?= url::file("themes/{$admin}/thumbnail.png") ?>"
+             alt="<?= html::clean_attribute($themes[$admin]->name) ?>" />
+        <h3> <?= $themes[$admin]->name ?> </h3>
+        <p>
+          <?= $themes[$admin]->description ?>
+        </p>
+      </div>
 
-<div id="g-admin-theme">
-  <h2> <?= t("Admin theme") ?> </h2>
-  <div class="g-block g-selected ui-helper-clearfix">
-    <img src="<?= url::file("themes/{$admin}/thumbnail.png") ?>"
-         alt="<?= html::clean_attribute($themes[$admin]->name) ?>" />
-    <h3> <?= $themes[$admin]->name ?> </h3>
-    <p>
-      <?= $themes[$admin]->description ?>
-    </p>
-  </div>
+      <h2> <?= t("Available admin themes") ?> </h2>
+      <div class="g-available">
+        <? $count = 0 ?>
+        <? foreach ($themes as $id => $info): ?>
+        <? if (!$info->admin) continue ?>
+        <? if ($id == $admin) continue ?>
+        <div class="g-block ui-helper-clearfix">
+          <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
+            <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
+                 alt="<?= html::clean_attribute($info->name) ?>" />
+            <h3> <?= $info->name ?> </h3>
+            <p>
+              <?= $info->description ?>
+            </p>
+          </a>
+        </div>
+        <? $count++ ?>
+        <? endforeach ?>
 
-  <h2> <?= t("Available admin themes") ?> </h2>
-  <div class="g-available">
-    <? $count = 0 ?>
-    <? foreach ($themes as $id => $info): ?>
-    <? if (!$info->admin) continue ?>
-    <? if ($id == $admin) continue ?>
-    <div class="g-block ui-helper-clearfix">
-      <a href="<?= url::site("admin/themes/preview/admin/$id") ?>" class="g-dialog-link" title="<?= t("Theme Preview: %theme_name", array("theme_name" => $info->name))->for_html_attr() ?>">
-        <img src="<?= url::file("themes/{$id}/thumbnail.png") ?>"
-             alt="<?= html::clean_attribute($info->name) ?>" />
-        <h3> <?= $info->name ?> </h3>
+        <? if (!$count): ?>
         <p>
-          <?= $info->description ?>
+          <?= t("There are no other admin themes available.") ?>
         </p>
-      </a>
+        <? endif ?>
+      </div>
     </div>
-    <? $count++ ?>
-    <? endforeach ?>
-
-    <? if (!$count): ?>
-    <p>
-      <?= t("There are no other admin themes available.") ?>
-    </p>
-    <? endif ?>
+    
   </div>
 </div>
\ No newline at end of file
diff --git a/modules/recaptcha/views/admin_recaptcha.html.php b/modules/recaptcha/views/admin_recaptcha.html.php
index 3e964801..a0af3ba8 100644
--- a/modules/recaptcha/views/admin_recaptcha.html.php
+++ b/modules/recaptcha/views/admin_recaptcha.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-admin-recaptcha">
+<div class="g-block">
   <h1> <?= t("reCAPTCHA Challenge Filtering") ?> </h1>
   <p>
     <?= t("reCAPTCHA is a free CAPTCHA service that helps to digitize books, newspapers and old time radio shows.  In order to use it, you need to sign up for a <a href=\"%domain_url\">reCAPTCHA Public/Private Key pair</a>, which is also free.  Once registered, the challenge and response strings are evaluated at <a href=\"%recaptcha_url\">recaptcha.net</a> to determine if the form content has been entered by a bot.",
@@ -7,27 +7,29 @@
                 "recaptcha_url" => html::mark_clean("http://recaptcha.net"))) ?>
   </p>
 
-     <?= $form ?>
-</div>
+  <div class="g-block-content">
+    <?= $form ?>
 
-<? if ($public_key && $private_key): ?>
-<div id="g-admin-recaptcha-test" class="g-block">
-  <h2> <?= t("reCAPTCHA Test") ?> </h2>
-  <p>
-    <?= t("If you see a CAPTCHA form below, then reCAPTCHA is functioning properly.") ?>
-  </p>
+    <? if ($public_key && $private_key): ?>
+    <div id="g-admin-recaptcha-test">
+      <h2> <?= t("reCAPTCHA Test") ?> </h2>
+      <p>
+        <?= t("If you see a CAPTCHA form below, then reCAPTCHA is functioning properly.") ?>
+      </p>
 
-  <div id="g-recaptcha"/>
-  <script type="text/javascript" src="http://api.recaptcha.net/js/recaptcha_ajax.js"></script>
-  <script type="text/javascript">
-    Recaptcha.create("<?= $public_key ?>", "g-recaptcha", {
-      callback: Recaptcha.focus_response_field,
-      lang: "en",
-      custom_translations : { instructions_visual : <?= t("Type words to check:")->for_js() ?>},
-      theme: "white"
-    });
-  </script>
+      <div id="g-recaptcha">
+      <script type="text/javascript" src="http://api.recaptcha.net/js/recaptcha_ajax.js"></script>
+      <script type="text/javascript">
+        Recaptcha.create("<?= $public_key ?>", "g-recaptcha", {
+          callback: Recaptcha.focus_response_field,
+          lang: "en",
+          custom_translations : { instructions_visual : <?= t("Type words to check:")->for_js() ?>},
+          theme: "white"
+        });
+      </script>
+      </div>
+    </div>
+    <? endif ?>
+  
   </div>
 </div>
-<? endif ?>
-
diff --git a/modules/server_add/views/admin_server_add.html.php b/modules/server_add/views/admin_server_add.html.php
index e447ee6d..eae767af 100644
--- a/modules/server_add/views/admin_server_add.html.php
+++ b/modules/server_add/views/admin_server_add.html.php
@@ -1,25 +1,22 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="g-server-add-admin">
-  <h2>
-    <?= t("Add From Server Admininstration") ?>
-  </h2>
-  <div id="g-authorized-path">
-    <h3><?= t("Authorized Paths") ?></h3>
+<div class="g-block">
+  <h1> <?= t("Add From Server Admininstration") ?> </h1>
+  <div class="g-block-content">
+    <h2><?= t("Authorized Paths") ?></h2>
     <ul<? if (!empty($paths)): ?> style="display: none;"<? endif ?>>
       <li class="g-module-status g-info"><?= t("No Authorized image source paths defined yet") ?></li>
     </ul>
-    <ul id="g-path-list">
+    <ul>
       <? foreach ($paths as $id => $path): ?>
       <li class="ui-icon-left">
+        <span class="ui-icon ui-icon-folder-open"></span>
+        <?= html::clean($path) ?>
         <a href="<?= url::site("admin/server_add/remove_path?path=" . urlencode($path) . "&amp;csrf=$csrf") ?>"
            id="icon_<?= $id?>"
-           class="g-remove-dir ui-icon ui-icon-trash">
-          X
-        </a>
-        <?= html::clean($path) ?>
+           class="g-remove-dir"><span class="ui-icon ui-icon-trash">X</span></a>
       </li>
       <? endforeach ?>
     </ul>
+    <?= $form ?>
   </div>
-  <?= $form ?>
 </div>
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index 41fa4d41..4ed88e03 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -37,7 +37,7 @@ function editInPlace(element) {
   closeEditInPlaceForms();
 
   // create edit form
-  var tag_id = $(this).attr('id').substr(5);
+  var tag_id = $(this).attr('rel');
   var tag_name = $(this).html();
   var tag_width = $(this).width();
   $(this).parent().data("revert", $(this).parent().html());
@@ -67,7 +67,7 @@ function editInPlace(element) {
     console.log("success");
         if (data.result == "success") {
           closeEditInPlaceForms(); // close form
-          $("#g-tag-" + data.tag_id).text(data.new_tagname); // update tagname
+          $(".g-tag[rel=" + data.tag_id + "]").text(data.new_tagname); // update tagname
           window.location.reload();
         } else if (data.result == "error") {
     console.log("error");
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index 7771f7fe..67ba4d95 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<script>
+<script type="text/javascript">
   var TAG_RENAME_URL = <?= html::js_string(url::site("admin/tags/rename/__ID__")) ?>;
   $("document").ready(function() {
     // using JS for adding link titles to avoid running t() for each tag
@@ -15,49 +15,50 @@
   var cancel_i18n = <?= html::js_string(t("cancel")->for_html_attr()) ?>;
 </script>
 
-<h2>
-  <?= t("Tag Admin") ?>
-</h2>
-
 <? $tags_per_column = $tags->count()/5 ?>
 <? $column_tag_count = 0 ?>
 
-<table id="g-tag-admin">
-  <caption class="g-understate">
-    <?= t2("There is one tag", "There are %count tags", $tags->count()) ?>
-  </caption>
-  <tr>
-    <td>
-      <? foreach ($tags as $i => $tag): ?>
-        <? $current_letter = strtoupper(mb_substr($tag->name, 0, 1)) ?>
-
-        <? if ($i == 0): /* first letter */ ?>
-          <strong><?= html::clean($current_letter) ?></strong>
-          <ul>
-        <? elseif ($last_letter != $current_letter): /* new letter */ ?>
-          <? if ($column_tag_count > $tags_per_column): /* new column */ ?>
-             </td>
-            <td>
-            <? $column_tag_count = 0 ?>
-          <? endif ?>
+<div class="g-block">
+  <h1> <?= t("Tag Admin") ?> </h1>
+  
+  <div class="g-block-content">
+    <table id="g-tag-admin">
+      <caption class="g-understate">
+        <?= t2("There is one tag", "There are %count tags", $tags->count()) ?>
+      </caption>
+      <tr>
+        <td>
+          <? foreach ($tags as $i => $tag): ?>
+            <? $current_letter = strtoupper(mb_substr($tag->name, 0, 1)) ?>
 
-          </ul>
-          <strong><?= html::clean($current_letter) ?></strong>
-          <ul>
-        <? endif ?>
+            <? if ($i == 0): /* first letter */ ?>
+              <strong><?= html::clean($current_letter) ?></strong>
+              <ul>
+            <? elseif ($last_letter != $current_letter): /* new letter */ ?>
+              <? if ($column_tag_count > $tags_per_column): /* new column */ ?>
+                 </td>
+                <td>
+                <? $column_tag_count = 0 ?>
+              <? endif ?>
+              </ul>
+              <strong><?= html::clean($current_letter) ?></strong>
+              <ul>
+            <? endif ?>
 
-        <li>
-          <span id="g-tag-<?= $tag->id ?>" class="g-editable g-tag-name"><?= html::clean($tag->name) ?></span>
-          <span class="g-understate">(<?= $tag->count ?>)</span>
-          <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
-             class="g-dialog-link g-delete-link g-button">
-              <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
-        </li>
+                <li>
+                  <span class="g-editable g-tag-name" rel="<?= $tag->id ?>"><?= html::clean($tag->name) ?></span>
+                  <span class="g-understate">(<?= $tag->count ?>)</span>
+                  <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
+                      class="g-dialog-link g-delete-link g-button">
+                    <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
+                </li>
 
-        <? $column_tag_count++ ?>
-        <? $last_letter = $current_letter ?>
-      <? endforeach /* $tags */ ?>
-      </ul>
-    </td>
-  </tr>
-</table>
+            <? $column_tag_count++ ?>
+            <? $last_letter = $current_letter ?>
+          <? endforeach /* $tags */ ?>
+          </ul>
+        </td>
+      </tr>
+    </table>
+  </div>
+</div>
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index 2f8d8673..aae39c8c 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -41,88 +41,93 @@
           });
   }
 </script>
-<div class="g-block">
-  <a href="<?= url::site("admin/users/add_user_form") ?>"
-      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
-      title="<?= t("Create a new user")->for_html_attr() ?>">
-    <span class="ui-icon ui-icon-circle-plus"></span>
-    <?= t("Add a new user") ?>
-  </a>
 
-  <h2>
-    <?= t("User Admin") ?>
-  </h2>
+<div class="g-block">
+  <h1> <?= t("Users and Groups") ?> </h1>
 
   <div class="g-block-content">
-    <table id="g-user-admin-list">
-      <tr>
-        <th><?= t("Username") ?></th>
-        <th><?= t("Full name") ?></th>
-        <th><?= t("Email") ?></th>
-        <th><?= t("Last login") ?></th>
-        <th><?= t("Actions") ?></th>
-      </tr>
+    <div class="g-block">
+      <a href="<?= url::site("admin/users/add_user_form") ?>"
+          class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
+          title="<?= t("Create a new user")->for_html_attr() ?>">
+        <span class="ui-icon ui-icon-circle-plus"></span>
+        <?= t("Add a new user") ?>
+      </a>
 
-      <? foreach ($users as $i => $user): ?>
-      <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
-        <td id="user-<?= $user->id ?>" class="core-info g-draggable">
-          <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
-               title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
-               alt="<?= html::clean_attribute($user->name) ?>"
-               width="20"
-               height="20" />
-          <?= html::clean($user->name) ?>
-        </td>
-        <td>
-          <?= html::clean($user->full_name) ?>
-        </td>
-        <td>
-          <?= html::clean($user->email) ?>
-        </td>
-        <td>
-          <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
-        </td>
-        <td class="g-actions">
-          <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
-              open_text="<?= t("close") ?>"
-              class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left">
-            <span class="ui-icon ui-icon-pencil"></span><span class="g-button-text"><?= t("edit") ?></span></a>
-          <? if (user::active()->id != $user->id && !$user->guest): ?>
-          <a href="<?= url::site("admin/users/delete_user_form/$user->id") ?>"
-              class="g-dialog-link g-button ui-state-default ui-corner-all ui-icon-left">
-            <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
-          <? else: ?>
-          <span title="<?= t("This user cannot be deleted")->for_html_attr() ?>"
-              class="g-button ui-state-disabled ui-corner-all ui-icon-left">
-            <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></span>
-          <? endif ?>
-        </td>
-      </tr>
-      <? endforeach ?>
-    </table>
-  </div>
-</div>
+      <h2> <?= t("User Admin") ?> </h2>
 
-<div id="g-group-admin" class="g-block ui-helper-clearfix">
-  <a href="<?= url::site("admin/users/add_group_form") ?>"
-      class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
-      title="<?= t("Create a new group")->for_html_attr() ?>">
-    <span class="ui-icon ui-icon-circle-plus"></span>
-    <?= t("Add a new group") ?>
-  </a>
+      <div class="g-block-content">
+        <table id="g-user-admin-list">
+          <tr>
+            <th><?= t("Username") ?></th>
+            <th><?= t("Full name") ?></th>
+            <th><?= t("Email") ?></th>
+            <th><?= t("Last login") ?></th>
+            <th><?= t("Actions") ?></th>
+          </tr>
 
-  <h2>
-    <?= t("Group Admin") ?>
-  </h2>
+          <? foreach ($users as $i => $user): ?>
+          <tr id="g-user-<?= $user->id ?>" class="<?= text::alternate("g-odd", "g-even") ?> user <?= $user->admin ? "admin" : "" ?>">
+            <td id="user-<?= $user->id ?>" class="core-info g-draggable">
+              <img src="<?= $user->avatar_url(20, $theme->url("images/avatar.jpg", true)) ?>"
+                   title="<?= t("Drag user onto group below to add as a new member")->for_html_attr() ?>"
+                   alt="<?= html::clean_attribute($user->name) ?>"
+                   width="20"
+                   height="20" />
+              <?= html::clean($user->name) ?>
+            </td>
+            <td>
+              <?= html::clean($user->full_name) ?>
+            </td>
+            <td>
+              <?= html::clean($user->email) ?>
+            </td>
+            <td>
+              <?= ($user->last_login == 0) ? "" : gallery::date($user->last_login) ?>
+            </td>
+            <td class="g-actions">
+              <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
+                  open_text="<?= t("close") ?>"
+                  class="g-panel-link g-button ui-state-default ui-corner-all ui-icon-left">
+                <span class="ui-icon ui-icon-pencil"></span><span class="g-button-text"><?= t("edit") ?></span></a>
+              <? if (user::active()->id != $user->id && !$user->guest): ?>
+              <a href="<?= url::site("admin/users/delete_user_form/$user->id") ?>"
+                  class="g-dialog-link g-button ui-state-default ui-corner-all ui-icon-left">
+                <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
+              <? else: ?>
+              <span title="<?= t("This user cannot be deleted")->for_html_attr() ?>"
+                  class="g-button ui-state-disabled ui-corner-all ui-icon-left">
+                <span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></span>
+              <? endif ?>
+            </td>
+          </tr>
+          <? endforeach ?>
+        </table>
+      </div>
+    </div>
 
-  <div class="g-block-content">
-    <ul>
-      <? foreach ($groups as $i => $group): ?>
-      <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" />
-        <? $v = new View("admin_users_group.html"); $v->group = $group; ?>
-        <?= $v ?>
-      </li>
-      <? endforeach ?>
-    </ul>
-  </div>
+    <div id="g-group-admin" class="g-block ui-helper-clearfix">
+      <a href="<?= url::site("admin/users/add_group_form") ?>"
+          class="g-dialog-link g-button g-right ui-icon-left ui-state-default ui-corner-all"
+          title="<?= t("Create a new group")->for_html_attr() ?>">
+        <span class="ui-icon ui-icon-circle-plus"></span>
+        <?= t("Add a new group") ?>
+      </a>
+
+      <h2>
+        <?= t("Group Admin") ?>
+      </h2>
+
+      <div class="g-block-content">
+        <ul>
+          <? foreach ($groups as $i => $group): ?>
+          <li id="group-<?= $group->id ?>" class="g-group <?= ($group->special ? "g-default-group" : "") ?>" />
+            <? $v = new View("admin_users_group.html"); $v->group = $group; ?>
+            <?= $v ?>
+          </li>
+          <? endforeach ?>
+        </ul>
+      </div>
+    </div>
+    </div>
 </div>
diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php
index d034066a..af38cb41 100644
--- a/modules/watermark/views/admin_watermarks.html.php
+++ b/modules/watermark/views/admin_watermarks.html.php
@@ -1,37 +1,39 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div id="#g-watermarks">
+<div class="g-block">
   <h1> <?= t("Watermarks") ?> </h1>
   <p>
     <?= t("You can have one watermark for your Gallery.  This watermark will be applied to all thumbnails and resized images, but it will not be applied to your full size images.  To make sure that your guests can only see watermarked images, you should restrict access to your full size images.") ?>
   </p>
 
-  <? if (empty($name)): ?>
-  <a href="<?= url::site("admin/watermarks/form_add") ?>"
-     title="<?= t("Upload a watermark")->for_html_attr() ?>"
-     class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-document-b"></span><?= t("Upload a watermark") ?></a>
-  <? else: ?>
-  <h2> <?= t("Active Watermark") ?> </h2>
-  <p>
-    <?= t("Note that changing this watermark will require you to rebuild all of your thumbnails and resized images.") ?>
-  </p>
-  <div>
-    <div class="image">
-      <img width="<?= $width ?>" height="<?= $height ?>" src="<?= $url ?>"/>
-      <p>
-        <?= t("Position: %position", array("position" => watermark::position($position))) ?>
-      </p>
-      <p>
-        <?= t("Transparency: %transparency%", array("transparency" => module::get_var("watermark", "transparency"))) ?>
-      </p>
-    </div>
-    <div class="controls">
-      <a href="<?= url::site("admin/watermarks/form_edit") ?>"
-         title="<?= t("Edit Watermark")->for_html_attr() ?>"
-         class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-pencil"></span><?= t("edit") ?></a>
-      <a href="<?= url::site("admin/watermarks/form_delete") ?>"
-         title="<?= t("Delete Watermark")->for_html_attr() ?>"
-         class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
+  <div class="g-block-content">
+    <? if (empty($name)): ?>
+    <a href="<?= url::site("admin/watermarks/form_add") ?>"
+       title="<?= t("Upload a watermark")->for_html_attr() ?>"
+       class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-document-b"></span><?= t("Upload a watermark") ?></a>
+    <? else: ?>
+    <h2> <?= t("Active Watermark") ?> </h2>
+    <p>
+      <?= t("Note that changing this watermark will require you to rebuild all of your thumbnails and resized images.") ?>
+    </p>
+    <div>
+      <div class="g-photo">
+        <img width="<?= $width ?>" height="<?= $height ?>" src="<?= $url ?>" />
+        <p>
+          <?= t("Position: %position", array("position" => watermark::position($position))) ?>
+        </p>
+        <p>
+          <?= t("Transparency: %transparency%", array("transparency" => module::get_var("watermark", "transparency"))) ?>
+        </p>
+      </div>
+      <div class="controls">
+        <a href="<?= url::site("admin/watermarks/form_edit") ?>"
+           title="<?= t("Edit Watermark")->for_html_attr() ?>"
+           class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-pencil"></span><?= t("edit") ?></a>
+        <a href="<?= url::site("admin/watermarks/form_delete") ?>"
+           title="<?= t("Delete Watermark")->for_html_attr() ?>"
+           class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
+      </div>
     </div>
+    <? endif ?>
   </div>
-  <? endif ?>
 </div>
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 1d60d392..20593e9c 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -107,11 +107,11 @@ td {
   border: none;
   border-bottom: 1px solid #ccc;
   padding: .5em;
-  vertical-align: top;
+  vertical-align: middle;
 }
 
-#g-admin-maintenance td {
-  vertical-align: middle;
+th {
+  white-space: nowrap;
 }
 
 /* Forms ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -474,14 +474,6 @@ tr.g-warning {
   margin-right: 1em;
 }
 
-#g-user-admin-list {
-  margin-bottom: 1em;
-}
-
-#g-user-admin-list td {
-  vertical-align: bottom;
-}
-
 #g-user-admin-list .admin {
   color: #55f;
   font-weight: bold;
@@ -531,36 +523,19 @@ li.g-default-group h4, li.g-default-group .g-user {
   color: gray;
 }
 
-#g-admin-advanced-settings tr.setting:hover {
-  background: #ffc;
-}
-
-/* admin/sidebar  ~~~~~~~~~~~~~~~~~~~~~~~~~ */
-.g-admin-blocks-list {
-  float: left;
-  height: 300px;
-  margin-left: 20px;
-  width: 30%;
-}
+/* Block admin  ~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-.g-admin-blocks-list div:last-child {
-  border: .1em solid;
-  height: 100%;
-  overflow-y: auto;
+#g-admin-blocks .g-block {
+  margin-right: 2em;
+  height: 200px;
+  width: 30% !important;
 }
 
-.g-admin-blocks-list ul {
-  height: 98%;
-  margin: .1em .1em;
-  padding: .1em;
-}
-
-.g-admin-blocks-list ul li {
-  background-color: #e8e8e8;
-  font-size: 1em;
-  font-weight: bold;
-  margin: .5em;
-  padding: .3em .8em;
+#g-admin-blocks .g-block li {
+  background: #e7e7e7;
+  /*border: 1px solid #fff;*/
+  margin-bottom: 1em;
+  padding: .4em .8em;
 }
 
 /** *******************************************************************
@@ -797,20 +772,10 @@ li.g-default-group h4, li.g-default-group .g-user {
 }
 
 #g-languages-form table {
-	width: 400px;
-	float: left;
+	width: 40%;
 	margin: 0 3em 1em 0;
 }
 
-#g-languages-form .installed {
-  background-color: #EEEEEE;
-}
-
-#g-languages-form .default {
-	background-color: #C5DBEC;
-	font-weight: bold;
-}
-
 #g-languages-form input {
 	clear: both;
 }
@@ -824,10 +789,6 @@ li.g-default-group h4, li.g-default-group .g-user {
 	padding: .5em;
 }
 
-.g-doc-link {
-  float: right;
-}
-
 /** *******************************************************************
  * 7) Right to left styles
  *********************************************************************/
-- 
cgit v1.2.3


From 47d4cd5cb4a276d9eba997b09ae38238994e9a47 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 18 Oct 2009 20:32:33 -0600
Subject: Resolve tag module conflicts.

---
 modules/tag/views/admin_tags.html.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'modules')

diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index 67ba4d95..9ba80de3 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -45,6 +45,7 @@
               <ul>
             <? endif ?>
 
+<<<<<<< HEAD
                 <li>
                   <span class="g-editable g-tag-name" rel="<?= $tag->id ?>"><?= html::clean($tag->name) ?></span>
                   <span class="g-understate">(<?= $tag->count ?>)</span>
@@ -52,6 +53,20 @@
                       class="g-dialog-link g-delete-link g-button">
                     <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
                 </li>
+=======
+            </ul>
+            <strong><?= html::clean($current_letter) ?></strong>
+            <ul>
+          <? endif ?>
+
+          <li>
+            <span class="g-editable g-tag-name" rel="<?= $tag->id ?>"><?= html::clean($tag->name) ?></span>
+            <span class="g-understate">(<?= $tag->count ?>)</span>
+            <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
+               class="g-dialog-link g-delete-link g-button">
+                <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
+          </li>
+>>>>>>> b976f9b3665771444c30e914fe21cbce5848bd21
 
             <? $column_tag_count++ ?>
             <? $last_letter = $current_letter ?>
-- 
cgit v1.2.3


From 6a7db5bea15c346d069d42fef173a0f99393bf3d Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 18 Oct 2009 20:39:31 -0600
Subject: Resolve merge conflict.

---
 modules/gallery/helpers/module.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index fe37f4f9..77ec6f63 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -50,8 +50,20 @@ class module_Core {
    * @param string $module_name
    */
   static function get($module_name) {
-    // @todo can't easily use model_cache here because it throw an exception on missing models.
-    return ORM::factory("module", array("name" => $module_name));
+    if (empty(self::$modules[$module_name])) {
+      return ORM::factory("module", array("name" => $module_name));
+    }
+    return self::$modules[$module_name];
+  }
+
+  /**
+   * Get the information about a module
+   * @returns ArrayObject containing the module information from the module.info file or false if
+   *                      not found
+   */
+  static function info($module_name) {
+    $module_list = self::available();
+    return isset($module_list->$module_name) ? $module_list->$module_name : false;
   }
 
   /**
@@ -79,7 +91,8 @@ class module_Core {
       $modules = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
       foreach (glob(MODPATH . "*/module.info") as $file) {
         $module_name = basename(dirname($file));
-        $modules->$module_name = new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
+        $modules->$module_name =
+          new ArrayObject(parse_ini_file($file), ArrayObject::ARRAY_AS_PROPS);
         $m =& $modules->$module_name;
         $m->installed = self::is_installed($module_name);
         $m->active = self::is_active($module_name);
-- 
cgit v1.2.3


From c2b32cc2b802034a98051b713a3f06c09dcb3f34 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 18 Oct 2009 22:45:13 -0600
Subject: Resolve merge conflict.

---
 modules/tag/views/admin_tags.html.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index 9ba80de3..dc9deb1f 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -20,7 +20,7 @@
 
 <div class="g-block">
   <h1> <?= t("Tag Admin") ?> </h1>
-  
+
   <div class="g-block-content">
     <table id="g-tag-admin">
       <caption class="g-understate">
@@ -44,8 +44,6 @@
               <strong><?= html::clean($current_letter) ?></strong>
               <ul>
             <? endif ?>
-
-<<<<<<< HEAD
                 <li>
                   <span class="g-editable g-tag-name" rel="<?= $tag->id ?>"><?= html::clean($tag->name) ?></span>
                   <span class="g-understate">(<?= $tag->count ?>)</span>
@@ -53,7 +51,6 @@
                       class="g-dialog-link g-delete-link g-button">
                     <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
                 </li>
-=======
             </ul>
             <strong><?= html::clean($current_letter) ?></strong>
             <ul>
@@ -66,8 +63,6 @@
                class="g-dialog-link g-delete-link g-button">
                 <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
           </li>
->>>>>>> b976f9b3665771444c30e914fe21cbce5848bd21
-
             <? $column_tag_count++ ?>
             <? $last_letter = $current_letter ?>
           <? endforeach /* $tags */ ?>
-- 
cgit v1.2.3


From b2d0b3ebbb1764593e387a2e07e0d4e67f4f5474 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Sun, 18 Oct 2009 23:38:27 -0600
Subject: Fix sidebar block admin layout. Don't hardcode block list height, use
 the equal_heights() function to set it.

---
 modules/gallery/views/admin_sidebar.html.php | 4 ++++
 themes/admin_wind/css/screen.css             | 7 +++----
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php
index ea950b54..030dfdce 100644
--- a/modules/gallery/views/admin_sidebar.html.php
+++ b/modules/gallery/views/admin_sidebar.html.php
@@ -1,5 +1,9 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
+  $(document).ready(function(){
+    $(".g-blocks-list").equal_heights();
+  });
+
   $(function() {
     $(".g-blocks-list ul").sortable({
       connectWith: ".g-sortable-blocks",
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 20593e9c..74323067 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -526,12 +526,11 @@ li.g-default-group h4, li.g-default-group .g-user {
 /* Block admin  ~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-admin-blocks .g-block {
-  margin-right: 2em;
-  height: 200px;
-  width: 30% !important;
+  clear: none;
+  width: 30%;
 }
 
-#g-admin-blocks .g-block li {
+#g-admin-blocks .g-block .g-draggable {
   background: #e7e7e7;
   /*border: 1px solid #fff;*/
   margin-bottom: 1em;
-- 
cgit v1.2.3