From 70bce7a54aa6003ed7bab6c4be8966b555a282b5 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 18 Aug 2015 16:42:25 +0200 Subject: [PATCH 1/2] [admin settings] hide security warnings if empty * fixes #15257 --- settings/js/admin.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/settings/js/admin.js b/settings/js/admin.js index aa228e76be..2f0896c953 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -177,6 +177,10 @@ $(document).ready(function(){ var $el = $('#postsetupchecks'); $el.find('.loading').addClass('hidden'); if (messages.length === 0) { + var securityWarning = $('#security-warning'); + if (securityWarning.children('ul').children().length === 0) { + securityWarning.addClass('hidden'); + } } else { var $errorsEl = $el.find('.errors'); var $warningsEl = $el.find('.warnings'); From 63a1f9afacbb7f7465eac326d2e17f32baba66f4 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 21 Aug 2015 11:09:01 +0200 Subject: [PATCH 2/2] add success message --- settings/css/settings.css | 5 +++++ settings/js/admin.js | 2 +- settings/templates/admin.php | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/settings/css/settings.css b/settings/css/settings.css index 7340f2b2a6..6703cc5d76 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -361,6 +361,11 @@ table.grid td.date{ list-style: initial; margin: 10px 0; } +#security-warning-state span { + padding-left: 25px; + background-position: 5px center; + margin-left: -5px; +} #shareAPI p { padding-bottom: 0.8em; } #shareAPI input#shareapiExpireAfterNDays {width: 25px;} diff --git a/settings/js/admin.js b/settings/js/admin.js index 2f0896c953..ea9727078e 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -179,7 +179,7 @@ $(document).ready(function(){ if (messages.length === 0) { var securityWarning = $('#security-warning'); if (securityWarning.children('ul').children().length === 0) { - securityWarning.addClass('hidden'); + $('#security-warning-state').find('span').removeClass('hidden'); } } else { var $errorsEl = $el.find('.errors'); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 888ed82379..9c16128184 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -177,6 +177,9 @@ if ($_['cronErrors']) { t('Please double check the installation guides ↗, and check for any errors or warnings in the log.', link_to_docs('admin-install'))); ?>

+
+ +