diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-06-06 13:28:50 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2018-06-06 17:34:38 +0200 |
| commit | 5a20ac7df2e3e6ca4c7f43b66afd87c7c6493c5a (patch) | |
| tree | 7ff68f82997574fd2885e19cc8e09a01f1c0e77f | |
| parent | 6afe3e42f3601f4be65724c6c06951f1a4726fed (diff) | |
| download | nextcloud-server-5a20ac7df2e3e6ca4c7f43b66afd87c7c6493c5a.tar.gz nextcloud-server-5a20ac7df2e3e6ca4c7f43b66afd87c7c6493c5a.zip | |
Add warning state to setup checks
Signed-off-by: Julius Härtl <jus@bitgrid.net>
| -rw-r--r-- | settings/css/settings.scss | 4 | ||||
| -rw-r--r-- | settings/js/admin.js | 6 | ||||
| -rw-r--r-- | settings/templates/settings/admin/overview.php | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/settings/css/settings.scss b/settings/css/settings.scss index 3062b9f51f3..3b6befc4386 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -1039,6 +1039,7 @@ table.grid td.date { } #security-warning-state-ok, +#security-warning-state-warning, #security-warning-state-failure, #security-warning-state-loading { span { @@ -1057,6 +1058,9 @@ table.grid td.date { &.icon-checkmark-white { background-color: $color-success; } + &.icon-error-white { + background-color: $color-warning; + } &.icon-close-white { background-color: $color-error; } diff --git a/settings/js/admin.js b/settings/js/admin.js index 0ebe1ebb23a..61c40e789ba 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -292,7 +292,11 @@ $(document).ready(function(){ if (hasMessages) { $('#postsetupchecks-hint').removeClass('hidden'); - $('#security-warning-state-failure').removeClass('hidden'); + if ($errorsEl.find('li').length > 0) { + $('#security-warning-state-failure').removeClass('hidden'); + } else { + $('#security-warning-state-warning').removeClass('hidden'); + } } else { var securityWarning = $('#security-warning'); if (securityWarning.children('ul').children().length === 0) { diff --git a/settings/templates/settings/admin/overview.php b/settings/templates/settings/admin/overview.php index dd253b82643..08aee8b5b76 100644 --- a/settings/templates/settings/admin/overview.php +++ b/settings/templates/settings/admin/overview.php @@ -155,7 +155,10 @@ <span class="icon icon-checkmark-white"></span><span class="message"><?php p($l->t('All checks passed.'));?></span> </div> <div id="security-warning-state-failure" class="hidden"> - <span class="icon icon-close-white"></span><span class="message"><?php p($l->t('Some checks have failed.'));?></span> + <span class="icon icon-close-white"></span><span class="message"><?php p($l->t('There are some errors regarding your setup.'));?></span> + </div> + <div id="security-warning-state-warning" class="hidden"> + <span class="icon icon-error-white"></span><span class="message"><?php p($l->t('There are some warnings regarding your setup.'));?></span> </div> <div id="security-warning-state-loading"> <span class="icon loading"></span><span class="message"><?php p($l->t('Checking for system and security issues.'));?></span> |