diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2014-05-28 18:08:13 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2014-06-06 17:20:38 +0200 |
| commit | 314cbeb11d11c9a5f2677349490f26363ad58e2d (patch) | |
| tree | 3a090d3db28b59ea91177c5f2643635770a17901 | |
| parent | 5f858b288e503b1b4b93b53dc9d8c0546d1b234d (diff) | |
| download | freeipa-314cbeb11d11c9a5f2677349490f26363ad58e2d.tar.gz freeipa-314cbeb11d11c9a5f2677349490f26363ad58e2d.tar.xz freeipa-314cbeb11d11c9a5f2677349490f26363ad58e2d.zip | |
webui: use propert alerts in header notification area
| -rw-r--r-- | install/ui/ipa.css | 4 | ||||
| -rw-r--r-- | install/ui/src/freeipa/ipa.js | 21 | ||||
| -rw-r--r-- | install/ui/src/freeipa/widget.js | 2 |
3 files changed, 5 insertions, 22 deletions
diff --git a/install/ui/ipa.css b/install/ui/ipa.css index 5a5262f3e..41f88a763 100644 --- a/install/ui/ipa.css +++ b/install/ui/ipa.css @@ -50,11 +50,7 @@ textarea[readonly] { .notification-area div { position: relative; left: -50%; - - line-height: 1.5em; z-index: 20; - padding: 4px; - text-align: center; word-wrap: break-word; max-width: 500px; } diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js index d74881924..8a1ebaed7 100644 --- a/install/ui/src/freeipa/ipa.js +++ b/install/ui/src/freeipa/ipa.js @@ -1164,8 +1164,6 @@ IPA.notify = function(message, type, timeout) { } var notification_area = $('.notification-area'); - var message_el = $('.notification-area div'); - if (notification_area.length === 0) { notification_area = $('<div/>', { 'class': 'notification-area', @@ -1174,25 +1172,14 @@ IPA.notify = function(message, type, timeout) { notification_area.fadeOut(100); } }); - message_el = $('<div/>', { - 'class': 'alert' - }).appendTo(notification_area); notification_area.appendTo('#container'); } + notification_area.empty(); - if (IPA.notify_success.current_cls) { - message_el.removeClass(IPA.notify_success.current_cls); - IPA.notify_success.current_cls = null; - } - - if (type && type !== 'warning') { - var type_cls = 'alert-'+type; - message_el.addClass(type_cls); - IPA.notify_success.current_cls = type_cls; - } - - message_el.text(message); + var alert = IPA.alert_helper.create_alert('msg', message, type); + var el = IPA.alert_helper.render_alert(alert); + notification_area.append(el); destroy_timeout(); notification_area.fadeIn(IPA.config.message_fadein_time); diff --git a/install/ui/src/freeipa/widget.js b/install/ui/src/freeipa/widget.js index 6c08e1e60..fc60959cd 100644 --- a/install/ui/src/freeipa/widget.js +++ b/install/ui/src/freeipa/widget.js @@ -5444,7 +5444,7 @@ IPA.value_map_widget = function(spec) { * @alternateClassName IPA.alert_helper * @singleton */ -exp.alert_helper = { +exp.alert_helper = IPA.alert_helper = { /** * Create alert object |