Merge commit 'upstream/master'

installer/installer.php

@@ -110,6 +110,7 @@ static function verify_mysql_version($config) {
 
   static function mysql_version($config) {
     $result = mysql_query("SHOW VARIABLES WHERE variable_name = \"version\"");
+    $row = mysql_fetch_object($result);
     return $row->Value;
   }
 

lib/gallery.common.css

@@ -1,111 +1,161 @@
-/* ####### states, interactions, positioning ########### */
+/**
+ * Gallery 3 commonly reused screen styles
+ *
+ * Sheet organization:
+ *  1)  Text
+ *  2)  States and interactions
+ *  3)  Positioning and order
+ *  4)  Reusable containers/widgets
+ */
 
-/* states */
+/** *******************************************************************
+ * 1) Text
+ **********************************************************************/
 
-.g-active,   .g-enabled,  .g-available,   .g-editable,              .g-selected,   .g-highlight {
+
+.g-txt-small {
+	font-size: .8em;
+}
+
+.g-txt-big {
+	font-size: 1.2em;
+}
+
+.g-txt-right {
+	text-align: right;
+}
+
+/** *******************************************************************
+ * 2) States and interactions
+ **********************************************************************/
+
+.g-active,
+.g-enabled,
+.g-available,
+.g-editable,
+.g-selected,
+.g-highlight {
   font-weight: bold;
 }
-.g-inactive, .g-disabled, .g-unavailable, .g-uneditable, .g-locked, .g-unselected, .g-understate {
+
+.g-inactive,
+.g-disabled,
+.g-unavailable,
+.g-uneditable,
+.g-locked,
+.g-unselected,
+.g-understate {
   color: #ccc;
   font-weight: normal;
 }
 
-.g-error, .g-denied {
-
+.g-error,
+.g-info,
+.g-success,
+.g-warning {
+  background-position: .4em 50%;
+  background-repeat: no-repeat;
+  padding: .4em .5em .4em 30px;
 }
-.g-success, .g-allowed {
-
+
+.g-error,
+.g-denied {
+  background-color: #f6cbca;
+  color: #f00;
+  background-image: url('lib/images/ico-error.png');
 }
+
 .g-info {
-
+  background-color: #e8e8e8;
+  background-image: url('lib/images/ico-info.png');
+}
+
+.g-success,
+.g-allowed {
+  background-color: #d9efc2;
+  background-image: url('lib/images/ico-success.png');
 }
+
 .g-warning {
-
+  background-color: #fcf9ce;
+  background-image: url('lib/images/ico-warning.png');
+}
+
+form .g-error {
+  background-color: #fff;
 }
 
 .g-open {
-
 }
+
 .g-closed {
-
 }
 
 .g-installed {
-
 }
+
 .g-default {
-
 }
 
-/* interactions */
-
-.g-draggable, .ui-draggable {
+.g-draggable,
+.ui-draggable {
 	cursor: move;
 }
+
 .g-target {
-
 }
 
-
-
-/* positioning */
+/** *******************************************************************
+ * 3) Positioning and order
+ **********************************************************************/
 
 .g-right {
 	float: right;
 }
+
 .g-left {
 	float: left;
 }
 
-/* order */
-
 .g-first {
-
 }
+
 .g-last {
-
 }
+
 .g-even-row {
-
-}
-.g-odd-row {
-
 }
 
-/* text */
-
-.g-txt-small {
-	font-size: .8em;
-}
-.g-txt-big {
-	font-size: 1.2em;
-}
-.g-txt-right {
-	text-align: right;
+.g-odd-row {
 }
 
-/* ####### reusable containers/widgets ########### */
+/** *******************************************************************
+ * 4) Reusable containers/widgets
+ **********************************************************************/
 
 .g-dialog {
-
 }
 
-.g-button { /* a link styled like a button */
-
+.g-button {
 }
 
 .g-progressbar {
-
 }
 
 .g-block {
-
 }
 
 .g-message-box {
-
+  width: 100%;
+}
+
+.g-message {
+  border: 1px solid #ccc;
+  margin-bottom: .4em;
+}
+
+.g-pager {
 }
 
 .g-list-horizontal {
-
 }

modules/gallery/views/admin_maintenance.html.php

@@ -22,7 +22,7 @@
       <? $i = 0; ?>
       <? foreach ($task_definitions as $task): ?>
       <tr class="<?= log::severity_class($task->severity) ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
-        <td>
+        <td class="<?= log::severity_class($task->severity) ?>">
           <?= $task->name ?>
         </td>
         <td>
@@ -42,10 +42,6 @@ class="gDialogLink gButtonLink ui-icon-left ui-state-default ui-corner-all">
 
   <? if ($running_tasks->count()): ?>
   <div id="gRunningTasks">
-    <a href="<?= url::site("admin/maintenance/cancel_running_tasks?csrf=$csrf") ?>"
-       class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
-      <?= t("cancel all") ?></a>
-
     <h2> <?= t("Running Tasks") ?> </h2>
     <table>
       <tr>
@@ -66,12 +62,15 @@ class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
         </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">
+            <?= t("cancel all") ?></a>
         </th>
       </tr>
       <? $i = 0; ?>
       <? foreach ($running_tasks as $task): ?>
       <tr class="<?= $task->state == "stalled" ? "gWarning" : "" ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
-        <td>
+        <td class="<?= $task->state == "stalled" ? "gWarning" : "" ?>">
           <?= gallery::date_time($task->updated) ?>
         </td>
         <td>
@@ -116,10 +115,6 @@ class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
 
   <? if ($finished_tasks->count()): ?>
   <div id="gFinishedTasks">
-    <a href="<?= url::site("admin/maintenance/remove_finished_tasks?csrf=$csrf") ?>"
-         class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
-       <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
-
     <h2> <?= t("Finished Tasks") ?> </h2>
     <table>
       <tr>
@@ -140,12 +135,15 @@ class="gButtonLink ui-icon-left ui-state-default ui-corner-all right">
         </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">
+             <span class="ui-icon ui-icon-trash"></span><?= t("remove all finished") ?></a>
         </th>
       </tr>
       <? $i = 0; ?>
       <? foreach ($finished_tasks as $task): ?>
       <tr class="<?= $task->state == "success" ? "gSuccess" : "gError" ?> <?= ($i % 2 == 0) ? "gOddRow" : "gEvenRow" ?>">
-        <td>
+        <td class="<?= $task->state == "success" ? "gSuccess" : "gError" ?>">
           <?= gallery::date_time($task->updated) ?>
         </td>
         <td>

modules/gallery/views/admin_maintenance_task.html.php

@@ -23,6 +23,7 @@
       animation = null;
       delta = 1;
     }
+    $.fn.gallery_hover_init();
   }
 
   update = function() {