From c2c0fdc916560fe08897679c03794b16701c40cd Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Thu, 10 Jul 2014 13:34:02 +0200
Subject: [IMP] website editor: remove button style from cke and insert into
 the link dialog box. Fix the dialog box label value when the user create a
 link.

---
 addons/website/static/src/xml/website.editor.xml | 49 ++++++++++++++++--------
 1 file changed, 32 insertions(+), 17 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index d61b6ed2664..e895c08c3cd 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -51,7 +51,7 @@
                                id="link-page" type="hidden"/>
                     </li>
                     <li class="list-group-item form-group clearfix">
-                        <div class="pull-right">
+                        <div class="pull-right" style="display: none;">
                             <label>
                                 <input type="checkbox" class="window-new"/>
                                 Open in new window
@@ -59,32 +59,47 @@
                         </div>
                         <h4 class="list-group-item-heading">
                             <label for="link-external" class="control-label">
-                                URL
+                                URL or Email Address
                             </label>
                         </h4>
-                        <input type="text" class="form-control url url-source"
+                        <input type="text" class="form-control url email-address url-source"
                                id="link-external" placeholder="http://openerp.com"/>
                     </li>
                     <li class="list-group-item form-group">
                         <h4 class="list-group-item-heading">
-                            <label for="link-email" class="control-label">
-                                Email Address
+                            <label for="link-text" class="control-label">
+                                Link text
                             </label>
                         </h4>
-                        <input type="email" class="form-control email-address url-source"
-                               id="link-email" placeholder="you@yourwebsite.com"/>
-                    </li>
-                </ul>
-                <div class="form-horizontal">
-                    <div class="form-group">
-                        <label for="link-text" class="col-sm-2 control-label">
-                            Link text
-                        </label>
-                        <div class="col-sm-10">
                             <input type="text" class="form-control"
                                    id="link-text"/>
-                        </div>
-                    </div>
+                    </li>
+                    <li class="list-group-item form-group">
+                        <h4 class="list-group-item-heading">
+                            <label for="link-type" class="control-label">
+                                Style
+                            </label>
+                        </h4>
+                        <select id="link-style-type" class="form-control link-style pull-left" style="display: inline-block; width: 49%;">
+                            <option value="" selected="selected">Link</option>
+                            <option value="btn-default">Basic</option>
+                            <option value="btn-primary">Primary</option>
+                            <option value="btn-success">Success</option>
+                            <option value="btn-info">Info</option>
+                            <option value="btn-warning">Warning</option>
+                            <option value="btn-danger">Danger</option>
+                        </select>
+                        <select id="link-style-size" class="form-control link-style pull-right" style="display: inline-block; width: 49%;">
+                            <option value="btn-xs">Extra Small</option>
+                            <option value="btn-sm">Small</option>
+                            <option value="" selected="selected">Default</option>
+                            <option value="btn-lg">Large</option>
+                        </select>
+                        <div class="clearfix"/>
+                    </li>
+                </ul>
+                <div class="text-center">
+                    <a id="link-preview" href="#" class="hidden">Preview</a>
                 </div>
             </form>
         </t>
-- 
cgit v1.2.3


From 886d6101ac8e5e1778b822ac49176cd9109494b6 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Thu, 10 Jul 2014 15:25:44 +0200
Subject: [IMP] website editor: change link editor modal layout

---
 addons/website/static/src/xml/website.editor.xml | 79 ++++++++++++++----------
 1 file changed, 45 insertions(+), 34 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index e895c08c3cd..099c85ddc45 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -65,41 +65,52 @@
                         <input type="text" class="form-control url email-address url-source"
                                id="link-external" placeholder="http://openerp.com"/>
                     </li>
