diff options
| -rw-r--r-- | core/js/oc-dialogs.js | 23 | ||||
| -rw-r--r-- | settings/css/settings.css | 9 | ||||
| -rw-r--r-- | settings/js/admin.js | 9 |
3 files changed, 35 insertions, 6 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 5a5bdc33d5d..fc0734e9df4 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -77,6 +77,25 @@ var OCdialogs = { ); }, /** + * displays confirmation dialog + * @param text content of dialog + * @param title dialog title + * @param callback which will be triggered when user presses YES or NO + * (true or false would be passed to callback respectively) + * @param modal make the dialog modal + */ + confirmHtml:function(text, title, callback, modal) { + return this.message( + text, + title, + 'notice', + OCdialogs.YES_NO_BUTTONS, + callback, + modal, + true + ); + }, + /** * displays prompt dialog * @param text content of dialog * @param title dialog title @@ -251,7 +270,7 @@ var OCdialogs = { * Displays raw dialog * You better use a wrapper instead ... */ - message:function(content, title, dialogType, buttons, callback, modal) { + message:function(content, title, dialogType, buttons, callback, modal, allowHtml) { return $.when(this._getMessageTemplate()).then(function($tmpl) { var dialogName = 'oc-dialog-' + OCdialogs.dialogsCounter + '-content'; var dialogId = '#' + dialogName; @@ -260,7 +279,7 @@ var OCdialogs = { title: title, message: content, type: dialogType - }); + }, allowHtml ? {escapeFunction: ''} : {}); if (modal === undefined) { modal = false; } 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({ |