summaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2014-06-04 17:05:42 +0200
committerPetr Vobornik <pvoborni@redhat.com>2014-06-30 12:27:04 +0200
commitd9a7fcb5e1c1f18cff1287353b9316fe69e07a78 (patch)
treeae853cae6ba93cc11b0632784350809a169a8477 /install
parent72a107c9d73d1576f3adf7928deef4b5e5f35a83 (diff)
downloadfreeipa-d9a7fcb5e1c1f18cff1287353b9316fe69e07a78.tar.gz
freeipa-d9a7fcb5e1c1f18cff1287353b9316fe69e07a78.tar.xz
freeipa-d9a7fcb5e1c1f18cff1287353b9316fe69e07a78.zip
webui: support global notifications in all containers
Global notifications were limited to "main" container. Now they have their own container which is displayed over other ones. It makes them usable everywhere. Reviewed-By: Endi Sukma Dewata <edewata@redhat.com>
Diffstat (limited to 'install')
-rw-r--r--install/ui/src/freeipa/Application_controller.js7
-rw-r--r--install/ui/src/freeipa/ipa.js2
-rw-r--r--install/ui/src/freeipa/widgets/FacetContainer.js4
3 files changed, 11 insertions, 2 deletions
diff --git a/install/ui/src/freeipa/Application_controller.js b/install/ui/src/freeipa/Application_controller.js
index 9ed0bc6e9..49bcf6a58 100644
--- a/install/ui/src/freeipa/Application_controller.js
+++ b/install/ui/src/freeipa/Application_controller.js
@@ -89,6 +89,12 @@ define([
var simple_container = new FacetContainer();
simple_container.container_node = body_node;
+ var notification_container = new FacetContainer({
+ container_node: body_node,
+ id: "notification",
+ 'class': ''
+ });
+
this.containers = {
// Default view
main: {
@@ -117,6 +123,7 @@ define([
this.app_widget.hide();
simple_container.render();
simple_container.hide();
+ notification_container.render();
var load_facet = reg.facet.get('load');
this.show_facet(load_facet);
IPA.opened_dialogs.start_handling(this);
diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js
index 2dd5a8f2e..be202ecdc 100644
--- a/install/ui/src/freeipa/ipa.js
+++ b/install/ui/src/freeipa/ipa.js
@@ -1177,7 +1177,7 @@ IPA.notify = function(message, type, timeout) {
}
});
- notification_area.appendTo('#container');
+ notification_area.appendTo('#notification');
}
notification_area.empty();
diff --git a/install/ui/src/freeipa/widgets/FacetContainer.js b/install/ui/src/freeipa/widgets/FacetContainer.js
index d5e6add74..145b3c06e 100644
--- a/install/ui/src/freeipa/widgets/FacetContainer.js
+++ b/install/ui/src/freeipa/widgets/FacetContainer.js
@@ -41,6 +41,8 @@ define(['dojo/_base/declare',
id: 'simple-container',
+ 'class': 'app-container',
+
//nodes:
dom_node: null,
@@ -52,7 +54,7 @@ define(['dojo/_base/declare',
this.dom_node = construct.create('div', {
id: this.id,
- 'class': 'app-container'
+ 'class': this['class']
});
if (this.container_node) {