diff options
| author | Robin McCorkell <rmccorkell@owncloud.com> | 2015-08-21 13:38:40 +0300 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@owncloud.com> | 2015-08-21 13:38:40 +0300 |
| commit | 2992a1aa8842d53fa5afada76f5c4f66dc420b08 (patch) | |
| tree | 7a4a36fd3ac18d0aa2af641f19029bb0b2c5bde7 | |
| parent | f5bbe727dfa624c8201f2973900390435234f323 (diff) | |
| parent | 63a1f9afacbb7f7465eac326d2e17f32baba66f4 (diff) | |
Merge pull request #18395 from owncloud/hide-empty-security-warning
[admin settings] Show success message if security warnings are empty
| -rw-r--r-- | settings/css/settings.css | 5 | ||||
| -rw-r--r-- | settings/js/admin.js | 4 | ||||
| -rw-r--r-- | settings/templates/admin.php | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index 9bd342ca6f2..0f1f432e4e2 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 80d3dff2901..7117c7b46cf 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -179,6 +179,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) { + $('#security-warning-state').find('span').removeClass('hidden'); + } } else { var $errorsEl = $el.find('.errors'); var $warningsEl = $el.find('.warnings'); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 888ed823793..9c161281846 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -177,6 +177,9 @@ if ($_['cronErrors']) { <?php print_unescaped($l->t('Please double check the <a target="_blank" href="%s">installation guides ↗</a>, and check for any errors or warnings in the <a href="#log-section">log</a>.', link_to_docs('admin-install'))); ?> </p> </div> +<div id="security-warning-state"> + <span class="hidden icon-checkmark"><?php p($l->t('All checks passed.'));?></span> +</div> </div> <div class="section" id="shareAPI"> |