From 0d64c9037dcf27d8a32515e5150e96e16ef8a75e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 29 Aug 2013 17:34:41 +0200
Subject: [IMP] Implement custom bootstrap dialog for links.

Dialog doesn't work right as it's a bootstrap 3-ish dialog, not 2, so
none of the classes works correctly.

Also moved editor templates outside of main website template file.

bzr revid: xmo@openerp.com-20130829153441-w51n3hxxikyti0xj
---
 addons/website/static/src/xml/website.editor.xml | 56 ++++++++++++++++++++++++
 1 file changed, 56 insertions(+)
 create mode 100644 addons/website/static/src/xml/website.editor.xml

(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
new file mode 100644
index 00000000000..6fbc7345b17
--- /dev/null
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -0,0 +1,56 @@
+<templates id="template" xml:space="preserve">
+    <t t-extend="website.editorbar">
+        <t t-jquery="#website-top-view" t-operation="after">
+            <div class="navbar-inner" id="website-top-edit">
+                <form class="navbar-form pull-left">
+                    <button data-action="save" class="btn btn-primary">Save</button>
+                    <button data-action="cancel" class="btn">Cancel</button>
+                </form>
+                <ul class="nav pull-right">
+                    <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
+                </ul>
+            </div>
+        </t>
+    </t>
+    <t t-name="website.editor.dialog.link">
+        <div class="modal hide" tabindex="-1" role="dialog" aria-hidden="true">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h3>Link to:</h3>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <ul class="list-group">
+                        <li class="list-group-item active">
+                            <h3 class="list-group-item-heading">Page on Your Website</h3>
+                            <select class="form-control pages url-source"/>
+                        </li>
+                        <li class="list-group-item">
+                            <h3 class="list-group-item-heading pull-left">Website URL</h3>
+                            <div class="pull-right">
+                                <label>
+                                    <input type="checkbox" class="window-new"/>
+                                    Open in new window
+                                </label>
+                            </div>
+                            <div class="clearfix"></div>
+                            <div class="input-group">
+                                <input type="text" class="form-control url url-source"
+                                       placeholder="http://openerp.com"/>
+                            </div>
+                        </li>
+                        <li class="list-group-item">
+                            <h3 class="list-group-item-heading">Email Address</h3>
+                            <input type="email" class="form-control email-address url-source"
+                                   placeholder="you@yourwebsite.com"/>
+                        </li>
+                    </ul>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+                <button type="button" class="btn btn-primary">Save changes</button>
+            </div>
+        </div>
+    </t>
+</templates>
-- 
cgit v1.2.3


From f71c0b9f6edc7b50f8cb8331f77e1011bb1fe02e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 30 Aug 2013 10:31:18 +0200
Subject: [FIX] link dialog broken under bootstrap 3

bzr revid: xmo@openerp.com-20130830083118-y2r5xfywccclcs64
---
 addons/website/static/src/xml/website.editor.xml | 75 ++++++++++++------------
 1 file changed, 38 insertions(+), 37 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 b55e3bd47c5..76aa855e6b1 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -13,43 +13,44 @@
         </t>
     </t>
     <t t-name="website.editor.dialog.link">
-        <div class="modal hide" tabindex="-1" role="dialog" aria-hidden="true">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                <h3>Link to:</h3>
-            </div>
-            <div class="modal-body">
-                <form>
-                    <ul class="list-group">
-                        <li class="list-group-item active">
-                            <h3 class="list-group-item-heading">Page on Your Website</h3>
-                            <select class="form-control pages url-source"/>
-                        </li>
-                        <li class="list-group-item">
-                            <h3 class="list-group-item-heading pull-left">Website URL</h3>
-                            <div class="pull-right">
-                                <label>
-                                    <input type="checkbox" class="window-new"/>
-                                    Open in new window
-                                </label>
-                            </div>
-                            <div class="clearfix"></div>
-                            <div class="input-group">
-                                <input type="text" class="form-control url url-source"
-                                       placeholder="http://openerp.com"/>
-                            </div>
-                        </li>
-                        <li class="list-group-item">
-                            <h3 class="list-group-item-heading">Email Address</h3>
-                            <input type="email" class="form-control email-address url-source"
-                                   placeholder="you@yourwebsite.com"/>
-                        </li>
-                    </ul>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-                <button type="button" class="btn btn-primary">Save changes</button>
+        <div class="modal" tabindex="-1" role="dialog" aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                        <h3>Link to:</h3>
+                    </div>
+                    <div class="modal-body">
+                        <form>
+                            <ul class="list-group form-group">
+                                <li class="list-group-item active">
+                                    <h3 class="list-group-item-heading">Page on Your Website</h3>
+                                    <select class="form-control pages url-source"/>
+                                </li>
+                                <li class="list-group-item">
+                                    <div class="pull-right">
+                                        <label>
+                                            <input type="checkbox" class="window-new"/>
+                                            Open in new window
+                                        </label>
+                                    </div>
+                                    <h3 class="list-group-item-heading pull-left">Website URL</h3>
+                                    <input type="text" class="form-control url url-source"
+                                           placeholder="http://openerp.com"/>
+                                </li>
+                                <li class="list-group-item">
+                                    <h3 class="list-group-item-heading">Email Address</h3>
+                                    <input type="email" class="form-control email-address url-source"
+                                           placeholder="you@yourwebsite.com"/>
+                                </li>
+                            </ul>
+                        </form>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+                        <button type="button" class="btn btn-primary">Save changes</button>
+                    </div>
+                </div>
             </div>
         </div>
     </t>
-- 
cgit v1.2.3


From 1916b769ac64d99e200f4ed597444b1c0e585f02 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 2 Sep 2013 09:52:16 +0200
Subject: [ADD] bootstrap image dialog, behavior missing

bzr revid: xmo@openerp.com-20130902075216-4y83ed2r19z2fgha
---
 addons/website/static/src/xml/website.editor.xml | 86 ++++++++++++++++--------
 1 file changed, 57 insertions(+), 29 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 76aa855e6b1..25005cc4e0e 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -12,46 +12,74 @@
             </div>
         </t>
     </t>
-    <t t-name="website.editor.dialog.link">
+    <t t-name="website.editor.dialog">
         <div class="modal" tabindex="-1" role="dialog" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                        <h3>Link to:</h3>
-                    </div>
-                    <div class="modal-body">
-                        <form>
-                            <ul class="list-group form-group">
-                                <li class="list-group-item active">
-                                    <h3 class="list-group-item-heading">Page on Your Website</h3>
-                                    <select class="form-control pages url-source"/>
-                                </li>
-                                <li class="list-group-item">
-                                    <div class="pull-right">
-                                        <label>
-                                            <input type="checkbox" class="window-new"/>
-                                            Open in new window
-                                        </label>
-                                    </div>
-                                    <h3 class="list-group-item-heading pull-left">Website URL</h3>
-                                    <input type="text" class="form-control url url-source"
-                                           placeholder="http://openerp.com"/>
-                                </li>
-                                <li class="list-group-item">
-                                    <h3 class="list-group-item-heading">Email Address</h3>
-                                    <input type="email" class="form-control email-address url-source"
-                                           placeholder="you@yourwebsite.com"/>
-                                </li>
-                            </ul>
-                        </form>
+                        <h3><t t-esc="title"/></h3>
                     </div>
+                    <div class="modal-body"><t t-raw="__content__"/></div>
                     <div class="modal-footer">
                         <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-                        <button type="button" class="btn btn-primary">Save changes</button>
+                        <button type="button" class="btn btn-primary save">Save changes</button>
                     </div>
                 </div>
             </div>
         </div>
     </t>
+    <t t-name="website.editor.dialog.link">
+        <t t-call="website.editor.dialog">
+            <t t-set="title">Link to:</t>
+            <form>
+                <ul class="list-group form-group">
+                    <li class="list-group-item active">
+                        <h3 class="list-group-item-heading">Page on your website</h3>
+                        <select class="form-control pages url-source"/>
+                    </li>
+                    <li class="list-group-item">
+                        <div class="pull-right">
+                            <label>
+                                <input type="checkbox" class="window-new"/>
+                                Open in new window
+                            </label>
+                        </div>
+                        <h3 class="list-group-item-heading">Website URL</h3>
+                        <input type="text" class="form-control url url-source"
+                               placeholder="http://openerp.com"/>
+                    </li>
+                    <li class="list-group-item">
+                        <h3 class="list-group-item-heading">Email Address</h3>
+                        <input type="email" class="form-control email-address url-source"
+                               placeholder="you@yourwebsite.com"/>
+                    </li>
+                </ul>
+            </form>
+        </t>
+    </t>
+    <t t-name="website.editor.dialog.image">
+        <t t-call="website.editor.dialog">
+            <t t-set="title">Image:</t>
+            <form method="POST" action="/website/attach"
+                  enctype="multipart/form-data"
+                  target="fileframe">
+                <div class="well">
+                    <!-- a href="#" class="pull-left">Find image</a -->
+                    <h3 class="list-group-item-heading">Image URL</h3>
+                    <input type="text" class="form-control url"
+                           placeholder="http://openerp.com"/>
+                </div>
+                <div class="text-center">
+                    <p class="">— or —</p>
+                    <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
+                    <button type="button" class="btn btn-primary btn-lg filepicker">
+                        Upload an image from your computer
+                    </button>
+                </div>
+                <input type="hidden" name="func"/>
+            </form>
+            <iframe src="about:blank" name="fileframe" class="hidden"/>
+        </t>
+    </t>
 </templates>
-- 
cgit v1.2.3


From ba2076f400dee422d7a2ea78a0dee94319efc821 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 2 Sep 2013 13:15:51 +0200
Subject: [FIX] correctly set @type of non-submit buttons to button

because of fix to $raw_editables links disabler, buttons which were
(apparently) previously cancelDefault-ed now are not, and blow up
various things when used.

bzr revid: xmo@openerp.com-20130902111551-ryldrw8kebz98u1w
---
 addons/website/static/src/xml/website.editor.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 25005cc4e0e..b1258a91873 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -3,11 +3,13 @@
         <t t-jquery="#website-top-view" t-operation="after">
             <div class="navbar-inner" id="website-top-edit">
                 <form class="navbar-form pull-left">
-                    <button data-action="save" class="btn btn-primary">Save</button>
-                    <button data-action="cancel" class="btn">Cancel</button>
+                    <button type="button" data-action="save"
+                            class="btn btn-primary">Save</button>
+                    <button type="button" data-action="cancel"
+                            class="btn">Cancel</button>
                 </form>
                 <ul class="nav navbar-nav pull-right">
-                    <li class="navbar-form"><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
+                    <li class="navbar-form"><button type="button" data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
                 </ul>
             </div>
         </t>
-- 
cgit v1.2.3


From b11dc9d3dacbf35ef021e043b189d6593e0fefdb Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 2 Sep 2013 18:51:23 +0200
Subject: [IMP] small changes bootstrap style

bzr revid: fp@tinyerp.com-20130902165123-e2246x1la28xy1ei
---
 addons/website/static/src/xml/website.editor.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 b1258a91873..bd8f632a329 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -20,12 +20,12 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                        <h3><t t-esc="title"/></h3>
+                        <h3 class="modal-title"><t t-esc="title"/></h3>
                     </div>
                     <div class="modal-body"><t t-raw="__content__"/></div>
                     <div class="modal-footer">
-                        <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-                        <button type="button" class="btn btn-primary save">Save changes</button>
+                        <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Discard</button>
+                        <button type="button" class="btn btn-primary save">Save Changes</button>
                     </div>
                 </div>
             </div>
@@ -33,7 +33,7 @@
     </t>
     <t t-name="website.editor.dialog.link">
         <t t-call="website.editor.dialog">
-            <t t-set="title">Link to:</t>
+            <t t-set="title">Link to</t>
             <form>
                 <ul class="list-group form-group">
                     <li class="list-group-item active">
@@ -62,7 +62,7 @@
     </t>
     <t t-name="website.editor.dialog.image">
         <t t-call="website.editor.dialog">
-            <t t-set="title">Image:</t>
+            <t t-set="title">Image</t>
             <form method="POST" action="/website/attach"
                   enctype="multipart/form-data"
                   target="fileframe">
-- 
cgit v1.2.3


From cf9ab25816b47a2e501f5cb4b155441c45212ab2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 2 Sep 2013 15:49:20 +0200
Subject: [ADD] image preview to dialog

bzr revid: xmo@openerp.com-20130902134920-um72bldsv19mf5ij
---
 addons/website/static/src/xml/website.editor.xml | 44 ++++++++++++++----------
 1 file changed, 26 insertions(+), 18 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 bd8f632a329..8dee9aa9c65 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -62,25 +62,33 @@
     </t>
     <t t-name="website.editor.dialog.image">
         <t t-call="website.editor.dialog">
-            <t t-set="title">Image</t>
-            <form method="POST" action="/website/attach"
-                  enctype="multipart/form-data"
-                  target="fileframe">
-                <div class="well">
-                    <!-- a href="#" class="pull-left">Find image</a -->
-                    <h3 class="list-group-item-heading">Image URL</h3>
-                    <input type="text" class="form-control url"
-                           placeholder="http://openerp.com"/>
-                </div>
-                <div class="text-center">
-                    <p class="">— or —</p>
-                    <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
-                    <button type="button" class="btn btn-primary btn-lg filepicker">
-                        Upload an image from your computer
-                    </button>
+            <t t-set="title">Image:</t>
+            <div class="row">
+                <form method="POST" action="/website/attach"
+                      enctype="multipart/form-data"
+                      target="fileframe"
+                      class="col-sm-8">
+                    <div class="well">
+                        <!-- a href="#" class="pull-left">Find image</a -->
+                        <h3 class="list-group-item-heading">Image URL</h3>
+                        <input type="text" class="form-control url"
+                               placeholder="http://openerp.com"/>
+                    </div>
+                    <div class="text-center">
+                        <p class="">— or —</p>
+                        <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
+                        <button type="button" class="btn btn-primary btn-lg filepicker">
+                            Upload an image from your computer
+                        </button>
+                    </div>
+                    <input type="hidden" name="func"/>
+                </form>
+                <div class="col-sm-4">
+                    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D"
+                         class="pull-right img-rounded"
+                         width="100%"/>
                 </div>
-                <input type="hidden" name="func"/>
-            </form>
+            </div>
             <iframe src="about:blank" name="fileframe" class="hidden"/>
         </t>
     </t>
-- 
cgit v1.2.3


From c89d31ca95ab311d720b4754b624bd887d77016d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 3 Sep 2013 16:32:37 +0200
Subject: [ADD] creation of new page from link dialog

* Replace select by input with dropdown

* Add random crap to /pagenew so it does not blow up when a butterfly
  flaps its wings, also so it's possible to call it through xhr and
  get something out of it

* Fix duplicated save() call in link dialog widget thing

bzr revid: xmo@openerp.com-20130903143237-6pwsbqzc02bv3mri
---
 addons/website/static/src/xml/website.editor.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(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 8dee9aa9c65..4dd6a958949 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -38,7 +38,14 @@
                 <ul class="list-group form-group">
                     <li class="list-group-item active">
                         <h3 class="list-group-item-heading">Page on your website</h3>
-                        <select class="form-control pages url-source"/>
+                        <div class="input-group">
+                            <input type="text" class="form-control pages url-source"
+                                    placeholder="Create new page"/>
+                            <div class="input-group-btn existing dropdown">
+                                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Existing page <span class="caret"></span></button>
+                                <ul class="dropdown-menu pull-right"/>
+                            </div>
+                        </div>
                     </li>
                     <li class="list-group-item">
                         <div class="pull-right">
-- 
cgit v1.2.3


From 4932521377aa38891617c3bd4add15473b996a0c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 4 Sep 2013 13:32:22 +0200
Subject: [ADD] selection of existing image in image dialog

bzr revid: xmo@openerp.com-20130904113222-xync5o48nwngvtj4
---
 addons/website/static/src/xml/website.editor.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(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 4dd6a958949..927ad3df66e 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -88,15 +88,32 @@
                             Upload an image from your computer
                         </button>
                     </div>
+                    <p class="text-center">— or —</p>
+                    <div class="well">
+                        <h3 class="list-group-item-heading">Pick an existing attachment</h3>
+                        <div class="existing-attachments"/>
+                    </div>
                     <input type="hidden" name="func"/>
                 </form>
                 <div class="col-sm-4">
                     <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D"
-                         class="pull-right img-rounded"
+                         class="pull-right img-rounded image-preview"
                          width="100%"/>
                 </div>
             </div>
             <iframe src="about:blank" name="fileframe" class="hidden"/>
         </t>
     </t>
+    <t t-name="website.editor.dialog.image.existing">
+        <div class="existing-attachments">
+            <div class="row" t-foreach="rows" t-as="row">
+                <div class="col-md-4" t-foreach="row" t-as="attachment">
+                    <t t-set="url">/website/attachment/<t t-esc="attachment.id"/></t>
+                    <a t-att-href="url" class="thumbnail">
+                        <img t-att-src="url" t-att-alt="attachment.name"/>
+                    </a>
+                </div>
+            </div>
+        </div>
+    </t>
 </templates>
-- 
cgit v1.2.3