summaryrefslogtreecommitdiff
path: root/addons/web/static/src/xml
diff options
context:
space:
mode:
authorYogesh (OpenERP) <ysa@tinyerp.com>2011-10-14 10:28:39 +0530
committerYogesh (OpenERP) <ysa@tinyerp.com>2011-10-14 10:28:39 +0530
commit0a89e5f6277011d3ef000e2f28eddd5e0b2b0040 (patch)
tree9d98a4512e65366fd3c23e6a7d2d5ed9ad7fd011 /addons/web/static/src/xml
parent89a7c1cdaf6963c4906764adbed22659e1ebda69 (diff)
parent7b5b9d45ad26e47539504f19c00ad387569925e3 (diff)
[MERGE] Merge with trunk upto revison no 1256.
bzr revid: ysa@tinyerp.com-20111014045839-rc5gvd0crl20pjqv
Diffstat (limited to 'addons/web/static/src/xml')
-rw-r--r--addons/web/static/src/xml/base.xml8
1 files changed, 5 insertions, 3 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 2a1030676b5..8baf7ce561e 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -2,9 +2,8 @@
<!-- vim:fdl=1:
-->
<templates id="template" xml:space="preserve">
-<t t-name="Interface">
- <div id="oe_loading" class="loading"></div>
- <div id="oe_notification" class="oe_notification">
+<t t-name="Notification">
+ <div class="oe_notification">
<div id="oe_notification_default">
<a class="ui-notify-cross ui-notify-close" href="#">x</a>
<h1>#{title}</h1>
@@ -17,6 +16,9 @@
<p>#{text}</p>
</div>
</div>
+</t>
+<t t-name="Interface">
+ <div id="oe_loading" class="loading"></div>
<table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" class="main_table">
<tr>
<td colspan="2" valign="top">