From b4d8a270e164ab877e9c521f48870b29adc3cb17 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Mon, 20 Feb 2017 12:15:34 +0100
Subject: [FIX] web_editor, website: restore content menu feature

Commit 3c9e6c89e7207636c1bdab4ed8118c0c1089d43e made big changes to the
link editor dialog... but also broke many features with it.

Commit 9a1ea6dc08af8b6dc5c5a47277f03f662094d4b2 already fixed some of
them but this commit fixes a bigger one. Indeed, the menu edition
feature was totally broken since the changes. Also, the DOM was messy
which broke form navigation, etc.
This commit also simplifies the LESS which was uselessly big.
---
 addons/web_editor/static/src/xml/editor.xml | 93 +++++++++++++++--------------
 1 file changed, 48 insertions(+), 45 deletions(-)

(limited to 'addons/web_editor/static/src/xml/editor.xml')

diff --git a/addons/web_editor/static/src/xml/editor.xml b/addons/web_editor/static/src/xml/editor.xml
index 1e0d7d9aa43..e8fdacc42d3 100644
--- a/addons/web_editor/static/src/xml/editor.xml
+++ b/addons/web_editor/static/src/xml/editor.xml
@@ -218,58 +218,61 @@
     </t>
 
     <!-- Link Dialog (allows to choose a style and content for a link on the page) -->
-    <form t-name="web_editor.dialog.link" class="o-link-editor-dialog">
+    <div t-name="web_editor.dialog.link" class="o_link_dialog">
         <div class="row">
-            <div class="col-md-8 o-link-vr">
-                <div class="form-horizontal">
-                    <div class="form-group">
-                        <label class="control-label col-sm-3" for="link-new">Link Label</label>
-                        <div class="col-sm-9">
-                            <input class="form-control" id="link-text" required="required"/>
-                        </div>
+            <form class="col-md-8 form-horizontal">
+                <div class="form-group">
+                    <label class="control-label col-sm-3" for="o_link_dialog_label_input">Link Label</label>
+                    <div class="col-sm-9">
+                        <input class="form-control" id="o_link_dialog_label_input" required="required"/>
                     </div>
-                    <div class="form-group">
-                        <label class="control-label col-sm-3" for="link-new">URL or Email</label>
-                        <div class="col-sm-9">
-                            <input class="form-control url email-address url-source" id="link-external" required="required"/>
-                        </div>
+                </div>
+                <div class="form-group">
+                    <label class="control-label col-sm-3" for="o_link_dialog_url_input">URL or Email</label>
+                    <div class="col-sm-9">
+                        <input class="form-control url email-address url-source" id="o_link_dialog_url_input" required="required"/>
                     </div>
-                    <div class="form-group">
-                        <label class="control-label col-sm-3">Size</label>
-                        <div class="col-sm-9">
-                            <select class="form-control col-sm-3 link-style">
-                                <option value="btn-xs">Extra Small</option>
-                                <option value="btn-sm">Small</option>
-                                <option value="" selected="selected">Medium</option>
-                                <option value="btn-lg">Large</option>
-                            </select>
-                        </div>
+                </div>
+                <div class="form-group">
+                    <label class="control-label col-sm-3">Size</label>
+                    <div class="col-sm-9">
+                        <select class="form-control col-sm-3 link-style">
+                            <option value="btn-xs">Extra Small</option>
+                            <option value="btn-sm">Small</option>
+                            <option value="" selected="selected">Medium</option>
+                            <option value="btn-lg">Large</option>
+                        </select>
                     </div>
-                    <div class="form-group">
-                        <label class="control-label col-sm-3">Color</label>
-                        <div class="col-sm-9">
-                            <div class="o-link-color-selector">
-                                <t t-foreach="['', 'btn-primary', 'btn-success', 'btn-info', 'btn-warning', 'btn-danger', 'btn-alpha', 'btn-beta', 'btn-gamma', 'btn-delta', 'btn-epsilon', 'btn-default']" t-as="color">
-                                    <label t-attf-class="o-link-color #{color}" t-att-data-color="color">
-                                        <input class="link-style" name="link-style-type" type="radio" t-att-value="color"/>
-                                        <span/>
-                                    </label>
-                                </t>
-                            </div>
+                </div>
+                <div class="form-group">
+                    <label class="control-label col-sm-3">Color</label>
+                    <div class="col-sm-9">
+                        <div class="o_link_dialog_color">
+                            <label t-attf-class="o_link_dialog_color_item o_btn_preview btn btn-link text-center" data-color="">
+                                <span>L</span>
+                                <input class="hidden link-style" name="link-style-type" type="radio" value=""/>
+                                <i class="fa"/>
+                            </label>
+                            <t t-foreach="['btn-primary', 'btn-default', 'btn-success', 'btn-info', 'btn-warning', 'btn-danger', 'btn-alpha', 'btn-beta', 'btn-gamma', 'btn-delta', 'btn-epsilon']" t-as="color">
+                                <label t-attf-class="o_link_dialog_color_item o_btn_preview btn #{color}" t-att-data-color="color">
+                                    <input class="hidden link-style" name="link-style-type" type="radio" t-att-value="color"/>
+                                    <i class="fa"/>
+                                </label>
+                            </t>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <div class="col-sm-offset-3 col-sm-9">
-                        <label class="o_switch">
-                            <input class="window-new" type="checkbox"/>
-                            <span/>
-                            Open in new window
-                        </label>
-                        </div>
+                </div>
+                <div class="form-group">
+                    <div class="col-sm-offset-3 col-sm-9">
+                    <label class="o_switch">
+                        <input class="window-new" type="checkbox"/>
+                        <span/>
+                        Open in new window
+                    </label>
                     </div>
                 </div>
-            </div>
-            <div class="col-md-4">
+            </form>
+            <div class="col-md-4 o_link_dialog_preview">
                 <div class="form-group text-center">
                     <label>Preview</label>
                     <div style="overflow: auto; max-width: 100%; max-height: 200px;">
@@ -278,7 +281,7 @@
                 </div>
             </div>
         </div>
-    </form>
+    </div>
 
     <!--=================-->
     <!-- Snippet options -->
-- 
cgit v1.2.3