Merge commit 'upstream/master'

3 files changed, 18 insertions, 14 deletions

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 035ed1da..adfc7fd2 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -268,13 +268,16 @@ class gallery_Core {
         } else {
           $disabledState = " ";
         }
+        if ($item->is_photo()) {
+          $options_menu
+            ->append(Menu::factory("ajax_link")
+                     ->id("make_album_cover")
+                     ->label($cover_title)
+                     ->css_class("ui-icon-star")
+                     ->ajax_handler("function(data) { window.location.reload() }")
+                     ->url(url::site("quick/make_album_cover/$item->id?csrf=$csrf")));
+        }
         $options_menu
-          ->append(Menu::factory("ajax_link")
-                   ->id("make_album_cover")
-                   ->label($cover_title)
-                   ->css_class("ui-icon-star")
-                   ->ajax_handler("function(data) { window.location.reload() }")
-                   ->url(url::site("quick/make_album_cover/$item->id?csrf=$csrf")))
           ->append(Menu::factory("dialog")
                    ->id("delete")
                    ->label($delete_title)
@@ -288,17 +291,17 @@ class gallery_Core {
           ->append(Menu::factory("dialog")
                    ->id("add_item")
                    ->label(t("Add a photo"))
-                   ->css_class("add_item")
+                   ->css_class("ui-icon-plus")
                    ->url(url::site("simple_uploader/app/$item->id")))
           ->append(Menu::factory("dialog")
                    ->id("add_album")
                    ->label(t("Add an album"))
-                   ->css_class("add_album")
+                   ->css_class("ui-icon-note")
                    ->url(url::site("form/add/albums/$item->id?type=album")))
           ->append(Menu::factory("dialog")
                    ->id("edit_permissions")
                    ->label(t("Edit permissions"))
-                   ->css_class("permissions")
+                   ->css_class("ui-icon-key")
                    ->url(url::site("permissions/browse/$item->id")));
       }
     }
diff --git a/modules/gallery/views/admin_maintenance_task.html.php b/modules/gallery/views/admin_maintenance_task.html.php
index fc0e0af5..ddd5bd17 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>
+  <div class="txtright">
     <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/organize/helpers/organize_event.php b/modules/organize/helpers/organize_event.php
index 79077db3..d6043116 100644
--- a/modules/organize/helpers/organize_event.php
+++ b/modules/organize/helpers/organize_event.php
@@ -24,10 +24,10 @@ class organize_event_Core {
     if ($item && $item->is_album() && access::can("edit", $item)) {
       $menu->get("options_menu")
         ->append(Menu::factory("dialog")
-        ->id("organize")
-        ->label(t("Organize Album"))
-        ->css_id("gOrganizeLink")
-        ->url(url::site("organize/dialog/{$item->id}")));
+                 ->id("organize")
+                 ->label(t("Organize Album"))
+                 ->css_id("gOrganizeLink")
+                 ->url(url::site("organize/dialog/{$item->id}")));
     }
   }
 
@@ -38,6 +38,7 @@ class organize_event_Core {
                  ->id("organize")
                  ->label(t("Organize album"))
                  ->css_id("gOrganizeLink")
+                 ->css_class("ui-icon-folder-open")
                  ->url(url::site("organize/dialog/{$item->id}")));
     }
   }