From 069d56383e78cd66b07e08d60ef3fff3d47c0207 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Wed, 17 Jan 2024 17:51:45 +0100 Subject: [PATCH] PhotosIndex: replace edit button with edit menu --- controllers/EditAsset.php | 16 ++++++++++++++++ public/css/admin.css | 24 ------------------------ public/css/default.css | 28 ++++++++++++++++++++++++++++ templates/PhotoPage.php | 20 +++++++++++--------- templates/PhotosIndex.php | 25 +++++++++++++++++++++++-- 5 files changed, 78 insertions(+), 35 deletions(-) diff --git a/controllers/EditAsset.php b/controllers/EditAsset.php index 6937f98e..010144f0 100644 --- a/controllers/EditAsset.php +++ b/controllers/EditAsset.php @@ -30,6 +30,22 @@ class EditAsset extends HTMLController header('Location: ' . $redirectUrl); exit; } + else if ((isset($_REQUEST['inc_prio']) || isset($_REQUEST['dec_prio'])) && Session::validateSession('get')) + { + if (isset($_REQUEST['inc_prio'])) + $priority = $asset->priority + 1; + else + $priority = $asset->priority - 1; + + $asset->priority = max(0, min(100, $priority)); + $asset->save(); + + if (isset($_SERVER['HTTP_REFERER'])) + header('Location: ' . $_SERVER['HTTP_REFERER']); + else + header('Location: ' . BASEURL . '/' . $asset->getSubdir()); + exit; + } // Get a list of available photo albums $allAlbums = []; diff --git a/public/css/admin.css b/public/css/admin.css index 24c1941f..3213d449 100644 --- a/public/css/admin.css +++ b/public/css/admin.css @@ -1,27 +1,3 @@ -/* Edit icon on tiled grids ------------------------------*/ -.polaroid { - position: relative; -} -.polaroid a.edit { - background: var(--bs-body-bg); - border-radius: 3px; - box-shadow: 1px 1px 2px rgba(0,0,0,0.3); - color: var(--bs-body-color); - opacity: 0; - left: 20px; - line-height: 1.5; - padding: 5px 10px; - position: absolute; - transition: 0.25s; - top: 20px; - z-index: 50; -} -.polaroid:hover > a.edit { - opacity: 1; -} - - /* Crop editor ----------------*/ #crop_editor { diff --git a/public/css/default.css b/public/css/default.css index ee3b117d..03f25f12 100644 --- a/public/css/default.css +++ b/public/css/default.css @@ -296,6 +296,34 @@ div.polaroid a { } +/* Edit icon on tiled grids +-----------------------------*/ +.polaroid { + position: relative; +} +.polaroid div.edit { + box-shadow: 1px 1px 2px rgba(0,0,0,0.3); + opacity: 0; + left: 20px; + position: absolute; + transition: 0.25s; + top: 20px; + z-index: 50; +} +.polaroid div.edit .dropdown-item { + line-height: 1.4; +} +.polaroid div.edit .dropdown-toggle { + line-height: 1.4; + padding: 0.25rem 0.5rem; +} +.polaroid div.edit .dropdown-toggle::after { + margin-left: 0; +} +.polaroid:hover > div.edit { + opacity: 1; +} + /* Album title boxes ----------------------*/ diff --git a/templates/PhotoPage.php b/templates/PhotoPage.php index 0b309543..39d6c79f 100644 --- a/templates/PhotoPage.php +++ b/templates/PhotoPage.php @@ -25,7 +25,15 @@ class PhotoPage extends Template echo '
-
+
'; + + $this->photoMeta(); + + echo ' +
+
+
+
'; $this->userActions(); @@ -39,12 +47,6 @@ class PhotoPage extends Template echo '
-
'; - - $this->photoMeta(); - - echo ' -
'; } @@ -109,12 +111,12 @@ class PhotoPage extends Template private function photoMeta() { echo ' -