From 05ca000f789d146a720418828c70aea946890ff7 Mon Sep 17 00:00:00 2001 From: Matthieu Leproux Date: Wed, 23 Jun 2021 14:54:58 +0200 Subject: [PATCH] related to #1415 Adjustments for new plugin manager Removed "!" from alerts better hover on lines --- admin/themes/default/js/plugins_installated.js | 6 +++--- admin/themes/default/template/plugins_installed.tpl | 7 ++++--- admin/themes/default/theme.css | 7 ++++++- admin/themes/roma/theme.css | 13 +++++++++---- language/en_UK/admin.lang.php | 6 +++--- language/fr_FR/admin.lang.php | 6 +++--- 6 files changed, 28 insertions(+), 17 deletions(-) diff --git a/admin/themes/default/js/plugins_installated.js b/admin/themes/default/js/plugins_installated.js index 35067e720..f344e6646 100644 --- a/admin/themes/default/js/plugins_installated.js +++ b/admin/themes/default/js/plugins_installated.js @@ -95,7 +95,7 @@ function activatePlugin(id) { }).done(function (data) { console.log(data); $("#"+id+" .switch").attr("disabled", false); - $("#" + id + " .AddPluginSuccess").fadeOut(2500); + $("#" + id + " .AddPluginSuccess").fadeOut(3000); }) } @@ -132,7 +132,7 @@ function disactivatePlugin(id) { }).done(function (data) { console.log(data); $("#"+id+" .switch").attr("disabled", false); - $("#" + id + " .DeactivatePluginSuccess").fadeOut(2500); + $("#" + id + " .DeactivatePluginSuccess").fadeOut(3000); }) } @@ -204,7 +204,7 @@ function restorePlugin(id) { $("#" + id + " .PluginActionError").delay(1500).fadeOut(2500); } }).done(function (data) { - $("#" + id + " .RestorePluginSuccess").fadeOut(2500); + $("#" + id + " .RestorePluginSuccess").fadeOut(3000); }) } diff --git a/admin/themes/default/template/plugins_installed.tpl b/admin/themes/default/template/plugins_installed.tpl index f3aece91f..ead6a6cdc 100644 --- a/admin/themes/default/template/plugins_installed.tpl +++ b/admin/themes/default/template/plugins_installed.tpl @@ -23,9 +23,9 @@ let delete_plugin_msg = '{'Are you sure you want to delete the plugin "%s"?'|@tr let deleted_plugin_msg = '{'Plugin "%s" deleted!'|@translate|@escape:'javascript'}'; let restore_plugin_msg = '{'Are you sure you want to restore the plugin "%s"?'|@translate|@escape:'javascript'}'; const restore_tip_msg = "{'Restore default configuration. You will lose your plugin settings!'|@translate}"; -const plugin_added_str = '{'Activated!'|@translate}'; -const plugin_deactivated_str = '{'Deactivated!'|@translate}'; -const plugin_restored_str = '{'Restored!'|@translate}'; +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}'; {literal} var queuedManager = jQuery.manageAjax.create('queued', { @@ -660,6 +660,7 @@ jQuery(".pluginMiniBox").each(function(index){ .pluginContainer.classic .pluginMiniBoxNameCell { position: relative; + margin-right: 10px; } .pluginContainer.classic .switch { diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css index aa2887e54..312fe7205 100644 --- a/admin/themes/default/theme.css +++ b/admin/themes/default/theme.css @@ -2128,6 +2128,12 @@ h2:lang(en) { text-transform:capitalize; } opacity: 1; } +.pluginContainer.line .pluginMiniBox.inactive:hover .pluginContent .pluginActions a{ + background: transparent; + opacity: 0.7; +} + + .PluginOptionsBlock{ display:none; position:absolute; @@ -5206,7 +5212,6 @@ color:#FF7B00; .line { background: #fafafa; - box-shadow: 0px 2px 4px #00000024; display: flex; flex-direction: row; diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css index f0f0f8495..2440241a1 100644 --- a/admin/themes/roma/theme.css +++ b/admin/themes/roma/theme.css @@ -1160,9 +1160,15 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; background: #777777; } -.pluginContainer.line .pluginMiniBox:hover .pluginContent .pluginActions .pluginUnavailableAction{ +.pluginContainer.line .pluginMiniBox:hover .pluginContent .pluginActions a{ /* color: #ffffff; */ - opacity: 0.5; + opacity: 1; +} + +.pluginContainer.line .pluginMiniBox.inactive:hover .pluginContent .pluginActions a{ + background: transparent; + opacity: 1; + color: #777777; } .addAlbum label{ @@ -1419,8 +1425,7 @@ li.plupload_delete a:hover {background: url("images/cancelhover.svg")!important; } .line { - background: #333333; - box-shadow: 0px 2px 4px #00000024; + background: transparent; display: flex; flex-direction: row; diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 80f634e3d..39c176276 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -1225,6 +1225,6 @@ $lang['%d tags moved'] = '%d tags moved'; $lang['Download all activities'] = 'Download all activities'; $lang['Plugin "%s" has been activated!'] = 'Plugin "%s" has been activated!'; $lang['Plugin "%s" deleted!'] = 'Plugin "%s" deleted!'; -$lang['Activated!'] = 'Activated!'; -$lang['Deactivated!'] = 'Deactivated!'; -$lang['Restored!'] = 'Restored!'; \ No newline at end of file +$lang['Activated'] = 'Activated'; +$lang['Deactivated'] = 'Deactivated'; +$lang['Restored'] = 'Restored'; \ No newline at end of file diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index ba0ae6ce6..65494cf1b 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -1227,6 +1227,6 @@ $lang['%d tags moved'] = '%d tags déplacés'; $lang['Download all activities'] = 'Télécharger toutes les activités'; $lang['Plugin "%s" has been activated!'] = 'Le plugin "%s" a été activé !'; $lang['Plugin "%s" deleted!'] = 'Plugin "%s" supprimé !'; -$lang['Activated!'] = 'Activé!'; -$lang['Deactivated!'] = 'Désactivé!'; -$lang['Restored!'] = 'Restoré !'; \ No newline at end of file +$lang['Activated'] = 'Activé'; +$lang['Deactivated'] = 'Désactivé'; +$lang['Restored'] = 'Restoré'; \ No newline at end of file