From 2fc5da3f95497820e5d8c0a92cd2491b2daef76c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 28 Oct 2013 17:28:15 +0100
Subject: [WIP] Add menu

bzr revid: fme@openerp.com-20131028162815-2nou1okxovo8thkr
---
 addons/website/static/src/xml/website.menu.xml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 addons/website/static/src/xml/website.menu.xml

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
new file mode 100644
index 00000000000..de029846c8b
--- /dev/null
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -0,0 +1,7 @@
+<templates id="template" xml:space="preserve">
+    <t t-name="website.menu.dialog" t-extend="website.editor.dialog.link">
+        <t t-jquery="t[t-set='title']" t-operation="inner">
+            Add Menu
+        </t>
+    </t>
+</templates>
-- 
cgit v1.2.3


From 7ac3061c42428c3650374901420b12c14da55d6b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 29 Oct 2013 12:24:50 +0100
Subject: [WIP] Edit menu dialog

bzr revid: fme@openerp.com-20131029112450-gnu2c3fl9ddypdf1
---
 addons/website/static/src/xml/website.menu.xml | 48 +++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 4 deletions(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index de029846c8b..7d8cdef4c2b 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -1,7 +1,47 @@
 <templates id="template" xml:space="preserve">
-    <t t-name="website.menu.dialog" t-extend="website.editor.dialog.link">
-        <t t-jquery="t[t-set='title']" t-operation="inner">
-            Add Menu
-        </t>
+<t t-name="website.menu.dialog.submenu">
+    <li>
+        <div>
+            <t t-esc="submenu.name"/>
+            <button type="button" class="btn-xs pull-right delete-menu btn-danger">
+                <i class="icon-trash"/>
+            </button>
+            <button type="button" class="btn-xs pull-right edit-menu btn-primary">
+                <i class="icon-edit"/>
+            </button>
+        </div>
+        <t t-set="children" t-value="submenu.children"/>
+        <ul t-if="children">
+            <t t-foreach="children" t-as="submenu">
+                <t t-call="website.menu.dialog.submenu"/>
+            </t>
+        </ul>
+    </li>
+</t>
+<t t-name="website.menu.dialog.footer-button">
+    <button type="button" class="btn pull-left add-menu btn-success">
+        <i class="icon-plus-sign"/> Add Menu Item
+    </button>
+</t>
+<t t-name="website.menu.dialog.edit">
+    <t t-call="website.editor.dialog">
+        <t t-set="title">Edit Menu</t>
+        <ul class="oe_menu_editor">
+            <t t-foreach="widget.menu.children" t-as="submenu">
+                <t t-call="website.menu.dialog.submenu"/>
+            </t>
+        </ul>
     </t>
+</t>
+<t t-name="website.menu.dialog.add" t-extend="website.editor.dialog.link">
+    <t t-jquery="t[t-set='title']" t-operation="inner">
+        Add Menu Entry
+    </t>
+    <t t-jquery="select.add-to-menu">
+        this.css('display', 'none');
+    </t>
+    <t t-jquery="label[for='link-text']" t-operation="replace">
+        Menu Label
+    </t>
+</t>
 </templates>
-- 
cgit v1.2.3


From 07b9cf0f024e1f22e0a34059870115710b744661 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 29 Oct 2013 15:33:46 +0100
Subject: [IMP] Save menu is working

bzr revid: fme@openerp.com-20131029143346-nu9skoj5s06hwgw6
---
 addons/website/static/src/xml/website.menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index 7d8cdef4c2b..f4f5e1948a9 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -1,6 +1,6 @@
 <templates id="template" xml:space="preserve">
 <t t-name="website.menu.dialog.submenu">
-    <li>
+    <li t-att-data-menu-id="submenu.id">
         <div>
             <t t-esc="submenu.name"/>
             <button type="button" class="btn-xs pull-right delete-menu btn-danger">
-- 
cgit v1.2.3


From 418e10c382cb0354c85fa62b41ce2cee7f3c0b54 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 30 Oct 2013 15:02:16 +0100
Subject: [IMP] Misc menu improvements

bzr revid: fme@openerp.com-20131030140216-f2fz7p3waur3l8j7
---
 addons/website/static/src/xml/website.menu.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index f4f5e1948a9..8b2580e89bd 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -2,13 +2,16 @@
 <t t-name="website.menu.dialog.submenu">
     <li t-att-data-menu-id="submenu.id">
         <div>
+            <i class="icon-reorder"/>
             <t t-esc="submenu.name"/>
-            <button type="button" class="btn-xs pull-right delete-menu btn-danger">
-                <i class="icon-trash"/>
-            </button>
-            <button type="button" class="btn-xs pull-right edit-menu btn-primary">
-                <i class="icon-edit"/>
-            </button>
+            <div class="btn-group btn-group-xs pull-right oe_menu_buttons">
+                <button type="button" class="btn js_edit_menu">
+                    <i class="icon-edit"/>
+                </button>
+                <button type="button" class="btn js_delete_menu">
+                    <i class="icon-trash"/>
+                </button>
+            </div>
         </div>
         <t t-set="children" t-value="submenu.children"/>
         <ul t-if="children">
@@ -19,7 +22,7 @@
     </li>
 </t>
 <t t-name="website.menu.dialog.footer-button">
-    <button type="button" class="btn pull-left add-menu btn-success">
+    <button type="button" class="btn pull-left js_add_menu btn-success">
         <i class="icon-plus-sign"/> Add Menu Item
     </button>
 </t>
-- 
cgit v1.2.3


From a87196eece2c193d2ee8e26377d9e489b466ad6a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 30 Oct 2013 16:12:01 +0100
Subject: [REM] Removed useless feature

bzr revid: fme@openerp.com-20131030151201-liz3qyn4mkv2ukc2
---
 addons/website/static/src/xml/website.menu.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index 8b2580e89bd..cafedcad119 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -40,9 +40,6 @@
     <t t-jquery="t[t-set='title']" t-operation="inner">
         Add Menu Entry
     </t>
-    <t t-jquery="select.add-to-menu">
-        this.css('display', 'none');
-    </t>
     <t t-jquery="label[for='link-text']" t-operation="replace">
         Menu Label
     </t>
-- 
cgit v1.2.3


From aa2f9217c0baf6f92600a8e074331f0ecfffb4cc Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 30 Oct 2013 17:04:05 +0100
Subject: [IMP] Menu entry dialog

bzr revid: fme@openerp.com-20131030160405-crxjr6agtmf2x89p
---
 addons/website/static/src/xml/website.menu.xml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index cafedcad119..d2ba62b68fa 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -23,7 +23,7 @@
 </t>
 <t t-name="website.menu.dialog.footer-button">
     <button type="button" class="btn pull-left js_add_menu btn-success">
-        <i class="icon-plus-sign"/> Add Menu Item
+        <i class="icon-plus-sign"/> Add Menu Entry
     </button>
 </t>
 <t t-name="website.menu.dialog.edit">
@@ -40,8 +40,19 @@
     <t t-jquery="t[t-set='title']" t-operation="inner">
         Add Menu Entry
     </t>
-    <t t-jquery="label[for='link-text']" t-operation="replace">
-        Menu Label
+    <t t-jquery="form > div.form-horizontal" t-operation="replace"/>
+    <t t-jquery="ul.list-group" t-operation="before">
+        <div class="list-group">
+            <div class="form-group list-group-item">
+                <h3 class="list-group-item-heading">
+                    <label for="link-new" class="control-label">
+                        Menu Label
+                    </label>
+                </h3>
+                <input type="text" class="form-control"
+                       id="link-text" autofocus="autofocus"/>
+            </div>
+        </div>
     </t>
 </t>
 </templates>
-- 
cgit v1.2.3


From 9f97b243181bf38e701de7c43ab79f57cc149a2c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 31 Oct 2013 17:02:11 +0100
Subject: [ADD] Edit menu entry

bzr revid: fme@openerp.com-20131031160211-zwxmdtokf59s5sq3
---
 addons/website/static/src/xml/website.menu.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index d2ba62b68fa..75f03209026 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -3,7 +3,7 @@
     <li t-att-data-menu-id="submenu.id">
         <div>
             <i class="icon-reorder"/>
-            <t t-esc="submenu.name"/>
+            <span><t t-esc="submenu.name"/></span>
             <div class="btn-group btn-group-xs pull-right oe_menu_buttons">
                 <button type="button" class="btn js_edit_menu">
                     <i class="icon-edit"/>
@@ -38,7 +38,8 @@
 </t>
 <t t-name="website.menu.dialog.add" t-extend="website.editor.dialog.link">
     <t t-jquery="t[t-set='title']" t-operation="inner">
-        Add Menu Entry
+        <t t-if="!widget.update_mode">Add Menu Entry</t>
+        <t t-if="widget.update_mode">Edit Menu Entry</t>
     </t>
     <t t-jquery="form > div.form-horizontal" t-operation="replace"/>
     <t t-jquery="ul.list-group" t-operation="before">
-- 
cgit v1.2.3


From 35d469d51f52d1dac7c99e8bab42d0b0a22122c5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 31 Oct 2013 17:51:17 +0100
Subject: [FIX] Reuse website.editor.LinkDialog#bind_data()

bzr revid: fme@openerp.com-20131031165117-13yo8nrfg1ru4cp8
---
 addons/website/static/src/xml/website.menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index 75f03209026..ce111693957 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -44,7 +44,7 @@
     <t t-jquery="form > div.form-horizontal" t-operation="replace"/>
     <t t-jquery="ul.list-group" t-operation="before">
         <div class="list-group">
-            <div class="form-group list-group-item">
+            <div class="form-group list-group-item active">
                 <h3 class="list-group-item-heading">
                     <label for="link-new" class="control-label">
                         Menu Label
-- 
cgit v1.2.3


From f880400e43dcbf94230401b7ffbbb34344d7e579 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 4 Nov 2013 12:34:12 +0100
Subject: [IMP] Improved menu link dialog

bzr revid: fme@openerp.com-20131104113412-q5d8263741pq9wna
---
 addons/website/static/src/xml/website.menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index ce111693957..883cf02231f 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -51,7 +51,7 @@
                     </label>
                 </h3>
                 <input type="text" class="form-control"
-                       id="link-text" autofocus="autofocus"/>
+                       id="link-text" required="required"/>
             </div>
         </div>
     </t>
-- 
cgit v1.2.3


From 3f7252e44436cb870d6bcb31eea52fdc6f3ffbea Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 5 Nov 2013 10:11:17 +0100
Subject: [ADD] Structure topmenu button

bzr revid: fme@openerp.com-20131105091117-hgzbnrxju3ftzmyx
---
 addons/website/static/src/xml/website.menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index 883cf02231f..c9c73c32ae7 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -28,7 +28,7 @@
 </t>
 <t t-name="website.menu.dialog.edit">
     <t t-call="website.editor.dialog">
-        <t t-set="title">Edit Menu</t>
+        <t t-set="title">Edit Structure</t>
         <ul class="oe_menu_editor">
             <t t-foreach="widget.menu.children" t-as="submenu">
                 <t t-call="website.menu.dialog.submenu"/>
-- 
cgit v1.2.3


From 7390b48a89511df0176e3e8b5940305bed63c3d3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Nov 2013 11:13:32 +0100
Subject: [IMP] Moved Add menu item to the dialog's body

bzr revid: fme@openerp.com-20131112101332-k8md3tiysoydn224
---
 addons/website/static/src/xml/website.menu.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index c9c73c32ae7..6eea8b25466 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -21,19 +21,19 @@
         </ul>
     </li>
 </t>
-<t t-name="website.menu.dialog.footer-button">
-    <button type="button" class="btn pull-left js_add_menu btn-success">
-        <i class="icon-plus-sign"/> Add Menu Entry
-    </button>
-</t>
 <t t-name="website.menu.dialog.edit">
     <t t-call="website.editor.dialog">
-        <t t-set="title">Edit Structure</t>
+        <t t-set="title">Edit Menu</t>
         <ul class="oe_menu_editor">
             <t t-foreach="widget.menu.children" t-as="submenu">
                 <t t-call="website.menu.dialog.submenu"/>
             </t>
         </ul>
+        <p class="mt32">
+            <a href="#" class="js_add_menu">
+                <i class="icon-plus-sign"/> Add Menu Entry
+            </a>
+        </p>
     </t>
 </t>
 <t t-name="website.menu.dialog.add" t-extend="website.editor.dialog.link">
-- 
cgit v1.2.3


From 0d2bf3b02e7a6a128db759136dd89d2af4d41814 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 14 Nov 2013 17:14:02 +0100
Subject: [IMP] help on menu multi-level

bzr revid: fp@tinyerp.com-20131114161402-8cyfgl322qc4t44h
---
 addons/website/static/src/xml/website.menu.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index 6eea8b25466..de2142193cf 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -29,11 +29,16 @@
                 <t t-call="website.menu.dialog.submenu"/>
             </t>
         </ul>
-        <p class="mt32">
-            <a href="#" class="js_add_menu">
-                <i class="icon-plus-sign"/> Add Menu Entry
-            </a>
-        </p>
+        <div class="mt16">
+            <div class="pull-right text-muted">
+                Right indent for multi-level menus
+            </div>
+            <div>
+                <a href="#" class="js_add_menu">
+                    <i class="icon-plus-sign"/> Add Menu Entry
+                </a>
+            </div>
+        </div>
     </t>
 </t>
 <t t-name="website.menu.dialog.add" t-extend="website.editor.dialog.link">
-- 
cgit v1.2.3


From cf5dfe897e98e7659c854f9ca0926a12ef9ff16d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 14 Nov 2013 22:11:32 +0100
Subject: [IMP] Menu editor: home icon on right

bzr revid: fme@openerp.com-20131114211132-bjrkreuy9b0fhqey
---
 addons/website/static/src/xml/website.menu.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index de2142193cf..a5d9e64a514 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -4,6 +4,7 @@
         <div>
             <i class="icon-reorder"/>
             <span><t t-esc="submenu.name"/></span>
+            <i class="icon-home"/>
             <div class="btn-group btn-group-xs pull-right oe_menu_buttons">
                 <button type="button" class="btn js_edit_menu">
                     <i class="icon-edit"/>
-- 
cgit v1.2.3


From 9570a51bcd65f20f8a84014049c7755100a03f23 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Thu, 14 Nov 2013 22:45:54 +0100
Subject: [IMP] style menu editor

bzr revid: fp@openerp.com-20131114214554-lak8rntdpq6clcpm
---
 addons/website/static/src/xml/website.menu.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index a5d9e64a514..b755f0af1e0 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -4,7 +4,6 @@
         <div>
             <i class="icon-reorder"/>
             <span><t t-esc="submenu.name"/></span>
-            <i class="icon-home"/>
             <div class="btn-group btn-group-xs pull-right oe_menu_buttons">
                 <button type="button" class="btn js_edit_menu">
                     <i class="icon-edit"/>
@@ -13,6 +12,7 @@
                     <i class="icon-trash"/>
                 </button>
             </div>
+            <i class="icon-home pull-right"/>
         </div>
         <t t-set="children" t-value="submenu.children"/>
         <ul t-if="children">
@@ -32,7 +32,7 @@
         </ul>
         <div class="mt16">
             <div class="pull-right text-muted">
-                Right indent for multi-level menus
+                <span class="icon-indent-right"/> right indent for multi-level menus
             </div>
             <div>
                 <a href="#" class="js_add_menu">
-- 
cgit v1.2.3


From 14edb56bb3623f4966dc18b866bd0abe0ab6f218 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 15 Nov 2013 12:51:22 +0100
Subject: [IMP] CSS cleaning: edit menu

bzr revid: fp@tinyerp.com-20131115115122-zzg6xeisa85n45e1
---
 addons/website/static/src/xml/website.menu.xml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index b755f0af1e0..22bec817778 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -1,18 +1,20 @@
 <templates id="template" xml:space="preserve">
 <t t-name="website.menu.dialog.submenu">
     <li t-att-data-menu-id="submenu.id">
-        <div>
-            <i class="icon-reorder"/>
-            <span><t t-esc="submenu.name"/></span>
-            <div class="btn-group btn-group-xs pull-right oe_menu_buttons">
-                <button type="button" class="btn js_edit_menu">
+        <div class="input-group">
+            <span class="input-group-addon icon-reorder"/>
+            <span type="text" class="form-control">
+                <t t-esc="submenu.name"/>
+                <i class="pull-right icon-home" style="margin-top: 3px"/>
+            </span>
+            <span class="input-group-btn">
+                <button type="button" class="btn btn-primary js_edit_menu">
                     <i class="icon-edit"/>
                 </button>
-                <button type="button" class="btn js_delete_menu">
+                <button type="button" class="btn btn-danger js_delete_menu">
                     <i class="icon-trash"/>
                 </button>
-            </div>
-            <i class="icon-home pull-right"/>
+            </span>
         </div>
         <t t-set="children" t-value="submenu.children"/>
         <ul t-if="children">
@@ -25,7 +27,7 @@
 <t t-name="website.menu.dialog.edit">
     <t t-call="website.editor.dialog">
         <t t-set="title">Edit Menu</t>
-        <ul class="oe_menu_editor">
+        <ul class="oe_menu_editor list-unstyled">
             <t t-foreach="widget.menu.children" t-as="submenu">
                 <t t-call="website.menu.dialog.submenu"/>
             </t>
-- 
cgit v1.2.3


From 7bb8d484fcfc5a81ebb59a3f759cdcf5f5193767 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 17 Nov 2013 12:30:44 +0100
Subject: [IMP] small fixes in layout

bzr revid: fp@openerp.com-20131117113044-7ly3zt2yz78r8ng2
---
 addons/website/static/src/xml/website.menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index 22bec817778..ea505d94b28 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -3,7 +3,7 @@
     <li t-att-data-menu-id="submenu.id">
         <div class="input-group">
             <span class="input-group-addon icon-reorder"/>
-            <span type="text" class="form-control">
+            <span class="form-control" style="padding-top: 0; padding-bottom: 0;">
                 <t t-esc="submenu.name"/>
                 <i class="pull-right icon-home" style="margin-top: 3px"/>
             </span>
-- 
cgit v1.2.3


From b6faef3d009929c12d46d731167faed3cb66dc10 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 18 Nov 2013 11:42:59 +0100
Subject: [IMP] html reduction

bzr revid: fp@tinyerp.com-20131118104259-3q2zifybopjarxzp
---
 addons/website/static/src/xml/website.menu.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index ea505d94b28..d5148b6b365 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -8,12 +8,8 @@
                 <i class="pull-right icon-home" style="margin-top: 3px"/>
             </span>
             <span class="input-group-btn">
-                <button type="button" class="btn btn-primary js_edit_menu">
-                    <i class="icon-edit"/>
-                </button>
-                <button type="button" class="btn btn-danger js_delete_menu">
-                    <i class="icon-trash"/>
-                </button>
+                <button type="button" class="btn btn-primary js_edit_menu icon-edit"/>
+                <button type="button" class="btn btn-danger js_delete_menu icon-trash"/>
             </span>
         </div>
         <t t-set="children" t-value="submenu.children"/>
-- 
cgit v1.2.3


From 43af23d272144d27ee7f0de8262da57f5f728505 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 18 Nov 2013 14:30:27 +0100
Subject: [FIX] Edit menu item

bzr revid: fme@openerp.com-20131118133027-85wk8x487ecqw1pm
---
 addons/website/static/src/xml/website.menu.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index d5148b6b365..2276076550a 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -4,7 +4,9 @@
         <div class="input-group">
             <span class="input-group-addon icon-reorder"/>
             <span class="form-control" style="padding-top: 0; padding-bottom: 0;">
-                <t t-esc="submenu.name"/>
+                <span class="js_menu_label">
+                    <t t-esc="submenu.name"/>
+                </span>
                 <i class="pull-right icon-home" style="margin-top: 3px"/>
             </span>
             <span class="input-group-btn">
-- 
cgit v1.2.3


From 9a3eb7963601e019aa02a0e8628984f445a8cebb Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 3 Dec 2013 14:51:56 +0100
Subject: [FIX] new fa icons for menu

bzr revid: fme@openerp.com-20131203135156-vflspcfkitv667wv
---
 addons/website/static/src/xml/website.menu.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index 2276076550a..9277b0d4bc2 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -2,16 +2,16 @@
 <t t-name="website.menu.dialog.submenu">
     <li t-att-data-menu-id="submenu.id">
         <div class="input-group">
-            <span class="input-group-addon icon-reorder"/>
+            <span class="input-group-addon fa fa-bars"/>
             <span class="form-control" style="padding-top: 0; padding-bottom: 0;">
                 <span class="js_menu_label">
                     <t t-esc="submenu.name"/>
                 </span>
-                <i class="pull-right icon-home" style="margin-top: 3px"/>
+                <i class="pull-right fa fa-home" style="margin-top: 3px"/>
             </span>
             <span class="input-group-btn">
-                <button type="button" class="btn btn-primary js_edit_menu icon-edit"/>
-                <button type="button" class="btn btn-danger js_delete_menu icon-trash"/>
+                <button type="button" class="btn btn-primary js_edit_menu fa fa-edit"/>
+                <button type="button" class="btn btn-danger js_delete_menu fa fa-trash-o"/>
             </span>
         </div>
         <t t-set="children" t-value="submenu.children"/>
@@ -32,11 +32,11 @@
         </ul>
         <div class="mt16">
             <div class="pull-right text-muted">
-                <span class="icon-indent-right"/> right indent for multi-level menus
+                <span class="fa fa-indent"/> right indent for multi-level menus
             </div>
             <div>
                 <a href="#" class="js_add_menu">
-                    <i class="icon-plus-sign"/> Add Menu Entry
+                    <i class="fa fa-plus-circle"/> Add Menu Entry
                 </a>
             </div>
         </div>
-- 
cgit v1.2.3


From bb4c13a2ecb29b6516022edc2ea0c2476bfffb0a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 28 Jan 2014 16:20:47 +0100
Subject: [FIX] website better instructions for submenus

bzr revid: al@openerp.com-20140128152047-kbt87i66zndf1kxr
---
 addons/website/static/src/xml/website.menu.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/website/static/src/xml/website.menu.xml')

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index 9277b0d4bc2..5afc927a8bc 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -32,7 +32,7 @@
         </ul>
         <div class="mt16">
             <div class="pull-right text-muted">
-                <span class="fa fa-indent"/> right indent for multi-level menus
+                Drag a menu to the right to create a sub-menu
             </div>
             <div>
                 <a href="#" class="js_add_menu">
-- 
cgit v1.2.3