Merge commit 'upstream/master'

3 files changed, 28 insertions, 16 deletions

diff --git a/modules/gallery/helpers/album.php b/modules/gallery/helpers/album.php
index 5f10bd02..0263e0e1 100644
--- a/modules/gallery/helpers/album.php
+++ b/modules/gallery/helpers/album.php
@@ -94,9 +94,11 @@ class album_Core {
   }
 
   static function get_edit_form($parent) {
-    $form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gEditAlbumForm"));
-    $form->hidden("_method")->value("put");
-    $group = $form->group("edit_item")->label(t("Edit Album"));
+    $view = new View("item_edit.html");
+    $view->script = array();
+    $view->form = new Forge("albums/{$parent->id}", "", "post", array("id" => "gEditAlbumForm"));
+    $view->form->hidden("_method")->value("put");
+    $group = $view->form->group("edit_item")->label(t("Edit Album"));
 
     $group->input("title")->label(t("Title"))->value($parent->title);
     $group->textarea("description")->label(t("Description"))->value($parent->description);
@@ -127,11 +129,11 @@ class album_Core {
                       "DESC" => t("Descending")))
       ->selected($parent->sort_order);
 
-    module::event("item_edit_form", $parent, $form);
+    module::event("item_edit_form", $parent, $view);
 
     $group->hidden("type")->value("album");
     $group->submit("")->value(t("Modify"));
-    $form->add_rules_from(ORM::factory("item"));
-    return $form;
+    $view->form->add_rules_from(ORM::factory("item"));
+    return $view;
   }
 }
diff --git a/modules/gallery/helpers/gallery_quick.php b/modules/gallery/helpers/gallery_quick.php
index d0ffc584..8a92890b 100644
--- a/modules/gallery/helpers/gallery_quick.php
+++ b/modules/gallery/helpers/gallery_quick.php
@@ -108,12 +108,20 @@ class gallery_quick_Core {
         "href" => url::site("move/browse/$item->id"));
     }
 
-    if (access::can("edit", $item->parent())) {
-      $disabledState =
-        $item->type == "album" && empty($item->album_cover_item_id) ? " ui-state-disabled" : "";
+    $parent = $item->parent();
+    if (access::can("edit", $parent)) {
+      // We can't make this item the highlight if it's an album with no album cover, or if it's
+      // already the album cover.
+      if (($item->type == "album" && empty($item->album_cover_item_id)) ||
+          ($item->type == "album" && $parent->album_cover_item_id == $item->album_cover_item_id) ||
+          $parent->album_cover_item_id == $item->id) {
+        $disabledState = " ui-state-disabled";
+      } else {
+        $disabledState = " ";
+      }
       $elements["right"][] = (object)array(
         "title" => $cover_title,
-        "class" => "gButtonLink{$disabledState}",
+        "class" => "gButtonLink$disabledState",
         "icon" => "ui-icon-star",
         "href" => url::site("quick/make_album_cover/$item->id?csrf=$csrf&page_type=$page_type"));
 
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 5cf37de1..299195e9 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -135,9 +135,11 @@ class photo_Core {
   }
 
   static function get_edit_form($photo) {
-    $form = new Forge("photos/$photo->id", "", "post", array("id" => "gEditPhotoForm"));
-    $form->hidden("_method")->value("put");
-    $group = $form->group("edit_item")->label(t("Edit Photo"));
+    $view = new View("item_edit.html");
+    $view->script = array();
+    $view->form = new Forge("photos/$photo->id", "", "post", array("id" => "gEditPhotoForm"));
+    $view->form->hidden("_method")->value("put");
+    $group = $view->form->group("edit_item")->label(t("Edit Photo"));
     $group->input("title")->label(t("Title"))->value($photo->title);
     $group->textarea("description")->label(t("Description"))->value($photo->description);
     $group->input("filename")->label(t("Filename"))->value($photo->name)
@@ -147,11 +149,11 @@ class photo_Core {
       ->callback("item::validate_no_trailing_period")
       ->error_messages("no_trailing_period", t("The photo name can't end in \".\""));
 
-    module::event("item_edit_form", $photo, $form);
+    module::event("item_edit_form", $photo, $view);
 
     $group->submit("")->value(t("Modify"));
-    $form->add_rules_from(ORM::factory("item"));
-    return $form;
+    $view->form->add_rules_from(ORM::factory("item"));
+    return $view;
   }
 
   /**