From e2676729b0e5b0a58e0d19b109deaf8e1983f791 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 13 Sep 2013 12:47:39 +0200
Subject: [REM] listing of existing attachments in base dialog

bzr revid: xmo@openerp.com-20130913104739-ma8kc0dum1ikvikd
---
 addons/website/static/src/xml/website.editor.xml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 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 fabf2185f2a..03d0cd19849 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -95,23 +95,18 @@
                       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>
+                        <p class="">— or —</p>
                     </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"/>
+                        <!-- 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>
                     <input type="hidden" name="func"/>
                 </form>
-- 
cgit v1.2.3


From f16b61cbe61a77cf331a54ea11520322e7730739 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 13 Sep 2013 13:41:43 +0200
Subject: [ADD] separate attachment dialog selector

bzr revid: xmo@openerp.com-20130913114143-v799fvf08rpiox3r
---
 addons/website/static/src/xml/website.editor.xml | 10 +++++++++-
 1 file changed, 9 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 03d0cd19849..98a5af1c184 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -103,7 +103,7 @@
                         <p class="">— or —</p>
                     </div>
                     <div class="well">
-                        <!-- a href="#" class="pull-left">Find image</a -->
+                        <a href="#existing" class="pull-right">Browse your images</a>
                         <h3 class="list-group-item-heading">Image URL</h3>
                         <input type="text" class="form-control url"
                                placeholder="http://openerp.com"/>
@@ -120,6 +120,14 @@
         </t>
     </t>
     <t t-name="website.editor.dialog.image.existing">
+        <t t-call="website.editor.dialog">
+            <t t-set="title">Pick an existing attachment:</t>
+            <div class="well">
+                <div class="existing-attachments"/>
+            </div>
+        </t>
+    </t>
+    <t t-name="website.editor.dialog.image.existing.content">
         <div class="existing-attachments">
             <div class="row" t-foreach="rows" t-as="row">
                 <div class="col-md-4" t-foreach="row" t-as="attachment">
-- 
cgit v1.2.3


From 243a9c559b7c603ee1cffb9a186401771e35c871 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 13 Sep 2013 17:13:16 +0200
Subject: [ADD] paginated images

bzr revid: xmo@openerp.com-20130913151316-rzr3rcg1w7h3gw10
---
 addons/website/static/src/xml/website.editor.xml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 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 98a5af1c184..ff95dc2fb65 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -122,19 +122,23 @@
     <t t-name="website.editor.dialog.image.existing">
         <t t-call="website.editor.dialog">
             <t t-set="title">Pick an existing attachment:</t>
-            <div class="well">
-                <div class="existing-attachments"/>
-            </div>
+            <div class="existing-attachments"/>
         </t>
     </t>
     <t t-name="website.editor.dialog.image.existing.content">
         <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>
+            <ul class="pager">
+                <li class="previous disabled"><a href="#">← Previous</a></li>
+                <li class="next disabled"><a href="#">Next →</a></li>
+            </ul>
+            <div class="well">
+                <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>
         </div>
-- 
cgit v1.2.3