-                    <li class="list-group-item form-group">
-                        <h4 class="list-group-item-heading">
-                            <label for="link-text" class="control-label">
-                                Link text
-                            </label>
-                        </h4>
-                            <input type="text" class="form-control"
-                                   id="link-text"/>
-                    </li>
-                    <li class="list-group-item form-group">
-                        <h4 class="list-group-item-heading">
-                            <label for="link-type" class="control-label">
-                                Style
-                            </label>
-                        </h4>
-                        <select id="link-style-type" class="form-control link-style pull-left" style="display: inline-block; width: 49%;">
-                            <option value="" selected="selected">Link</option>
-                            <option value="btn-default">Basic</option>
-                            <option value="btn-primary">Primary</option>
-                            <option value="btn-success">Success</option>
-                            <option value="btn-info">Info</option>
-                            <option value="btn-warning">Warning</option>
-                            <option value="btn-danger">Danger</option>
-                        </select>
-                        <select id="link-style-size" class="form-control link-style pull-right" style="display: inline-block; width: 49%;">
-                            <option value="btn-xs">Extra Small</option>
-                            <option value="btn-sm">Small</option>
-                            <option value="" selected="selected">Default</option>
-                            <option value="btn-lg">Large</option>
-                        </select>
-                        <div class="clearfix"/>
-                    </li>
                 </ul>
-                <div class="text-center">
-                    <a id="link-preview" href="#" class="hidden">Preview</a>
+                <div class="form-horizontal">
+                    <div class="form-group">
+                        <label for="link-text" class="col-sm-2 control-label">
+                            Link text
+                        </label>
+                        <div class="col-sm-10">
+                            <input type="text" class="form-control" id="link-text"/>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-horizontal">
+                    <div class="form-group">
+                        <label for="link-style-type" class="col-sm-2 control-label">
+                            Style
+                        </label>
+                        <div class="col-sm-5">
+                            <select id="link-style-type" class="form-control link-style" style="display: inline-block;">
+                                <option value="" selected="selected">Link</option>
+                                <option value="btn-default">Basic</option>
+                                <option value="btn-primary">Primary</option>
+                                <option value="btn-success">Success</option>
+                                <option value="btn-info">Info</option>
+                                <option value="btn-warning">Warning</option>
+                                <option value="btn-danger">Danger</option>
+                            </select>
+                        </div>
+                        <div class="col-sm-5">
+                            <select id="link-style-size" class="form-control link-style" style="display: inline-block;">
+                                <option value="btn-xs">Extra Small</option>
+                                <option value="btn-sm">Small</option>
+                                <option value="" selected="selected">Default</option>
+                                <option value="btn-lg">Large</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-horizontal">
+                    <div class="form-group">
+                        <label for="link-text" class="col-sm-2 control-label">
+                            Preview
+                        </label>
+                        <div class="col-sm-10" style="line-height: 2;">
+                            <a id="link-preview" href="#"></a>
+                        </div>
+                    </div>
                 </div>
             </form>
         </t>
-- 
cgit v1.2.3


From 1eee1d2c5100c71bfbd84b5866385e3e9d4942c3 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Fri, 11 Jul 2014 11:09:24 +0200
Subject: [IMP] website: replace the select box into dropdown for link editor
 to have a preview

---
 addons/website/static/src/xml/website.editor.xml | 69 ++++++++++++++++--------
 1 file changed, 47 insertions(+), 22 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 099c85ddc45..486b4498f16 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -76,38 +76,63 @@
                         </div>
                     </div>
                 </div>
-                <div class="form-horizontal">
+                <div class="form-horizontal link-style">
                     <div class="form-group">
-                        <label for="link-style-type" class="col-sm-2 control-label">
+                        <label class="col-sm-2 control-label">
                             Style
                         </label>
