Merge branch 'master' into talmdal_dev

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 {

modules/comment/views/admin_comments.html.php

@@ -116,7 +116,7 @@ class="gAvatar"
               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 @@ class="gAvatar"
         <? 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 @@ class="gButtonLink ui-state-default ui-icon-left">
         <? 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 @@ class="gButtonLink ui-state-default ui-icon-left">
         <? 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,22 +166,22 @@ class="gButtonLink ui-state-default ui-icon-left">
           <!--
           <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>
           </li>
           -->
           <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>

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>

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>

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>

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")) ?>

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">

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">

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">

modules/gallery/views/admin_languages.html.php

@@ -88,7 +88,7 @@ class="gDocLink ui-state-default ui-corner-all ui-icon ui-icon-help"
     <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") ?>

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 @@ class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all">
           <?= 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 @@ class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
           <?= 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 @@ class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
           <?= 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 @@ class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
         </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 ?>

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>

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>

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>

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) ?>

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>
 

modules/user/views/admin_users.html.php

@@ -43,7 +43,7 @@ function() {
 </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 @@ class="gDialogLink gButtonLink right ui-icon-left ui-state-default ui-corner-all
         <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 @@ class="gButtonLink ui-state-disabled ui-corner-all ui-icon-left">
 
 <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") ?>

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 @@ class="gDialogLink gButtonLink ui-state-disabled ui-corner-all ui-icon-left">
     <?= 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>

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 @@ class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all"><spa
     <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 ?>