From 717de3937e1b264c04e8ba3fa5dac7aaf25038bc Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 19 Jun 2012 15:14:32 +0200
Subject: [WIP] Changed oe_topbar_item

bzr revid: fme@openerp.com-20120619131432-69tuwtw3dr0jhjo8
---
 addons/web/static/src/xml/base.xml | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 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 a82e40c06e5..bd216e09adf 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -316,19 +316,15 @@
 </t>
 
 <t t-name="UserMenu">
-    <ul class="oe_user_menu oe_topbar_item">
-        <li class="oe_dropdown">
-            <a href="#" class="oe_dropdown_toggle">
-                <img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/user_menu_avatar.png'"/>
-                <span class="oe_topbar_name"/>
-            </a>
-            <ul class="oe_dropdown_options">
-                <li><a href="#" data-menu="about">About OpenERP</a></li>
-                <li><a href="#" data-menu="settings">Preferences</a></li>
-                <li><a href="#" data-menu="logout">Log out</a></li>
-            </ul>
-        </li>
-    </ul>
+    <a href="#" class="oe_user_menu oe_topbar_item oe_dropdown_toggle">
+        <img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/user_menu_avatar.png'"/>
+        <span class="oe_topbar_name"/>
+        <ul class="oe_dropdown_options">
+            <li><a href="#" data-menu="about">About OpenERP</a></li>
+            <li><a href="#" data-menu="settings">Preferences</a></li>
+            <li><a href="#" data-menu="logout">Log out</a></li>
+        </ul>
+    </a>
 </t>
 <t t-name="UserMenu.about">
     <div>
-- 
cgit v1.2.3


From c005a6a2ba7a2700dbde43e050e1c728704c5737 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 19 Jun 2012 22:55:30 +0200
Subject: [WIP] UserMenu cropdown

bzr revid: fme@openerp.com-20120619205530-t0uuaerrspja3084
---
 addons/web/static/src/xml/base.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 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 bd216e09adf..d8588835ad1 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -316,15 +316,15 @@
 </t>
 
 <t t-name="UserMenu">
-    <a href="#" class="oe_user_menu oe_topbar_item oe_dropdown_toggle">
+    <span class="oe_user_menu oe_topbar_item oe_cropdown_toggle oe_cropdown_arrow">
         <img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/user_menu_avatar.png'"/>
         <span class="oe_topbar_name"/>
-        <ul class="oe_dropdown_options">
+        <ul class="oe_cropdown_menu">
             <li><a href="#" data-menu="about">About OpenERP</a></li>
             <li><a href="#" data-menu="settings">Preferences</a></li>
             <li><a href="#" data-menu="logout">Log out</a></li>
         </ul>
-    </a>
+    </span>
 </t>
 <t t-name="UserMenu.about">
     <div>
-- 
cgit v1.2.3


From da09aec9ca73b6e4e2f9c9563c902d3d6ca06fa8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 19 Jun 2012 23:22:12 +0200
Subject: [WIP] Update Menu [More...]

bzr revid: fme@openerp.com-20120619212212-k2yl19h2x1oan1o6
---
 addons/web/static/src/xml/base.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 d8588835ad1..07131a70e00 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -273,8 +273,10 @@
 </t>
 <t t-name="Menu.more">
     <li class="oe_menu_more_container">
-        <a href="#" class="oe_menu_more_link oe_dropdown_toggle">More</a>
-        <ul class="oe_menu_more" style="display: none;"/>
+        <span class="oe_topbar_item oe_menu_more_link oe_cropdown_toggle oe_cropdown_arrow">
+            More
+            <ul class="oe_menu_more oe_cropdown_menu"/>
+        </span>
     </li>
 </t>
 <t t-name="Menu.secondary">
-- 
cgit v1.2.3


From 135be629b12625323ed73d7622ee5eb04f361e13 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 20 Jun 2012 12:21:26 +0200
Subject: [FIX] Sidebar dropdown

bzr revid: fme@openerp.com-20120620102126-nax3dlhuj9ja2x2w
---
 addons/web/static/src/xml/base.xml | 40 ++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 19 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 07131a70e00..942250c2dbb 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -508,25 +508,27 @@
     <div class="oe_sidebar">
         <t t-foreach="widget.sections" t-as="section">
             <div class="oe_form_dropdown_section">
