From 5f858b288e503b1b4b93b53dc9d8c0546d1b234d Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Wed, 28 May 2014 17:51:08 +0200 Subject: webui: proper alerts in dialogs --- install/ui/src/freeipa/add.js | 2 +- install/ui/src/freeipa/dialog.js | 13 +++++++++---- install/ui/src/freeipa/dns.js | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/install/ui/src/freeipa/add.js b/install/ui/src/freeipa/add.js index 0a0942e97..a4b5d3649 100644 --- a/install/ui/src/freeipa/add.js +++ b/install/ui/src/freeipa/add.js @@ -85,7 +85,7 @@ IPA.entity_adder_dialog = function(spec) { that.add( function(data, text_status, xhr) { that.added.notify([data], that); - that.show_message(that.get_success_message(data)); + that.show_message(that.get_success_message(data), 'success'); that.reset(); that.focus_first_element(); }, diff --git a/install/ui/src/freeipa/dialog.js b/install/ui/src/freeipa/dialog.js index f71f23bb0..082d6699a 100644 --- a/install/ui/src/freeipa/dialog.js +++ b/install/ui/src/freeipa/dialog.js @@ -30,7 +30,7 @@ define([ './text', './field', './widget'], - function(keys, builder, IPA, $, phases, reg, text) { + function(keys, builder, IPA, $, phases, reg, text, field_mod, widget_mod) { /** * Opened dialogs @@ -331,7 +331,7 @@ IPA.dialog = function(spec) { that.message_container = $('
', { style: 'display: none', - 'class': 'dialog-message alert' + 'class': 'dialog-message col-sm-12' }).appendTo(that.body_node); var widgets = that.widgets.get_widgets(); @@ -433,14 +433,19 @@ IPA.dialog = function(spec) { * Show message in dialog's message container * @param {string} message */ - that.show_message = function(message) { - that.message_container.text(message); + that.show_message = function(message, type) { + + var ah = widget_mod.alert_helper; + var alert = ah.create_alert('msg', message, type); + var el = ah.render_alert(alert); + that.message_container.append(el); that.message_container.css('display', ''); }; /** Hide dialog message */ that.hide_message = function() { that.message_container.css('display', 'none'); + that.message_container.empty(); }; /** diff --git a/install/ui/src/freeipa/dns.js b/install/ui/src/freeipa/dns.js index 522b68908..507373778 100644 --- a/install/ui/src/freeipa/dns.js +++ b/install/ui/src/freeipa/dns.js @@ -1884,7 +1884,7 @@ IPA.dns.record_type_table_widget = function(spec) { dialog.add( function(data, text_status, xhr) { - dialog.show_message(dialog.get_add_message()); + dialog.show_message(dialog.get_add_message(), 'success'); if (data.result.result.dnsrecords) { that.reload_facet(data); -- cgit