Merge branch 'master' into talmdal_dev

30 files changed, 114 insertions, 158 deletions

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index eb686bcf..d57e95fc 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -108,12 +108,14 @@ form .g-error {
  * 3) Positioning and order
  **********************************************************************/
 
-.g-right {
-  float: right;
-}
-
 .g-left {
   float: left;
+  margin: 1em 1em 1em 0;
+}
+
+.g-right {
+  float: right;
+  margin: 1em 0 1em 1em;
 }
 
 .g-first {
@@ -136,6 +138,18 @@ form .g-error {
 }
 
 .g-button {
+  display: inline-block;
+  margin: 0 4px 0 0;
+  padding: .2em .4em;
+}
+
+.g-button,
+.g-button:hover,
+.g-button:active {
+  cursor: pointer !important;
+  outline: 0;
+  text-decoration: none;
+  -moz-outline-style: none;
 }
 
 .g-progressbar {
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index 455cd714..ec5ad7b2 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -116,7 +116,7 @@
               title="<?= html::clean_attribute($comment->author_email()) ?>"> <?= html::clean($comment->author_name()) ?> </a></p>
       </td>
       <td>
-        <div class="right">
+        <div class="g-right">
           <? $item = $comment->item() ?>
           <div class="gItem gPhoto">
             <a href="<?= $item->url() ?>">
@@ -139,7 +139,7 @@
         <? if ($comment->state != "unpublished"): ?>
           <li>
             <a href="javascript:set_state('unpublished',<?=$comment->id?>)"
-                class="gButtonLink ui-state-default ui-icon-left">
+                class="g-button ui-state-default ui-icon-left">
               <span class="ui-icon ui-icon-check"></span>
               <?= t("Unapprove") ?>
             </a>
@@ -148,7 +148,7 @@
         <? if ($comment->state != "published"): ?>
           <li>
             <a href="javascript:set_state('published',<?=$comment->id?>)"
-                class="gButtonLink ui-state-default ui-icon-left">
+                class="g-button ui-state-default ui-icon-left">
               <span class="ui-icon ui-icon-check"></span>
               <?= t("Approve") ?>
             </a>
@@ -157,7 +157,7 @@
         <? if ($comment->state != "spam"): ?>
           <li>
             <a href="javascript:set_state('spam',<?=$comment->id?>)"
-                class="gButtonLink ui-state-default ui-icon-left">
+                class="g-button ui-state-default ui-icon-left">
               <span class="ui-icon ui-icon-cancel"></span>
               <?= t("Spam") ?>
             </a>
@@ -166,14 +166,14 @@
           <!--
           <li>
             <a href="javascript:reply(<?=$comment->id?>)"
-                class="gButtonLink ui-state-default ui-icon-left">
+                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="gButtonLink ui-state-default ui-icon-left">
+                class="g-button ui-state-default ui-icon-left">
               <span class="ui-icon ui-icon-pencil"></span>
               <?= t("Edit") ?>
             </a>
@@ -181,7 +181,7 @@
           -->
           <li>
             <a href="javascript:set_state('deleted',<?=$comment->id?>)"
-                class="gButtonLink ui-state-default ui-icon-left">
+                class="g-button ui-state-default ui-icon-left">
               <span class="ui-icon ui-icon-trash"></span>
               <?= t("Delete") ?>
             </a>
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index dd706a23..ee4a8ad6 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
   <a href="<?= url::site("form/add/comments/{$item->id})") ?>" id="gAddCommentButton"
-   class="gButtonLink ui-corner-all ui-icon-left ui-state-default right">
+   class="g-button ui-corner-all ui-icon-left ui-state-default right">
   <span class="ui-icon ui-icon-comment"></span>
   <?= t("Add a comment") ?>
 </a>
diff --git a/modules/exif/views/exif_sidebar.html.php b/modules/exif/views/exif_sidebar.html.php
index 60c0e1d4..23ecab03 100644
--- a/modules/exif/views/exif_sidebar.html.php
+++ b/modules/exif/views/exif_sidebar.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <a id="gExifDataLink" href="<?= url::site("exif/show/{$item->id}") ?>" title="<?= t("Photo Details")->for_html_attr() ?>"
-  class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all">
+  class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all">
   <span class="ui-icon ui-icon-info"></span>
   <?= t("View more information") ?>
 </a>
diff --git a/modules/g2_import/views/admin_g2_import.html.php b/modules/g2_import/views/admin_g2_import.html.php
index 23ff27a8..91b723ad 100644
--- a/modules/g2_import/views/admin_g2_import.html.php
+++ b/modules/g2_import/views/admin_g2_import.html.php
@@ -84,7 +84,7 @@
     </div>
 
     <p>
-      <a class="gButtonLink gDialogLink ui-state-default ui-corner-all"
+      <a class="g-button gDialogLink ui-state-default ui-corner-all"
          href="<?= url::site("admin/maintenance/start/g2_import_task::import?csrf=$csrf") ?>">
         <?= t("Begin import!") ?>
       </a>
diff --git a/modules/gallery/views/admin_graphics.html.php b/modules/gallery/views/admin_graphics.html.php
index f64c7f80..f4c300ae 100644
--- a/modules/gallery/views/admin_graphics.html.php
+++ b/modules/gallery/views/admin_graphics.html.php
@@ -1,6 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   $(document).ready(function() {
+    $(".gAvailable .gBlock").equal_heights();
     select_toolkit = function(el) {
       if (!$(this).hasClass("gUnavailable")) {
         window.location = <?= html::js_string(url::site("admin/graphics/choose/__TK__?csrf=$csrf")) ?>
diff --git a/modules/gallery/views/admin_graphics_gd.html.php b/modules/gallery/views/admin_graphics_gd.html.php
index 010a31b4..08c19234 100644
--- a/modules/gallery/views/admin_graphics_gd.html.php
+++ b/modules/gallery/views/admin_graphics_gd.html.php
@@ -11,7 +11,7 @@
     <?= t("You have GD version %version.", array("version" => $tk->version)) ?>
   </div>
   <p>
-    <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate GD") ?></a>
+    <a class="g-button ui-state-default ui-corner-all"><?= t("Activate GD") ?></a>
   </p>
   <? elseif ($tk->installed): ?>
   <? if ($tk->error): ?>
@@ -20,7 +20,7 @@
   </p>
   <? endif ?>
   <p>
-    <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate GD") ?></a>
+    <a class="g-button ui-state-default ui-corner-all"><?= t("Activate GD") ?></a>
   </p>
   <? else: ?>
   <div class="gModuleStatus gInfo">
diff --git a/modules/gallery/views/admin_graphics_graphicsmagick.html.php b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
index 97624850..6ee15bc3 100644
--- a/modules/gallery/views/admin_graphics_graphicsmagick.html.php
+++ b/modules/gallery/views/admin_graphics_graphicsmagick.html.php
@@ -11,7 +11,7 @@
     <?= t("GraphicsMagick version %version is available in %dir", array("version" => $tk->version, "dir" => $tk->dir)) ?>
   </div>
   <p>
-    <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate Graphics Magic") ?></a>
+    <a class="g-button ui-state-default ui-corner-all"><?= t("Activate Graphics Magic") ?></a>
   </p>
   <? else: ?>
   <div class="gModuleStatus gWarning">
diff --git a/modules/gallery/views/admin_graphics_imagemagick.html.php b/modules/gallery/views/admin_graphics_imagemagick.html.php
index cdff7c2c..aeef4919 100644
--- a/modules/gallery/views/admin_graphics_imagemagick.html.php
+++ b/modules/gallery/views/admin_graphics_imagemagick.html.php
@@ -11,7 +11,7 @@
     <?= t("ImageMagick version %version is available in %dir", array("version" => $tk->version, "dir" => $tk->dir)) ?>
   </div>
   <p>
-    <a class="gButtonLink ui-state-default ui-corner-all"><?= t("Activate ImageMagick") ?></a>
+    <a class="g-button ui-state-default ui-corner-all"><?= t("Activate ImageMagick") ?></a>
   </p>
   <? elseif ($tk->error): ?>
   <div class="gModuleStatus gWarning">
diff --git a/modules/gallery/views/admin_languages.html.php b/modules/gallery/views/admin_languages.html.php
index fb30c7ba..d6f50516 100644
--- a/modules/gallery/views/admin_languages.html.php
+++ b/modules/gallery/views/admin_languages.html.php
@@ -88,7 +88,7 @@
     <p><?= t("<strong>Step 3:</strong> Start the translation mode and the translation interface will appear at the bottom of each Gallery page.") ?></p>
 
     <a href="<?= url::site("l10n_client/toggle_l10n_mode?csrf=".access::csrf_token()) ?>"
-       class="gButtonLink ui-state-default ui-corner-all ui-icon-left">
+       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") ?>
diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index ce693d73..8c3917b6 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -30,7 +30,7 @@
         </td>
         <td>
           <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>"
-            class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all">
+            class="gDialogLink g-button ui-icon-left ui-state-default ui-corner-all">
             <?= t("run") ?>
           </a>
         </td>
@@ -61,10 +61,10 @@
           <?= t("Owner") ?>
         </th>
         <th>
-          <?= t("Action") ?>
           <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
-             class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
+             class="g-button g-right ui-icon-left ui-state-default ui-corner-all">
             <?= t("cancel all") ?></a>
+          <?= t("Action") ?>
         </th>
       </tr>
       <? $i = 0; ?>
@@ -95,16 +95,16 @@
           <?= 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="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"
+          <a class="gDialogLink 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 ?>
-          <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>"
-             class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
-            <?= t("cancel") ?>
-          </a>
         </td>
       </tr>
       <? $i++ ?>
@@ -134,10 +134,10 @@
           <?= t("Owner") ?>
         </th>
         <th>
-          <?= t("Action") ?>
           <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
-               class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
+               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; ?>
@@ -166,19 +166,19 @@
         </td>
         <td>
           <? if ($task->done): ?>
-          <a href="<?= url::site("admin/maintenance/remove/$task->id?csrf=$csrf") ?>" class="gButtonLink ui-state-default ui-corner-all">
+          <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="gDialogLink gButtonLink ui-state-default ui-corner-all">
+          <a href="<?= url::site("admin/maintenance/show_log/$task->id?csrf=$csrf") ?>" class="gDialogLink 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="gDialogLink gButtonLink" ui-state-default ui-corner-all>
+          <a href="<?= url::site("admin/maintenance/resume/$task->id?csrf=$csrf") ?>" class="gDialogLink g-button" ui-state-default ui-corner-all>
             <?= t("resume") ?>
           </a>
-          <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" class="gButtonLink ui-state-default ui-corner-all">
+          <a href="<?= url::site("admin/maintenance/cancel/$task->id?csrf=$csrf") ?>" class="g-button ui-state-default ui-corner-all">
             <?= t("cancel") ?>
           </a>
           <? endif ?>
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index ddd5bd17..c0bc0d43 100644
--- a/modules/gallery/views/admin_maintenance_task.html.php
+++ b/modules/gallery/views/admin_maintenance_task.html.php
@@ -57,7 +57,7 @@
   <div id="gStatus">
     <?= t("Starting up...") ?>
   </div>
-  <div class="txtright">
+  <div class="g-txt-right">
     <button id="gPauseButton" class="ui-state-default ui-corner-all" onclick="dismiss()"><?= t("Pause") ?></button>
     <button id="gDoneButton" class="ui-state-default ui-corner-all" style="display: none" onclick="dismiss()"><?= t("Close") ?></button>
   </div>
diff --git a/modules/gallery/views/l10n_client.html.php b/modules/gallery/views/l10n_client.html.php
index b0f424be..a7f001aa 100644
--- a/modules/gallery/views/l10n_client.html.php
+++ b/modules/gallery/views/l10n_client.html.php
@@ -68,7 +68,7 @@
         </div>
         <input type="submit" name="l10n-edit-save" value="<?= t("Save translation")->for_html_attr() ?>"/>
         <a href="javascript: Gallery.l10nClient.copySourceText()"
-           class="gButtonLink ui-state-default ui-corner-all"><?= t("Copy source text") ?></a>
+           class="g-button ui-state-default ui-corner-all"><?= t("Copy source text") ?></a>
       </form>
     </div>
   </div>
diff --git a/modules/gallery/views/welcome_message.html.php b/modules/gallery/views/welcome_message.html.php
index 5515c3dc..021e5772 100644
--- a/modules/gallery/views/welcome_message.html.php
+++ b/modules/gallery/views/welcome_message.html.php
@@ -18,7 +18,7 @@
     <a href="<?= url::site("form/edit/users/{$user->id}") ?>"
       title="<?= t("Edit Your Profile")->for_html_attr() ?>"
       id="gAfterInstallChangePasswordLink"
-      class="gButtonLink ui-state-default ui-corners-all">
+      class="g-button ui-state-default ui-corners-all">
       <?= t("Change Password Now") ?>
     </a>
     <script>
diff --git a/modules/organize/views/organize_dialog.html.php b/modules/organize/views/organize_dialog.html.php
index cbc2e4f9..87f12be9 100644
--- a/modules/organize/views/organize_dialog.html.php
+++ b/modules/organize/views/organize_dialog.html.php
@@ -31,7 +31,7 @@
         </div>
         <div id="gOrganizeControls">
           <a id="gOrganizeClose" href="#" ref="done"
-             class="gButtonLink ui-corner-all ui-state-default"><?= t("Close") ?></a>
+             class="g-button ui-corner-all ui-state-default"><?= t("Close") ?></a>
           <form>
             <?= t("Sort order") ?>
             <?= form::dropdown(array("id" => "gOrganizeSortColumn"), album::get_sort_order_options(), $album->sort_column) ?>
diff --git a/modules/tag/views/admin_tags.html.php b/modules/tag/views/admin_tags.html.php
index 8f3693aa..b7344cda 100644
--- a/modules/tag/views/admin_tags.html.php
+++ b/modules/tag/views/admin_tags.html.php
@@ -23,7 +23,7 @@
   <? $column_tag_count = 0 ?>
 
   <table id="gTagAdmin" class="gBlockContent">
-    <caption class="understate">
+    <caption class="g-understate">
       <?= t2("There is one tag", "There are %count tags", $tags->count()) ?>
     </caption>
     <tr>
@@ -48,9 +48,9 @@
 
           <li>
             <span id="gTag-<?= $tag->id ?>" class="gEditable tag-name"><?= html::clean($tag->name) ?></span>
-            <span class="understate">(<?= $tag->count ?>)</span>
+            <span class="g-understate">(<?= $tag->count ?>)</span>
             <a href="<?= url::site("admin/tags/form_delete/$tag->id") ?>"
-               class="gDialogLink delete-link gButtonLink">
+               class="gDialogLink delete-link g-button">
                 <span class="ui-icon ui-icon-trash"><?= t("Delete this tag") ?></span></a>
           </li>
 
diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php
index c065e4b1..5ee62fae 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/user/views/admin_users.html.php
@@ -43,7 +43,7 @@
 </script>
 <div class="gBlock">
   <a href="<?= url::site("admin/users/add_user_form") ?>"
-      class="gDialogLink gButtonLink right ui-icon-left ui-state-default ui-corner-all"
+      class="gDialogLink 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") ?>
@@ -85,15 +85,15 @@
         <td class="gActions">
           <a href="<?= url::site("admin/users/edit_user_form/$user->id") ?>"
               open_text="<?= t("close") ?>"
-              class="gPanelLink gButtonLink ui-state-default ui-corner-all ui-icon-left">
+              class="gPanelLink g-button ui-state-default ui-corner-all ui-icon-left">
             <span class="ui-icon ui-icon-pencil"></span><span class="gButtonText"><?= t("edit") ?></span></a>
           <? if (user::active()->id != $user->id && !$user->guest): ?>
           <a href="<?= url::site("admin/users/delete_user_form/$user->id") ?>"
-              class="gDialogLink gButtonLink ui-state-default ui-corner-all ui-icon-left">
+              class="gDialogLink 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="gButtonLink ui-state-disabled ui-corner-all ui-icon-left">
+              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>
@@ -105,7 +105,7 @@
 
 <div id="gGroupAdmin" class="gBlock">
   <a href="<?= url::site("admin/users/add_group_form") ?>"
-      class="gDialogLink gButtonLink right ui-icon-left ui-state-default ui-corner-all"
+      class="gDialogLink g-button 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") ?>
diff --git a/modules/user/views/admin_users_group.html.php b/modules/user/views/admin_users_group.html.php
index 476e0817..6f2496f8 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/user/views/admin_users_group.html.php
@@ -4,11 +4,11 @@
   <? if (!$group->special): ?>
   <a href="<?= url::site("admin/users/delete_group_form/$group->id") ?>"
     title="<?= t("Delete the %name group", array("name" => $group->name))->for_html_attr() ?>"
-    class="gDialogLink gButtonLink ui-state-default ui-corner-all">
+    class="gDialogLink g-button ui-state-default ui-corner-all">
     <span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
   <? else: ?>
   <a title="<?= t("This default group cannot be deleted")->for_html_attr() ?>"
-     class="gDialogLink gButtonLink ui-state-disabled ui-corner-all ui-icon-left">
+     class="gDialogLink g-button ui-state-disabled ui-corner-all ui-icon-left">
     <span class="ui-icon ui-icon-trash"><?= t("delete") ?></span></a>
   <? endif ?>
 </h4>
@@ -20,7 +20,7 @@
     <?= html::clean($user->name) ?>
     <? if (!$group->special): ?>
     <a href="javascript:remove_user(<?= $user->id ?>, <?= $group->id ?>)"
-       class="gButtonLink ui-state-default ui-corner-all ui-icon-left"
+       class="g-button ui-state-default ui-corner-all ui-icon-left"
        title="<?= t("Remove %user from %group group",
               array("user" => $user->name, "group" => $group->name))->for_html_attr() ?>">
       <span class="ui-icon ui-icon-closethick"><?= t("remove") ?></span>
diff --git a/modules/watermark/views/admin_watermarks.html.php b/modules/watermark/views/admin_watermarks.html.php
index ac69d21d..3790030d 100644
--- a/modules/watermark/views/admin_watermarks.html.php
+++ b/modules/watermark/views/admin_watermarks.html.php
@@ -8,7 +8,7 @@
   <? if (empty($name)): ?>
   <a href="<?= url::site("admin/watermarks/form_add") ?>"
      title="<?= t("Upload a watermark")->for_html_attr() ?>"
-     class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-document-b"></span><?= t("Upload a watermark") ?></a>
+     class="gDialogLink 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>
@@ -27,10 +27,10 @@
     <div class="controls">
       <a href="<?= url::site("admin/watermarks/form_edit") ?>"
          title="<?= t("Edit Watermark")->for_html_attr() ?>"
-         class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-pencil"></span><?= t("edit") ?></a>
+         class="gDialogLink 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="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"><span class="ui-icon ui-icon-trash"></span><?= t("delete") ?></a>
+         class="gDialogLink 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 ?>
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index bd940cbc..737c5939 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -5,7 +5,6 @@
  *
  * Sheet organization:
  *  1)  Basic HTML elements
- *  2)  Reusable classes
  *  3)  Reusable content blocks
  *  4)  Page layout containers
  *  5)  Content blocks in specific layout containers