-                <button class="oe_dropdown_toggle"><t t-esc="section.label"/></button>
-                <ul class="oe_dropdown_menu">
-                    <li t-foreach="widget.items[section.name]" t-as="item" t-att-class="item.classname">
-                        <a class="oe_sidebar_action_a" t-att-title="item.title" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url" target="_blank">
-                            <t t-raw="item.label"/>
-                        </a>
-                        <a t-if="section.name == 'files'" class="oe_sidebar_delete_item" t-att-data-id="item.id" title="Delete this attachment">x</a>
-                    </li>
-                    <li t-if="section.name == 'files'" class="oe_sidebar_add_attachment">
-                        <t t-call="HiddenInputFile">
-                            <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
-                            <t t-set="fileupload_action">/web/binary/upload_attachment</t>
-                            <input type="hidden" name="model" t-att-value="widget.dataset and widget.dataset.model"/>
-                            <input type="hidden" name="id" t-att-value="widget.model_id"/>
-                            <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
-                            <span>Add...</span>
-                        </t>
-                    </li>
-                </ul>
+                <button class="oe_cropdown_toggle oe_cropdown_arrow">
+                    <t t-esc="section.label"/>
+                    <ul class="oe_cropdown_menu">
+                        <li t-foreach="widget.items[section.name]" t-as="item" t-att-class="item.classname">
+                            <a class="oe_sidebar_action_a" t-att-title="item.title" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url" target="_blank">
+                                <t t-raw="item.label"/>
+                            </a>
+                            <a t-if="section.name == 'files'" class="oe_sidebar_delete_item" t-att-data-id="item.id" title="Delete this attachment">x</a>
+                        </li>
+                        <li t-if="section.name == 'files'" class="oe_sidebar_add_attachment">
+                            <t t-call="HiddenInputFile">
+                                <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
+                                <t t-set="fileupload_action">/web/binary/upload_attachment</t>
+                                <input type="hidden" name="model" t-att-value="widget.dataset and widget.dataset.model"/>
+                                <input type="hidden" name="id" t-att-value="widget.model_id"/>
+                                <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
+                                <span>Add...</span>
+                            </t>
+                        </li>
+                    </ul>
+                </button>
             </div>
         </t>
     </div>
-- 
cgit v1.2.3


From f1a2b708acb2294374ad30ec50700b67784c61f4 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 20 Jun 2012 17:14:53 +0200
Subject: [WIP] Replaced cropdown by dropdown

bzr revid: fme@openerp.com-20120620151453-9g32rrbv3x0b1v8p
---
 addons/web/static/src/xml/base.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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 980cdfa615a..66bd4a98c27 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -273,9 +273,9 @@
 </t>
 <t t-name="Menu.more">
     <li class="oe_menu_more_container">
-        <span class="oe_topbar_item oe_menu_more_link oe_cropdown_toggle oe_cropdown_arrow">
+        <span class="oe_topbar_item oe_menu_more_link oe_dropdown_toggle oe_dropdown_arrow">
             More
-            <ul class="oe_menu_more oe_cropdown_menu"/>
+            <ul class="oe_menu_more oe_dropdown_menu"/>
         </span>
     </li>
 </t>
@@ -318,10 +318,10 @@
 </t>
 
 <t t-name="UserMenu">
-    <span class="oe_user_menu oe_topbar_item oe_cropdown_toggle oe_cropdown_arrow">
+    <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'"/>
         <span class="oe_topbar_name"/>
-        <ul class="oe_cropdown_menu">
+        <ul class="oe_dropdown_menu">
             <li><a href="#" data-menu="about">About OpenERP</a></li>
             <li><a href="#" data-menu="settings">Preferences</a></li>
             <li><a href="#" data-menu="logout">Log out</a></li>
@@ -508,9 +508,9 @@
     <div class="oe_sidebar">
         <t t-foreach="widget.sections" t-as="section">
             <div class="oe_form_dropdown_section">
-                <button class="oe_cropdown_toggle oe_cropdown_arrow">
+                <button class="oe_dropdown_toggle oe_dropdown_arrow">
                     <t t-esc="section.label"/>
-                    <ul class="oe_cropdown_menu">
+                    <ul class="oe_dropdown_menu">
                         <li t-foreach="widget.items[section.name]" t-as="item" t-att-class="item.classname">
                             <a class="oe_sidebar_action_a" t-att-title="item.title" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url" target="_blank">
                                 <t t-raw="item.label"/>
-- 
cgit v1.2.3


From 3939df18a2d4e6dd09e8d3ed35710f2a5f5ca40c Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Wed, 20 Jun 2012 18:41:44 +0200
Subject: [FIX] display form switch

bzr revid: al@openerp.com-20120620164144-xo8enp0i4hmqf50l
---
 addons/web/static/src/xml/base.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 66bd4a98c27..e293ffc7adb 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -421,8 +421,8 @@
                 </td>
                 <td>
                     <ul class="oe_view_manager_switch oe_button_group oe_right">
-                        <t t-if="widget.views_src.length > 2" t-foreach="widget.views_src" t-as="view">
-                          <li t-if="view.view_type != 'form'" class="oe_e"><a t-attf-class="oe_vm_switch_#{view.view_type}" t-att-data-view-type="view.view_type" t-att-title="_t('Switch to ') + (view.label || view.view_type)">
+                        <t t-if="widget.views_src.length > 1" t-foreach="widget.views_src" t-as="view">
+                          <li class="oe_e"><a t-attf-class="oe_vm_switch_#{view.view_type}" t-att-data-view-type="view.view_type" t-att-title="_t('Switch to ') + (view.label || view.view_type)">
                             </a></li>
                         </t>
                     </ul>
-- 
cgit v1.2.3