From d23971901be816aee0e49d086507b4aa01a762b2 Mon Sep 17 00:00:00 2001 From: Zacharie Date: Mon, 20 Jul 2020 14:39:46 +0200 Subject: [PATCH] Design and bug fixes : * Change batch manager checkbox to correspond to tag manager * See button on picture edit page is now unavailable if the picture is in a private album * Language correction * Design fixes on batch manager selects (and general design fixes on batch manager) * Minor design fixes --- admin/picture_modify.php | 2 +- admin/themes/clear/theme.css | 13 +---- .../default/template/batch_manager_global.tpl | 24 ++++----- admin/themes/default/template/group_list.tpl | 2 +- .../default/template/picture_modify.tpl | 6 ++- admin/themes/default/template/tags.tpl | 18 +++---- admin/themes/default/template/user_list.tpl | 2 +- admin/themes/default/theme.css | 53 +++++++++++++------ admin/themes/roma/theme.css | 8 +-- language/af_ZA/admin.lang.php | 6 +-- language/ar_SA/admin.lang.php | 6 +-- language/bg_BG/admin.lang.php | 8 +-- language/br_FR/admin.lang.php | 8 +-- language/ca_ES/admin.lang.php | 8 +-- language/cs_CZ/admin.lang.php | 8 +-- language/da_DK/admin.lang.php | 8 +-- language/de_DE/admin.lang.php | 8 +-- language/el_GR/admin.lang.php | 8 +-- language/en_UK/admin.lang.php | 8 +-- language/eo_EO/admin.lang.php | 8 +-- language/es_ES/admin.lang.php | 8 +-- language/et_EE/admin.lang.php | 8 +-- language/eu_ES/admin.lang.php | 8 +-- language/fa_IR/admin.lang.php | 8 +-- language/fi_FI/admin.lang.php | 2 +- language/fr_CA/admin.lang.php | 8 +-- language/fr_FR/admin.lang.php | 8 +-- language/gl_ES/admin.lang.php | 6 +-- language/he_IL/admin.lang.php | 8 +-- language/hr_HR/admin.lang.php | 2 +- language/hu_HU/admin.lang.php | 8 +-- language/it_IT/admin.lang.php | 8 +-- language/ja_JP/admin.lang.php | 8 +-- language/ka_GE/admin.lang.php | 2 +- language/ko_KR/admin.lang.php | 6 +-- language/lt_LT/admin.lang.php | 8 +-- language/lv_LV/admin.lang.php | 8 +-- language/mn_MN/admin.lang.php | 6 +-- language/nb_NO/admin.lang.php | 8 +-- language/nl_NL/admin.lang.php | 8 +-- language/nn_NO/admin.lang.php | 6 +-- language/pl_PL/admin.lang.php | 8 +-- language/pt_BR/admin.lang.php | 8 +-- language/pt_PT/admin.lang.php | 8 +-- language/ro_RO/admin.lang.php | 8 +-- language/ru_RU/admin.lang.php | 8 +-- language/sh_RS/admin.lang.php | 4 +- language/sk_SK/admin.lang.php | 8 +-- language/sl_SI/admin.lang.php | 8 +-- language/sr_RS/admin.lang.php | 8 +-- language/sv_SE/admin.lang.php | 8 +-- language/th_TH/admin.lang.php | 8 +-- language/tr_TR/admin.lang.php | 8 +-- language/uk_UA/admin.lang.php | 8 +-- language/vi_VN/admin.lang.php | 8 +-- language/zh_CN/admin.lang.php | 8 +-- language/zh_HK/admin.lang.php | 6 +-- language/zh_TW/admin.lang.php | 6 +-- 58 files changed, 246 insertions(+), 236 deletions(-) diff --git a/admin/picture_modify.php b/admin/picture_modify.php index 6919b525d..e5cc2feee 100644 --- a/admin/picture_modify.php +++ b/admin/picture_modify.php @@ -422,7 +422,7 @@ else if (isset($url_img)) { - $template->assign( 'U_JUMPTO', $url_img ); + $template->assign( 'U_JUMPTO', $url_img ); } // associate to albums diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css index cbd3858a5..83befc065 100644 --- a/admin/themes/clear/theme.css +++ b/admin/themes/clear/theme.css @@ -239,16 +239,8 @@ UL.thumbnails li.rank-of-image {background-color: #ddd;} color:#999; } -#batchManagerGlobal .thumbnails li:hover .font-checkbox [class*="icon-check"]::before { - color: #3C3C3C; - background-color: #fea744; - border: 2px solid #3C3C3C; -} - #batchManagerGlobal li.thumbSelected .font-checkbox [class*="icon-check"]::before { - color: #3C3C3C; - background-color: #fea744; - border: 2px solid #3C3C3C; + color: white; display: block; } @@ -702,7 +694,7 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; .addFilesButtonChanged:hover {background-color: #BBB;} #checkActions a, .deleteDerivButtons a {background-color: #E8E8E8;} -#addFilter, #filterList select, .pictureLevels select {background-color: #FFF; color: #4E4E4E; border: 2px solid #7070704f !important;} +#addFilter, #filterList select, .pictureLevels select, #permitAction select {background-color: #FFF; color: #4E4E4E; border: 2px solid #7070704f !important; outline: none !important;} #filter_category .selectize-input.items.full.has-options.has-items, #filter_tags .selectize-input.items.not-full.has-options, #filter_tags .selectize-input.items.not-full, #filter_search input, #action_associate .selectize-input.items.full.has-options.has-items, #action_dissociate .selectize-input.items.full.has-options.has-items { @@ -710,7 +702,6 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; background: #FFF; color: #3C3C3CBD; } -#permitAction select {background-color: #FFF; color: #4E4E4E; border: 1px solid #787777a6;} #action_associate a:last-child {background: #FFF; border: 1px solid #787777a6; box-shadow: none;} #forbidAction, .selectionEmptyBlock {background-color: #f3f3f3;} #action_title .large, #action_author .large {background-color: #FFF; color: #4E4E4E;} diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl index c92b67027..06f009f86 100644 --- a/admin/themes/default/template/batch_manager_global.tpl +++ b/admin/themes/default/template/batch_manager_global.tpl @@ -340,7 +340,7 @@ var sliders = {

@@ -363,7 +362,7 @@ var sliders = {