-                        <div class="col-sm-5">
-                            <select id="link-style-type" class="form-control link-style" style="display: inline-block;">
-                                <option value="" selected="selected">Link</option>
-                                <option value="btn-default">Basic</option>
-                                <option value="btn-primary">Primary</option>
-                                <option value="btn-success">Success</option>
-                                <option value="btn-info">Info</option>
-                                <option value="btn-warning">Warning</option>
-                                <option value="btn-danger">Danger</option>
-                            </select>
+                        <div class="col-sm-4">
+                            <div class="dropdown" style="line-height: 2em;">
+                                <a data-toggle="dropdown" class="btn btn-default" href="#">Color Style <span class="caret"></span></a>
+                                <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+                                    <li>
+                                        <label class="btn btn-link">Link<input value="" class="link-style" type="radio" name="link-style-type" checked="checked"/></label>
+                                    </li>
+                                    <li>
+                                        <label class="btn btn-default">Basic<input value="btn-default" class="link-style" type="radio" name="link-style-type"/></label>
+                                    </li>
+                                    <li>
+                                        <label class="btn btn-primary">Primary<input value="btn-primary" class="link-style" type="radio" name="link-style-type"/></label>
+                                    </li>
+                                    <li>
+                                        <label class="btn btn-info">Info<input value="btn-info" class="link-style" type="radio" name="link-style-type"/></label>
+                                    </li>
+                                    <li>
+                                        <label class="btn btn-warning">Warning<input value="btn-warning" class="link-style" type="radio" name="link-style-type"/></label>
+                                    </li>
+                                    <li>
+                                        <label class="btn btn-danger">Danger<input value="btn-danger" class="link-style" type="radio" name="link-style-type"/></label>
+                                    </li>
+                                </ul>
+                            </div>
                         </div>
-                        <div class="col-sm-5">
-                            <select id="link-style-size" class="form-control link-style" style="display: inline-block;">
-                                <option value="btn-xs">Extra Small</option>
-                                <option value="btn-sm">Small</option>
-                                <option value="" selected="selected">Default</option>
-                                <option value="btn-lg">Large</option>
-                            </select>
+                        <div class="col-sm-4">
+                            <div class="dropdown" style="line-height: 2em;">
+                                <a data-toggle="dropdown" class="btn btn-default" href="#">Size <span class="caret"></span></a>
+                                <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+                                    <li>
+                                        <label class="btn btn-default btn-xs">Extra Small<input value="btn-xs" class="link-style" type="radio" name="link-style-size"/></label>
+                                    </li>
+                                    <li>
+                                        <label class="btn btn-default btn-sm">Small<input value="btn-sm" class="link-style" type="radio" name="link-style-size"/></label>
+                                    </li>
+                                    <li>
+                                        <label class="btn btn-default">Default<input value="" class="link-style" type="radio" name="link-style-size" checked="checked"/></label>
+                                    </li>
+                                    <li>
+                                        <label class="btn btn-default btn-lg">Large<input value="btn-lg" class="link-style" type="radio" name="link-style-size"/></label>
+                                    </li>
+                                </ul>
+                            </div>
                         </div>
                     </div>
                 </div>
-                <div class="form-horizontal">
+                <div class="form-horizontal link-style">
                     <div class="form-group">
-                        <label for="link-text" class="col-sm-2 control-label">
+                        <label class="col-sm-2 control-label">
                             Preview
                         </label>
-                        <div class="col-sm-10" style="line-height: 2;">
+                        <div class="col-sm-10" style="line-height: 2em;">
                             <a id="link-preview" href="#"></a>
                         </div>
                     </div>
-- 
cgit v1.2.3


From a72bdcca90237745376f4014fc07b5c8e707b886 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Fri, 11 Jul 2014 13:38:57 +0200
Subject: [FIX] website: add forgotten button type (btn-success) for link
 editor

---
 addons/website/static/src/xml/website.editor.xml | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 486b4498f16..0e3873b1de6 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -91,6 +91,9 @@
                                     <li>
                                         <label class="btn btn-default">Basic<input value="btn-default" class="link-style" type="radio" name="link-style-type"/></label>
                                     </li>
+                                    <li>
+                                        <label class="btn btn-success">Success<input value="btn-success" class="link-style" type="radio" name="link-style-type"/></label>
+                                    </li>
                                     <li>
                                         <label class="btn btn-primary">Primary<input value="btn-primary" class="link-style" type="radio" name="link-style-type"/></label>
                                     </li>
-- 
cgit v1.2.3