From 1dff9fa9b7b14780e59df5363cda76456a6fa966 Mon Sep 17 00:00:00 2001 From: Zacharie Date: Mon, 3 Aug 2020 15:27:36 +0200 Subject: [PATCH] Issue #1200 : Add "Move Album" link in direct menu of albums, remove it from "Album List" tabsheet, design fixes --- admin.php | 1 + admin/cat_move.php | 7 ----- admin/include/add_core_tabs.inc.php | 1 - admin/themes/default/template/admin.tpl | 1 + admin/themes/default/template/cat_move.tpl | 36 +++++++++++----------- admin/themes/default/template/intro.tpl | 1 + admin/themes/default/theme.css | 36 +--------------------- admin/themes/roma/theme.css | 9 ++++++ 8 files changed, 31 insertions(+), 61 deletions(-) diff --git a/admin.php b/admin.php index 9b0d86879..809eecc78 100644 --- a/admin.php +++ b/admin.php @@ -181,6 +181,7 @@ $template->assign( 'U_CONFIG_LANGUAGES' => $link_start.'languages', 'U_CONFIG_THEMES'=> $link_start.'themes', 'U_CATEGORIES'=> $link_start.'cat_list', + 'U_CAT_MOVE'=> $link_start.'cat_move', 'U_CAT_OPTIONS'=> $link_start.'cat_options', 'U_CAT_UPDATE'=> $link_start.'site_update&site=1', 'U_RATING'=> $link_start.'rating', diff --git a/admin/cat_move.php b/admin/cat_move.php index 3e134db3a..4a81fe430 100644 --- a/admin/cat_move.php +++ b/admin/cat_move.php @@ -119,13 +119,6 @@ $template->assign( 'F_ACTION' => get_root_url().'admin.php?page=cat_move', ) ); - -// +-----------------------------------------------------------------------+ -// | tabs | -// +-----------------------------------------------------------------------+ - -$page['tab'] = 'move'; -include(PHPWG_ROOT_PATH.'admin/include/albums_tab.inc.php'); // +-----------------------------------------------------------------------+ // | Album display | diff --git a/admin/include/add_core_tabs.inc.php b/admin/include/add_core_tabs.inc.php index 924780b37..e4a686056 100644 --- a/admin/include/add_core_tabs.inc.php +++ b/admin/include/add_core_tabs.inc.php @@ -32,7 +32,6 @@ function add_core_tabs($sheets, $tab_id) case 'albums': global $my_base_url; $sheets['list'] = array('caption' => ''.l10n('List'), 'url' => $my_base_url.'cat_list'); - $sheets['move'] = array('caption' => ''.l10n('Move'), 'url' => $my_base_url.'cat_move'); $sheets['permalinks'] = array('caption' => ''.l10n('Permalinks'), 'url' => $my_base_url.'permalinks'); break; diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl index 9ae6973ed..efbcff6e9 100644 --- a/admin/themes/default/template/admin.tpl +++ b/admin/themes/default/template/admin.tpl @@ -71,6 +71,7 @@ jQuery(document).ready(function() {
diff --git a/admin/themes/default/template/cat_move.tpl b/admin/themes/default/template/cat_move.tpl index c23c98b96..1e83e265d 100644 --- a/admin/themes/default/template/cat_move.tpl +++ b/admin/themes/default/template/cat_move.tpl @@ -36,40 +36,40 @@ var openCat = {$open_cat};
-
diff --git a/admin/themes/default/template/intro.tpl b/admin/themes/default/template/intro.tpl index 2c53a6b5b..6cad79619 100644 --- a/admin/themes/default/template/intro.tpl +++ b/admin/themes/default/template/intro.tpl @@ -194,6 +194,7 @@ $(window).on('resize', function(){ {elseif $action == "Delete"} {$number} {elseif $action == "Login"} {$number} {elseif $action == "Logout"} {$number} + {elseif $action == "Move"} {$number} {else} ({$action|@translate}) {$number} {/if} {/foreach} diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 5bfe3f12a..8c673e1a6 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -2887,7 +2887,7 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;} background-color: #f3f3f3; border-radius: 10px; display: block; - width: 30%; + width: 25%; position: absolute; left: 50%; top: 50%; @@ -2910,40 +2910,6 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;} .cat-move-order-popin label { position: relative; padding: 5px; - padding-left: 25px; -} - -.cat-move-order-popin .order-checkmark { - width:16px; - height: 16px; - border-radius: 100%; - background-color: #d5d5d5; - position: absolute; - top: 50%; - left: 0px; - transform: translate(0, -50%); - transition: ease 0.3s; -} - -.cat-move-order-popin .order-checkmark::before { - content: ""; - padding: 0px; - background-color: #ffa646; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - border-radius: 100%; - transition: ease 0.3s; - opacity: 0.15; -} - -.cat-move-order-popin input:checked + .order-checkmark::before { - padding: 15px; -} - -.cat-move-order-popin input:checked + .order-checkmark { - background-color: #ffa646; } .cat-move-order-popin input[type=radio] { diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css index e683865b2..b10076371 100644 --- a/admin/themes/roma/theme.css +++ b/admin/themes/roma/theme.css @@ -1035,6 +1035,15 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; box-shadow: none; } +.cat-move-order-popin .order-popin-container { + background-color: #444; + color: white; +} + +.cat-move-order-popin .album-name { + color: white; +} + /* Icon colors*/ .icon-red {