diff --git a/admin/cat_move.php b/admin/cat_move.php index 4a81fe430..9824b9b26 100644 --- a/admin/cat_move.php +++ b/admin/cat_move.php @@ -115,7 +115,6 @@ $template->set_filename('cat_move', 'cat_move.tpl'); $template->assign( array( - 'U_HELP' => get_root_url().'admin/popuphelp.php?page=cat_move', 'F_ACTION' => get_root_url().'admin.php?page=cat_move', ) ); diff --git a/admin/themes/default/js/cat_move.js b/admin/themes/default/js/cat_move.js index 6eb1ee4cd..c4aa6ebe9 100644 --- a/admin/themes/default/js/cat_move.js +++ b/admin/themes/default/js/cat_move.js @@ -34,10 +34,11 @@ $(document).ready(() => { } else { cont.append($(icon.replace(/%icon%/g, 'icon-folder-open'))); } - + cont.append($(title.replace(/%name%/g, node.name))); + if (node.status == 'private') { - cont.append($(icon.replace(/%icon%/g, 'icon-lock'))); + cont.find(".move-cat-title").addClass('icon-lock'); } cont.append(actions); diff --git a/admin/themes/default/template/cat_move.tpl b/admin/themes/default/template/cat_move.tpl index 085cdc09d..78132c2dd 100644 --- a/admin/themes/default/template/cat_move.tpl +++ b/admin/themes/default/template/cat_move.tpl @@ -6,7 +6,7 @@ var str_hide_sub = "{'Hide sub-albums'|@translate}"; var str_manage_sub_album = "{'Manage sub-albums'|@translate}"; var str_apply_order = "{'Apply an automatic order to sub-albums'|@translate}"; var str_edit = "{'Edit album'|@translate}"; -var str_are_you_sure = "{'Album \'%s\' status and his sub-albums will change to private. Are you sure ?'|@translate}"; +var str_are_you_sure = "{'The status of the album \'%s\' and its sub-albums will change to private. Are you sure?'|@translate}"; var str_yes_change_parent = "{'Yes change parent anyway'|@translate}" var str_no_change_parent = "{'No, don\'t move this album here'|@translate}" var str_root = "{'Root'|@translate}" @@ -26,14 +26,11 @@ var openCat = {$open_cat};

{'Move albums'|@translate}

-
{"Waiting for a response from Piwigo"|@translate}
- -
-
{"Apply an automatic order"|@translate}
-
+
{"Apply an automatic order"|@translate}
+
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 5674c5f87..72ac8a42f 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -2820,6 +2820,7 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;} overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + font-weight: 600; } .move-cat-container .move-cat-toogler { @@ -2829,6 +2830,7 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;} align-items: center; cursor: pointer; z-index: 2; + font-weight: 600; } .move-cat-action-cont { @@ -2897,8 +2899,10 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;} } .cat-move-order-popin .album-name { - font-size: 16px; + font-size: 14px; color: #3C3C3C; + font-weight: 600; + text-align: center; } .cat-move-order-popin .choice-container { @@ -2921,11 +2925,11 @@ FORM#categoryOrdering p.albumActions .userSeparator {margin:0 5px;} margin: 10px 0px; } -.cat-move-order-popin input[name=recursive] { +.cat-move-order-popin input[name=recursiveAutoOrder] { background-color: #d9d9d9; } -.cat-move-order-popin input[name=recursive]:hover { +.cat-move-order-popin input[name=recursiveAutoOrder]:hover { background-color: #ffc17e; }