@@ -69,9 +68,9 @@ h3 {
 a,
 .gMenu a,
 #gDialog a,
-.gButtonLink,
-.gButtonLink:hover,
-.gButtonLink:active,
+.g-button,
+.g-button:hover,
+.g-button:active,
 a.ui-state-hover,
 input.ui-state-hover,
 button.ui-state-hover {
@@ -240,29 +239,6 @@ li.gError select {
 }
 
 /** *******************************************************************
- * 2) Reusable generic classes
- *********************************************************************/
-
-.inactive, .understate {
-  color: #ccc;
-  font-weight: normal;
-}
-
-.left {
-  float: left;
-  margin: 1em 1em 1em 0;
-}
-
-.right {
-  float: right;
-  margin: 1em 0 1em 1em;
-}
-
-.txtright {
-  text-align: right;
-}
-
-/** *******************************************************************
  * 3) Reusable content blocks
  *********************************************************************/
 
@@ -307,11 +283,11 @@ li.gError select {
   background: #eee;
 }
 
-.gAvailable .gButtonLink {
+.gAvailable .g-button {
   width: 96%;
 }
 
-.gSelected .gButtonLink {
+.gSelected .g-button {
   display: none;
 }
 
@@ -399,7 +375,9 @@ tr.gWarning {
   background-color: #fcf9ce;
 }
 
+.gModuleStatus.gInfo,
 #gLogEntries .gInfo,
+.gModuleStatus.gSuccess,
 #gLogEntries .gSuccess {
   background-color: #fff;
 }
@@ -585,7 +563,6 @@ tr.gWarning {
 #gAdminGraphics .gAvailable .gBlock {
   clear: none;
   float: left;
-  height: 17em;
   margin-right: 1em;
   width: 30%;
 }
@@ -650,7 +627,7 @@ li.gGroup h4 {
   border-bottom: 1px dashed #ccc;
   padding: .5em 0 .5em .5em;
 }
-li.gGroup .gButtonLink {
+li.gGroup .g-button {
   padding: 0;
 }
 li.gGroup ul, li.gGroup div {
@@ -667,7 +644,7 @@ li.gGroup div p {
 li.gGroup .gUser {
   padding: .2em 0 0 .5em;
 }
-li.gGroup .gUser .gButtonLink {
+li.gGroup .gUser .g-button {
   vertical-align: middle;
 }
 
@@ -861,13 +838,6 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
 
 /* jQuery UI ThemeRoller buttons */
 
-.gButtonLink {
-  display: inline-block;
-  margin: 0 4px 0 0;
-  padding: .2em .4em;
-  outline: 0;
-}
-
 .gButtonSet {
   padding-left: 1px;
 }
@@ -876,7 +846,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
   float: left;
 }
 
-.gButtonSet .gButtonLink {
+.gButtonSet .g-button {
   margin: 0;
 }
 
@@ -1129,7 +1099,7 @@ li.gDefaultGroup h4, li.gDefaultGroup .gUser {
 	clear: both;
 }
 
-#gTranslations .gButtonLink {
+#gTranslations .g-button {
 	padding: .5em;
 }
 
diff --git a/themes/admin_wind/js/ui.init.js b/themes/admin_wind/js/ui.init.js
index c6379c09..d9b011bd 100644
--- a/themes/admin_wind/js/ui.init.js
+++ b/themes/admin_wind/js/ui.init.js
@@ -37,7 +37,7 @@ $(document).ready(function(){
   if ($("#gAdminCommentsMenu").length) {
     $("#gAdminCommentsMenu ul").removeClass("gMenu").removeClass("sf-menu");
     $("#gAdminCommentsMenu").addClass("gButtonSet");
-    $("#gAdminCommentsMenu a").addClass("gButtonLink ui-state-default");
+    $("#gAdminCommentsMenu a").addClass("g-button ui-state-default");
     $("#gAdminCommentsMenu ul li:first a").addClass("ui-corner-left");
     $("#gAdminCommentsMenu ul li:last a").addClass("ui-corner-right");
   }
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index ef15ed25..b18f010a 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -10,6 +10,7 @@
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
     <?= $theme->css("superfish/css/superfish.css") ?>
+    <?= $theme->css("gallery.common.css") ?>
     <?= $theme->css("screen.css") ?>
     <!--[if lt IE 8]>
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("fix-ie.css") ?>"
diff --git a/themes/admin_wind/views/pager.html.php b/themes/admin_wind/views/pager.html.php
index 5034ec19..29b9f9d0 100644
--- a/themes/admin_wind/views/pager.html.php
+++ b/themes/admin_wind/views/pager.html.php
@@ -10,34 +10,34 @@
                              "count" => $total_items)) ?>
   <li>
   <? if ($first_page): ?>
-    <a href="<?= str_replace('{page}', 1, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+    <a href="<?= str_replace('{page}', 1, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
   <? else: ?>
-    <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+    <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
       <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
   <? endif ?>
   <? if ($previous_page): ?>
-    <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+    <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
   <? else: ?>
-    <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+    <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
       <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
   <? endif ?>
   </li>
   <li class="gInfo"><?= $from_to_msg ?></li>
-  <li class="txtright">
+  <li class="g-txt-right">
   <? if ($next_page): ?>
-    <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+    <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
   <? else: ?>
-    <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+    <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
       <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
   <? endif ?>
   <? if ($last_page): ?>
-    <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+    <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
   <? else: ?>
-    <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+    <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
       <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
   <? endif ?>
   </li>
diff --git a/themes/wind/css/fix-ie.css b/themes/wind/css/fix-ie.css
index eee88c15..4c13764f 100644
--- a/themes/wind/css/fix-ie.css
+++ b/themes/wind/css/fix-ie.css
@@ -28,7 +28,7 @@ input.submit {
   float: none !important;
 }
 
-.gPager .txtright {
+.gPager .g-txt-right {
   width: 29%;
 }
 
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index df46b443..6d955481 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -5,7 +5,6 @@
  *
  * Sheet organization:
  *  1)  Basic HTML elements
- *  2)  Reusable classes
  *  3)  Reusable content blocks
  *  4)  Page layout containers
  *  5)  Content blocks in specific layout containers
@@ -69,9 +68,9 @@ h3 {
 a,
 .gMenu a,
 #gDialog a,
-.gButtonLink,
-.gButtonLink:hover,
-.gButtonLink:active,
+.g-button,
+.g-button:hover,
+.g-button:active,
 a.ui-state-hover,
 input.ui-state-hover,
 button.ui-state-hover {
@@ -243,29 +242,6 @@ li.gError select {
 }
 
 /** *******************************************************************
- * 2) Reusable generic classes
- *********************************************************************/
-
-.inactive, .understate {
-  color: #ccc;
-  font-weight: normal;
-}
-
-.left {
-  float: left;
-  margin: 1em 1em 1em 0;
-}
-
-.right {
-  float: right;
-  margin: 1em 0 1em 1em;
-}
-
-.txtright {
-  text-align: right;
-}
-
-/** *******************************************************************
  * 3) Reusable content blocks
  *********************************************************************/
 
@@ -908,13 +884,6 @@ form .gError,
 
 /* jQuery UI ThemeRoller buttons */
 
-.gButtonLink {
-  display: inline-block;
-  margin: 0 4px 0 0;
-  padding: .2em .4em;
-  outline: 0;
-}
-
 .gButtonSet {
   padding-left: 1px;
 }
@@ -923,7 +892,7 @@ form .gError,
   float: left;
 }
 
-.gButtonSet .gButtonLink {
+.gButtonSet .g-button {
   margin: 0;
 }
 
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index c79e91bd..4a1962c0 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -49,7 +49,7 @@ $(document).ready(function() {
   // Apply styles and icon classes to gContextMenu
   if ($(".gContextMenu").length) {
     $(".gContextMenu li").addClass("ui-state-default");
-    $(".gContextMenu a").addClass("gButtonLink ui-icon-left");
+    $(".gContextMenu a").addClass("g-button ui-icon-left");
     $(".gContextMenu a").prepend("<span class=\"ui-icon\"></span>");
     $(".gContextMenu a span").each(function() {
       var iconClass = $(this).parent().attr("class").match(/ui-icon-.[^\s]+/).toString();
diff --git a/themes/wind/views/movie.html.php b/themes/wind/views/movie.html.php
index 910814dd..cf7c9b7f 100644
--- a/themes/wind/views/movie.html.php
+++ b/themes/wind/views/movie.html.php
@@ -5,20 +5,20 @@
   <ul class="gPager">
     <li>
       <? if ($previous_item): ?>
-      <a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+      <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
       <? else: ?>
-      <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+      <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
       <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
       <? endif; ?>
     </li>
     <li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
-    <li class="txtright">
+    <li class="g-txt-right">
       <? if ($next_item): ?>
-      <a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+      <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
       <? else: ?>
-      <a class="gButtonLink ui-icon-right ui-state-disabled ui-corner-all">
+      <a class="g-button ui-icon-right ui-state-disabled ui-corner-all">
       <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
       <? endif ?>
     </li>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 19d8cc00..414174b6 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -27,6 +27,7 @@
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("superfish/css/superfish.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
+    <?= $theme->css("gallery.common.css") ?>
     <?= $theme->css("screen.css") ?>
     <!--[if lt IE 8]>
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
diff --git a/themes/wind/views/pager.html.php b/themes/wind/views/pager.html.php
index 7cdc9bb0..155c8d16 100644
--- a/themes/wind/views/pager.html.php
+++ b/themes/wind/views/pager.html.php
@@ -10,34 +10,34 @@
                              "count" => $total_items)) ?>
   <li>
   <? if ($first_page): ?>
-    <a href="<?= str_replace('{page}', 1, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+    <a href="<?= str_replace('{page}', 1, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
   <? else: ?>
-    <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+    <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
       <span class="ui-icon ui-icon-seek-first"></span><?= t("first") ?></a>
   <? endif ?>
   <? if ($previous_page): ?>
-    <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+    <a href="<?= str_replace('{page}', $previous_page, $url) ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
   <? else: ?>
-    <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+    <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
       <span class="ui-icon ui-icon-seek-prev"></span><?= t("previous") ?></a>
   <? endif ?>
   </li>
   <li class="gInfo"><?= $from_to_msg ?></li>
-  <li class="txtright">
+  <li class="g-txt-right">
   <? if ($next_page): ?>
-    <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+    <a href="<?= str_replace('{page}', $next_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
   <? else: ?>
-    <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+    <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
       <span class="ui-icon ui-icon-seek-next"></span><?= t("next") ?></a>
   <? endif ?>
   <? if ($last_page): ?>
-    <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+    <a href="<?= str_replace('{page}', $last_page, $url) ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
   <? else: ?>
-    <a class="gButtonLink ui-state-disabled ui-icon-right ui-corner-all">
+    <a class="g-button ui-state-disabled ui-icon-right ui-corner-all">
       <span class="ui-icon ui-icon-seek-end"></span><?= t("last") ?></a>
   <? endif ?>
   </li>
diff --git a/themes/wind/views/photo.html.php b/themes/wind/views/photo.html.php
index b0096043..def3d8b7 100644
--- a/themes/wind/views/photo.html.php
+++ b/themes/wind/views/photo.html.php
@@ -18,20 +18,20 @@
   <ul class="gPager">
     <li>
       <? if ($previous_item): ?>
-      <a href="<?= $previous_item->url() ?>" class="gButtonLink ui-icon-left ui-state-default ui-corner-all">
+      <a href="<?= $previous_item->url() ?>" class="g-button ui-icon-left ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
       <? else: ?>
-      <a class="gButtonLink ui-icon-left ui-state-disabled ui-corner-all">
+      <a class="g-button ui-icon-left ui-state-disabled ui-corner-all">
       <span class="ui-icon ui-icon-triangle-1-w"></span><?= t("previous") ?></a>
       <? endif; ?>
     </li>
     <li class="gInfo"><?= t("%position of %total", array("position" => $position, "total" => $sibling_count)) ?></li>
-    <li class="txtright">
+    <li class="g-txt-right">
       <? if ($next_item): ?>
-      <a href="<?= $next_item->url() ?>" class="gButtonLink ui-icon-right ui-state-default ui-corner-all">
+      <a href="<?= $next_item->url() ?>" class="g-button ui-icon-right ui-state-default ui-corner-all">
       <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
       <? else: ?>
-      <a class="gButtonLink ui-icon-right ui-state-disabled ui-corner-all">
+      <a class="g-button ui-icon-right ui-state-disabled ui-corner-all">
       <span class="ui-icon ui-icon-triangle-1-e"></span><?= t("next") ?></a>
       <? endif ?>
     </li>