From 8c2e6c5eb47906bbeefe6cd4eafa1431aecf6b89 Mon Sep 17 00:00:00 2001 From: Matthieu Leproux Date: Wed, 6 Oct 2021 12:07:31 +0200 Subject: [PATCH] related to #1504 Adjustments for plugin manager --- admin/plugins_installed.php | 5 ----- admin/themes/default/js/plugins_installated.js | 16 +++++++++++++++- .../default/template/plugins_installed.tpl | 5 ++++- admin/themes/default/theme.css | 4 ++-- language/en_UK/admin.lang.php | 1 + language/fr_FR/admin.lang.php | 2 +- 6 files changed, 23 insertions(+), 10 deletions(-) diff --git a/admin/plugins_installed.php b/admin/plugins_installed.php index 667541c76..0837dc9d6 100644 --- a/admin/plugins_installed.php +++ b/admin/plugins_installed.php @@ -44,11 +44,6 @@ $action_url = $base_url.'&plugin='.'%s'.'&pwg_token='.$pwg_token; $plugins = new plugins(); -if (!is_webmaster()) -{ - $page['errors'][] = l10n('Webmaster status is required.'); -} - //--------------------------------------------------------Incompatible Plugins if (isset($_GET['incompatible_plugins'])) { diff --git a/admin/themes/default/js/plugins_installated.js b/admin/themes/default/js/plugins_installated.js index 8db30c4a4..5b5dee6f0 100644 --- a/admin/themes/default/js/plugins_installated.js +++ b/admin/themes/default/js/plugins_installated.js @@ -306,6 +306,13 @@ $(document).ready(function () { /* Plugin Filters */ + // Set filter on Active on load + $(".pluginMiniBox").each(function () { + if (!$(this).hasClass("plugin-active")) { + $(this).hide(); + } + }) + $("#seeAll").on("change", function () { console.log("All"); $(".pluginMiniBox").show(); @@ -377,10 +384,17 @@ $(document).ready(function () { $(this).addClass("disabled"); event.preventDefault(); event.stopPropagation(); + + var id = $(this).parent().parent().parent().attr("id"); + $("#" + id + " .pluginNotif").stop(false, true); + $("#" + id + " .PluginActionError label span:first").html(not_webmaster); + $("#" + id + " .PluginActionError").css("display", "flex"); + $("#" + id + " .PluginActionError").delay(1500).fadeOut(2500); + setTimeout(function(){ $(".switch input").removeClass("disabled"); }, 400); //Same duration as the animation "desactivate_disabled" in css - }) + }); } /** diff --git a/admin/themes/default/template/plugins_installed.tpl b/admin/themes/default/template/plugins_installed.tpl index 405264e72..c47647c0b 100644 --- a/admin/themes/default/template/plugins_installed.tpl +++ b/admin/themes/default/template/plugins_installed.tpl @@ -33,6 +33,7 @@ const plugin_added_str = '{'Activated'|@translate}'; const plugin_deactivated_str = '{'Deactivated'|@translate}'; const plugin_restored_str = '{'Restored'|@translate}'; const plugin_action_error = '{'an error happened'|@translate}'; +const not_webmaster = '{'Webmaster status required'|@translate}'; const isWebmaster = {$isWebmaster}; {literal} var queuedManager = jQuery.manageAjax.create('queued', { @@ -222,7 +223,7 @@ jQuery(".pluginMiniBox").each(function(index){ {counter start=0 assign=i} {* *}
- +
@@ -583,6 +584,8 @@ jQuery(".pluginMiniBox").each(function(index){ .pluginContainer.line { display: flex; flex-direction: column; + box-shadow: none; + background: transparent; } .pluginContainer.line .pluginMiniBox { diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index 6a48da1bf..f7a6792cb 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -2153,7 +2153,7 @@ h2:lang(en) { text-transform:capitalize; } .pluginContainer.line .pluginMiniBox:hover .pluginContent{ transition: 0.4s; - background: #ffe5cc; + background: #ffd7ad; } .pluginContainer.line .pluginMiniBox:hover.plugin-inactive .slider { @@ -3807,7 +3807,7 @@ input[type="text"].dError {border-color:#ff7070; background-color:#FFe5e5;} transition: .4s; } -.plugin-active input:checked + .slider:before { +input:checked + .slider:before { -webkit-transform: translateX(33px); -ms-transform: translateX(33px); transform: translateX(33px); diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 2676a1739..617ed1263 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -1245,3 +1245,4 @@ $lang['action succesfully performed.'] = 'action succesfully performed.'; $lang['%s lines'] = "%s lines"; $lang['%s line'] = "%s line"; $lang['Locked albums are disabled for maintenance. Only administrators can view them in the gallery. Lock this album will also lock his Sub-albums'] = 'Locked albums are disabled for maintenance. Only administrators can view them in the gallery. Lock this album will also lock his Sub-albums'; +$lang['Webmaster status required'] = 'Webmaster status required'; diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index f6817d2e5..03ec349db 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -1252,4 +1252,4 @@ $lang['action succesfully performed.'] = 'action effectuée avec succès.'; $lang['%s lines'] = "%s lignes"; $lang['%s line'] = "%s ligne"; $lang['Locked albums are disabled for maintenance. Only administrators can view them in the gallery. Lock this album will also lock his Sub-albums'] = 'Les albums vérrouillés sont désactivé pour maintenance. Seul les administrateurs peuvent les voir dans la gallerie. Vérrouiller cet album vérouillera aussi ses sous-albums'; - +$lang['Webmaster status required'] = 'Status Webmaster obligatoire';