Fix up the quick-edit code on the photos page. Everything but "move"

is implemented.  Can't do move easily because it's tricky to handle
the post-move redirect.

1 files changed, 13 insertions, 10 deletions

diff --git a/core/views/quick_pane.html.php b/core/views/quick_pane.html.php
index 9bdff325..1dba206f 100644
--- a/core/views/quick_pane.html.php
+++ b/core/views/quick_pane.html.php
@@ -1,27 +1,27 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<? if ($item->type == "photo" || $item->type == "resize"): ?>
+<? if ($item->type == "photo"): ?>
 <? $title = t("Edit this photo") ?>
 <? elseif ($item->type == "movie"): ?>
 <? $title = t("Edit this movie") ?>
 <? elseif ($item->type == "album"): ?>
 <? $title = t("Edit this album") ?>
 <? endif ?>
-<a class="gDialogLink gButtonLink ui-corner-all ui-state-default" href="<?= url::site("quick/form_edit/$item->id") ?>"
+<a class="gDialogLink gButtonLink ui-corner-all ui-state-default" href="<?= url::site("quick/form_edit/$item->id?page_type=$page_type") ?>"
   title="<?= $title ?>">
   <span class="ui-icon ui-icon-pencil">
     <?= $title ?>
   </span>
 </a>
 
-<? if (($item->is_photo() || $item->type == "resize") && graphics::can("rotate")): ?>
-<a class="gButtonLink ui-corner-all ui-state-default" href="<?= url::site("quick/rotate/$item->id/ccw?csrf=$csrf") ?>"
+<? if ($item->is_photo() && graphics::can("rotate")): ?>
+<a class="gButtonLink ui-corner-all ui-state-default" href="<?= url::site("quick/rotate/$item->id/ccw?csrf=$csrf&page_type=$page_type") ?>"
   title="<?= t("Rotate 90 degrees counter clockwise") ?>">
   <span class="ui-icon ui-icon-rotate-ccw">
     <?= t("Rotate 90 degrees counter clockwise") ?>
   </span>
 </a>
 
-<a class="gButtonLink ui-corner-all ui-state-default" href="<?= url::site("quick/rotate/$item->id/cw?csrf=$csrf") ?>"
+<a class="gButtonLink ui-corner-all ui-state-default" href="<?= url::site("quick/rotate/$item->id/cw?csrf=$csrf&page_type=$page_type") ?>"
   title="<?= t("Rotate 90 degrees clockwise") ?>">
   <span class="ui-icon ui-icon-rotate-cw">
     <?= t("Rotate 90 degrees clockwise") ?>
@@ -29,7 +29,9 @@
 </a>
 <? endif ?>
 
-<? if ($item->type == "photo" || $item->type == "resize"): ?>
+<? // Don't move photos from the photo page; we don't yet have a good way of redirecting after move ?>
+<? if ($page_type == "album"): ?>
+<? if ($item->type == "photo"): ?>
 <? $title = t("Move this photo to another album") ?>
 <? elseif ($item->type == "movie"): ?>
 <? $title = t("Move this movie to another album") ?>
@@ -42,30 +44,31 @@
     <?= $title ?>
   </span>
 </a>
+<? endif ?>
 
 <? if (access::can("edit", $item->parent())): ?>
-<? if ($item->type == "photo" || $item->type == "resize"): ?>
+<? if ($item->type == "photo"): ?>
 <? $title = t("Choose this photo as the album cover") ?>
 <? elseif ($item->type == "movie"): ?>
 <? $title = t("Choose this movie as the album cover") ?>
 <? elseif ($item->type == "album"): ?>
 <? $title = t("Choose this album as the album cover") ?>
 <? endif ?>
-<a class="gButtonLink ui-corner-all ui-state-default" href="<?= url::site("quick/make_album_cover/$item->id?csrf=$csrf") ?>"
+<a class="gButtonLink ui-corner-all ui-state-default" href="<?= url::site("quick/make_album_cover/$item->id?csrf=$csrf&page_type=$page_type") ?>"
    title="<?= $title ?>">
   <span class="ui-icon ui-icon-star">
     <?= $title ?>
   </span>
 </a>
 
-<? if ($item->type == "photo" || $item->type == "resize"): ?>
+<? if ($item->type == "photo"): ?>
 <? $title = t("Delete this photo") ?>
 <? elseif ($item->type == "movie"): ?>
 <? $title = t("Delete this movie") ?>
 <? elseif ($item->type == "album"): ?>
 <? $title = t("Delete this album") ?>
 <? endif ?>
-<a class="gButtonLink ui-corner-all ui-state-default" href="<?= url::site("quick/delete/$item->id?csrf=$csrf") ?>"
+<a class="gButtonLink ui-corner-all ui-state-default" href="<?= url::site("quick/delete/$item->id?csrf=$csrf&page_type=$page_type") ?>"
    title="<?= $title ?>">
   <span class="ui-icon ui-icon-trash">
     <?= $title ?>