summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2016-10-31 12:22:21 +0100
committerJoas Schilling <coding@schilljs.com>2016-10-31 12:22:21 +0100
commit247b7f37ce81525193f19eca45027c5be52458c5 (patch)
tree4852daaeebd0814121f62584ef9c5fa20129fcc1 /settings
parent357a823457397d3e93ec8cd4dc01fb6859eb0049 (diff)
downloadnextcloud-server-247b7f37ce81525193f19eca45027c5be52458c5.tar.gz
nextcloud-server-247b7f37ce81525193f19eca45027c5be52458c5.zip
Color the trusted domain to alert the admin a bit more
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'settings')
-rw-r--r--settings/css/settings.css9
-rw-r--r--settings/js/admin.js9
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({