From 62fb1bb92493b00bd45ed3f4eced5ca8b23f81d6 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Wed, 18 May 2016 18:02:51 +0200
Subject: [REF] web_editor: code refactoring and simplification

* Remove dead code + optimization
* Use Dialog API from web module
* Reorganize files
* Correct buggy $() function for snippet option class
* Add comments

* Fix the snippet parent navigation :

If a page contained a three level snippet structure (i.e A contains
B contains C), when editing the following bug occured :

If B or C was selected first, parenting buttons were correctly set.
But if selecting A then C, clicking on the parent lead to going back
on A instead of going on B.

* Fix snippet thumbnail layout
* Better isolate ui css from themes
* MediaDialog image list : prevent displaying empty attachments
* ...
---
 .../website/static/src/xml/website.contentMenu.xml | 59 +++++++++-------------
 1 file changed, 25 insertions(+), 34 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.contentMenu.xml b/addons/website/static/src/xml/website.contentMenu.xml
index d6b1fe40b72..f3334fc2500 100644
--- a/addons/website/static/src/xml/website.contentMenu.xml
+++ b/addons/website/static/src/xml/website.contentMenu.xml
@@ -22,42 +22,33 @@
         </ul>
     </li>
 </t>
-<t t-name="website.contentMenu.dialog.select">
-    <t t-call="web_editor.dialog">
-        <t t-set="title">Select a Menu</t>
-        <t t-set="button">Continue</t>
-        <select class="form-control mb16" t-if="widget.roots">
-            <t t-foreach="widget.roots" t-as="root">
-                <option t-att-value="root.id"><t t-esc="root.name"/></option>
-            </t>
-        </select>
+<select t-name="website.contentMenu.dialog.select" class="form-control mb16" t-if="widget.roots">
+    <t t-foreach="widget.roots" t-as="root">
+        <option t-att-value="root.id"><t t-esc="root.name"/></option>
     </t>
-</t>
-<t t-name="website.contentMenu.dialog.edit">
-    <t t-call="web_editor.dialog">
-        <t t-set="title">Edit Menu</t>
-        <select class="form-control mb16" t-if="widget.roots">
-            <t t-foreach="widget.roots" t-as="root">
-                <option t-att-value="root.id"><t t-esc="root.name"/></option>
-            </t>
-        </select>
-        <ul class="oe_menu_editor list-unstyled">
-            <t t-foreach="widget.menu.children" t-as="submenu">
-                <t t-call="website.contentMenu.dialog.submenu"/>
-            </t>
-        </ul>
-        <div class="mt16">
-            <div class="pull-right text-muted">
-                Drag a menu to the right to create a sub-menu
-            </div>
-            <div>
-                <a href="#" class="js_add_menu">
-                    <i class="fa fa-plus-circle"/> Add Menu Entry
-                </a>
-            </div>
+</select>
+<div t-name="website.contentMenu.dialog.edit">
+    <select class="form-control mb16" t-if="widget.roots">
+        <t t-foreach="widget.roots" t-as="root">
+            <option t-att-value="root.id"><t t-esc="root.name"/></option>
+        </t>
+    </select>
+    <ul class="oe_menu_editor list-unstyled">
+        <t t-foreach="widget.menu.children" t-as="submenu">
+            <t t-call="website.contentMenu.dialog.submenu"/>
+        </t>
+    </ul>
+    <div class="mt16">
+        <div class="pull-right text-muted">
+            Drag a menu to the right to create a sub-menu
         </div>
-    </t>
-</t>
+        <div>
+            <a href="#" class="js_add_menu">
+                <i class="fa fa-plus-circle"/> Add Menu Entry
+            </a>
+        </div>
+    </div>
+</div>
 <t t-name="website.contentMenu.dialog.add" t-extend="web_editor.dialog.link">
     <t t-jquery="t[t-set='title']" t-operation="inner">
         <t t-if="!widget.update_mode">Add Menu Entry</t>
-- 
cgit v1.2.3