From 0de15c9bbf84e86cafa84c7ab025f853e4d987d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 29 Nov 2012 17:14:28 +0100
Subject: [CLEAN] Moved needaction html into a dedicated template.

bzr revid: tde@openerp.com-20121129161428-usvgdoykg0g0etr7
---
 addons/web/static/src/xml/base.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 62d8a872f25..7421027315b 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -388,14 +388,16 @@
         t-att-data-action-model="menu.action ? menu.action.split(',')[0] : ''"
         t-att-data-action-id="menu.action ? menu.action.split(',')[1] : ''">
         <t t-esc="menu.name"/>
-        <t t-if="menu.needaction_enabled and menu.needaction_counter">
-            <div class="oe_tag oe_tag_dark oe_menu_counter">
-                <t t-if="menu.needaction_counter &gt; 99"> 99+ </t><t t-if="menu.needaction_counter &lt;= 99"> <t t-esc="menu.needaction_counter"/> </t>
-            </div>
-        </t>
     </a>
 </t>
 
+<t t-name="Menu.needaction_counter">
+    <div class="oe_tag oe_tag_dark oe_menu_counter">
+        <t t-if="widget.needaction_counter &gt; 99"> 99+ </t>
+        <t t-if="widget.needaction_counter &lt;= 99"> <t t-esc="widget.needaction_counter"/> </t>
+    </div>
+</t>
+
 <t t-name="UserMenu">
     <span class="oe_user_menu oe_topbar_item oe_dropdown_toggle oe_dropdown_arrow">
         <img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/user_menu_avatar.png'"/>
-- 
cgit v1.2.3


From 3d75ca87419545541a2a5e9dfc26b988f1694494 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Nov 2012 22:37:43 +0100
Subject: [IMP] Use a systray icon for timezone notification (less intrusive)

bzr revid: fme@openerp.com-20121129213743-w79fh583icui2h2l
---
 addons/web/static/src/xml/base.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 62d8a872f25..fddc0431c17 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -462,6 +462,11 @@
         <p><a href="#">Click here to change your user's timezone.</a></p>
     </div>
 </t>
+<t t-name="WebClient.timezone_systray">
+    <div class="oe_topbar_item oe_timezone_systray" title="Timezone offset mismatch">
+        <span class="ui-icon ui-state-error ui-icon-alert"/>
+    </div>
+</t>
 
 <t t-name="EmbedClient">
     <div class="openerp">
-- 
cgit v1.2.3


From ddf04c8a2b79694c9b47b359ad3dc6da8d004be4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Nov 2012 22:49:19 +0100
Subject: [IMP] wording

bzr revid: fme@openerp.com-20121129214919-1gypag36heyum97g
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index fddc0431c17..65c96d05323 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -463,7 +463,7 @@
     </div>
 </t>
 <t t-name="WebClient.timezone_systray">
-    <div class="oe_topbar_item oe_timezone_systray" title="Timezone offset mismatch">
+    <div class="oe_topbar_item oe_timezone_systray" title="Timezone mismatch">
         <span class="ui-icon ui-state-error ui-icon-alert"/>
     </div>
 </t>
-- 
cgit v1.2.3


From 0fa1393d4882e1d7c2e0a7dc8bac593572c9394d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Nov 2012 22:58:14 +0100
Subject: [IMP] Use a more appropriate icon in the systray

bzr revid: fme@openerp.com-20121129215814-e137va813jyu1fsc
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 65c96d05323..78e5cc747f7 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -464,7 +464,7 @@
 </t>
 <t t-name="WebClient.timezone_systray">
     <div class="oe_topbar_item oe_timezone_systray" title="Timezone mismatch">
-        <span class="ui-icon ui-state-error ui-icon-alert"/>
+        <span class="ui-icon ui-state-error ui-icon-clock"/>
     </div>
 </t>
 
-- 
cgit v1.2.3


From 40a383df0158454890e19064e85e1a055ee650a4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 29 Nov 2012 23:37:04 +0100
Subject: [IMP] Afterall the clock icon does not reflect that there's a
 problem. Reverting to alert icon

bzr revid: fme@openerp.com-20121129223704-pbvw818xt6a3cmmn
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 78e5cc747f7..65c96d05323 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -464,7 +464,7 @@
 </t>
 <t t-name="WebClient.timezone_systray">
     <div class="oe_topbar_item oe_timezone_systray" title="Timezone mismatch">
-        <span class="ui-icon ui-state-error ui-icon-clock"/>
+        <span class="ui-icon ui-state-error ui-icon-alert"/>
     </div>
 </t>
 
-- 
cgit v1.2.3


From 0c3f9f691b36143bd0efd2f7f683c2a35b76ad09 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 5 Dec 2012 13:42:18 +0100
Subject: [FIX] chrome template use a template url for the logo, needed for
 demo

bzr revid: al@openerp.com-20121205124218-0qdvqed5td9mh84k
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 65c96d05323..c272e1f8eb4 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -436,7 +436,7 @@
         </tr>
         <tr>
             <td class="oe_leftbar" valign="top">
-                <a class="oe_logo" href="#"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
+                <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
                 <div class="oe_secondary_menus_container"/>
                 <div class="oe_footer">
                     Powered by <a href="http://www.openerp.com" target="_blank"><span>OpenERP</span></a>
-- 
cgit v1.2.3


From 7ac99cbeafc88f0fe6f6c2ee425c9ef87180a2ce Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 6 Dec 2012 14:51:14 +0100
Subject: [FIX] form selection field: don't interpret value 0 as false in the
 template when the code doesn't do so

bzr revid: xmo@openerp.com-20121206135114-nuwc3wdc6zatbl3d
---
 addons/web/static/src/xml/base.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c272e1f8eb4..2161bc84f3d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1054,7 +1054,10 @@
             t-att-autofocus="widget.node.attrs.autofocus"
             t-att-id="widget.id_for_label">
                 <t t-foreach="widget.values" t-as="option">
-                    <option><t t-esc="widget.node.attrs.placeholder" t-if="option[0] == false and widget.node.attrs.placeholder"/><t t-esc="option[1]" t-if="option[0] != false"/></option>
+                    <option>
+                        <t t-esc="widget.node.attrs.placeholder" t-if="option[0] === false and widget.node.attrs.placeholder"/>
+                        <t t-esc="option[1]" t-if="option[0] !== false"/>
+                    </option>
                 </t>
         </select>
     </span>
-- 
cgit v1.2.3


From f9e610a890d462b382c66ea4af7aac3594752c1a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 10 Dec 2012 11:01:37 +0100
Subject: [FIX] don't lose debug mode when clicking on logo

bzr revid: xmo@openerp.com-20121210100137-h2ydpz6b63c48b1z
---
 addons/web/static/src/xml/base.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 2161bc84f3d..e742f336dc0 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -436,7 +436,8 @@
         </tr>
         <tr>
             <td class="oe_leftbar" valign="top">
-                <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
+                <t t-set="debug" t-value="__debug__ ? '&amp;debug' : ''"/>
+                <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}#{debug}"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
                 <div class="oe_secondary_menus_container"/>
                 <div class="oe_footer">
                     Powered by <a href="http://www.openerp.com" target="_blank"><span>OpenERP</span></a>
-- 
cgit v1.2.3