From 35e4a220939f01321dfd0c6045022a83df7466e0 Mon Sep 17 00:00:00 2001 From: ammendonca Date: Mon, 4 Nov 2013 17:49:07 +0000 Subject: [PATCH] KEYCLOAK-126: Modified modal template to allow HTML to be passed (also removed btn class from buttons) and added HTML to message in the Dialog service to use different classes at paragraphs. --- .../main/resources/META-INF/resources/admin/js/services.js | 7 ++++--- .../resources/admin/lib/angular/ui-bootstrap-tpls-0.4.0.js | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js index bc17b97985..4ee4a90c89 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js +++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js @@ -16,14 +16,15 @@ module.service('Auth', function() { module.service('Dialog', function($dialog) { var dialog = {}; dialog.confirmDelete = function(name, type, success) { - var title = 'Delete ' + name; - var msg = 'Are you sure you want to permanently delete this ' + type + '?'; + var title = 'Delete ' + type.charAt(0).toUpperCase() + type.slice(1); + var msg = '

Are you sure you want to permanently delete the ' + type + ' "' + name + '"?

' + + '

This action can\'t be undone.

'; var btns = [ { result : 'cancel', label : 'Cancel' }, { result : 'ok', - label : 'Delete this ' + type, + label : 'Delete', cssClass : 'destructive' } ]; diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/lib/angular/ui-bootstrap-tpls-0.4.0.js b/admin-ui/src/main/resources/META-INF/resources/admin/lib/angular/ui-bootstrap-tpls-0.4.0.js index b587abd1e0..9b62fe7ee4 100755 --- a/admin-ui/src/main/resources/META-INF/resources/admin/lib/angular/ui-bootstrap-tpls-0.4.0.js +++ b/admin-ui/src/main/resources/META-INF/resources/admin/lib/angular/ui-bootstrap-tpls-0.4.0.js @@ -3004,10 +3004,10 @@ angular.module("template/dialog/message.html", []).run(["$templateCache", functi "

{{ title }}

\n" + "\n" + "
\n" + - "

{{ message }}

\n" + + "

\n" + "
\n" + "
\n" + - " \n" + + " \n" + "
\n" + "\n" + "\n" +