diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2016-11-02 10:06:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-02 10:06:35 +0100 |
| commit | 42b0a0d2afe95b974545436e112a1d97edaeeb1a (patch) | |
| tree | bfd8521d15db528dc11f4153ff199bcbf4e16f2b /settings | |
| parent | 19af06cdea5719226d851bf4ad531220d2d37bed (diff) | |
| parent | 247b7f37ce81525193f19eca45027c5be52458c5 (diff) | |
| download | nextcloud-server-42b0a0d2afe95b974545436e112a1d97edaeeb1a.tar.gz nextcloud-server-42b0a0d2afe95b974545436e112a1d97edaeeb1a.zip | |
Merge pull request #1964 from nextcloud/color-the-trusted-domain-to-alert-the-admin
Color the trusted domain to alert the admin a bit more
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.css | 9 | ||||
| -rw-r--r-- | settings/js/admin.js | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index 0dadf401c04..ffc17c20a8b 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -651,8 +651,13 @@ doesnotexist:-o-prefocus, .strengthify-wrapper { width: 129px; } - - +.trusted-domain-warning { + color: #fff; + padding: 5px; + background: #ce3702; + border-radius: 5px; + font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace; +} /* HELP */ diff --git a/settings/js/admin.js b/settings/js/admin.js index f5750b23790..7c2b507280f 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -3,8 +3,13 @@ $(document).ready(function(){ // Hack to add a trusted domain if (params.trustDomain) { - OC.dialogs.confirm(t('settings', 'Are you really sure you want add "{domain}" as trusted domain?', - {domain: params.trustDomain}), + var potentialDomain = params.trustDomain; + potentialDomain = encodeURI(escapeHTML(potentialDomain)); + potentialDomain = '<span class="trusted-domain-warning">' + potentialDomain + '</span>'; + + OC.dialogs.confirmHtml(t('settings', 'Are you really sure you want add {domain} as trusted domain?', { + domain: potentialDomain + }, undefined, {escape: false}), t('settings', 'Add trusted domain'), function(answer) { if(answer) { $.ajax({ |