From 2569e07191422bbd3535ded11825425de4247dd1 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 3 Mar 2014 12:39:46 +0100
Subject: [IMP] website: snippet don't use snipet id

bzr revid: chm@openerp.com-20140303113946-d70yd8nmew1k3z37
---
 addons/website/static/src/xml/website.editor.xml | 2 +-
 1 file changed, 1 insertion(+), 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 6c1e387c958..8caac7c6683 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -97,7 +97,7 @@
                       target="fileframe"
                       class="col-sm-8">
                     <div class="text-center">
-                        <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
+                        <input type="file" name="upload" accept="image/*" 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>
-- 
cgit v1.2.3


From e78a3b18cc6c049a712d594ab70287c486447f0a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Mar 2014 12:07:16 +0100
Subject: [ADD] tentative removal of attachments

Attachments ought be removed only if they are not used in an existing page/web
view.

Theoretically this could be set directly in unlink(), but:
* that would make a nice error message significantly harder
* the expenses of performing a text search in all view archs would be a bit expensive

Notes:
* the views set could be reduced to only "web" views
* the search is likely sensible to false negatives e.g. different order of
  query parameters. It *will* remove images still being used.

bzr revid: xmo@openerp.com-20140304110716-u14w6uo8fbkfa42i
---
 addons/website/static/src/xml/website.editor.xml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 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 6c1e387c958..1010ec05127 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -140,8 +140,9 @@
                         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                         <h3 class="modal-title">Select a Picture</h3>
                     </div>
-                    <div class="modal-body">
+                    <div class="modal-body has-error">
                         <div class="existing-attachments"/>
+                        <div class="help-block"/>
                     </div>
                     <div class="modal-footer">
                         <a href="#" data-dismiss="modal" aria-hidden="true">Discard</a>
@@ -157,12 +158,27 @@
                 <li class="next disabled"><a href="#">Next →</a></li>
             </ul>
             <div class="row mt16" t-foreach="rows" t-as="row">
-                <div class="col-sm-2" t-foreach="row" t-as="attachment">
+                <div class="col-sm-2 existing-attachment-cell"
+                     t-foreach="row" t-as="attachment">
+                    <i class="fa fa-times existing-attachment-remove" t-att-data-id="attachment.id"/>
                     <img t-att-src="attachment.website_url" t-att-alt="attachment.name" class="img img-responsive"/>
                 </div>
             </div>
         </div>
     </t>
+    <t t-name="website.editor.dialog.image.existing.error">
+        <div class="help-block">
+            <p>The image could not be deleted because it is used in the
+               following pages or views:</p>
+            <ul t-foreach="views" t-as="view">
+                <li>
+                    <a t-attf-href="/web#model=ir.ui.view&amp;id=#{view.id}">
+                        <t t-esc="view.name"/>
+                    </a> (id <t t-esc="view.id"/>)
+                </li>
+            </ul>
+        </div>
+    </t>
     <t t-name="website.editor.table.panel">
         <table class="editorbar-panel">
             <tr t-foreach="rows"><td t-foreach="cols">&#8203;</td></tr>
-- 
cgit v1.2.3


From f9579073fe29361e677615b59f0adcc9cef6be26 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Tue, 18 Mar 2014 12:14:42 +0100
Subject: [FIX] website: color of Edit Master link for themes. CSS less
 specific

bzr revid: chm@openerp.com-20140318111442-mbrhrmtnwy3uxc5y
---
 addons/website/static/src/xml/website.editor.xml | 2 +-
 1 file changed, 1 insertion(+), 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 1010ec05127..37cdcf786b5 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -6,7 +6,7 @@
                     <button type="button" data-action="save"
                             class="btn btn-primary">Save</button>
                     or
-                    <a href="#" data-action="cancel">Discard</a>
+                    <a href="#" data-action="cancel" class="btn btn-link">Discard</a>
                 </form>
                 <ul class="nav navbar-nav pull-right">
                 </ul>
-- 
cgit v1.2.3


From aa63c564629e6f3ecb72f1d8039e353158a1754d Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Wed, 26 Mar 2014 15:16:29 +0100
Subject: [IMP] website editor: add style button on image

bzr revid: chm@openerp.com-20140326141629-diz4rk0789no7yyl
---
 addons/website/static/src/xml/website.editor.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 6edf553b7cb..617a2cf59df 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -218,10 +218,10 @@
     </t>
 
     <t t-name="website.editor.hoverbutton">
-        <button type="button" contenteditable="false"
-                t-attf-class="btn btn-primary hover-edition-button #{classes or ''}">
-            <t t-esc="label"/>
-        </button>
+        <div contentEditable="false" class="hover-edition">
+            <button type="button" t-attf-class="btn btn-primary hover-edition-button #{classes or ''}"><t t-esc="label"/></button>
+            <button t-if="styleButton" type="button" t-attf-class="btn btn-primary hover-style-button #{classes or ''}">Style</button>
+        </div>
     </t>
 
     <t t-name="website.editor.dialog.font-icons">
-- 
cgit v1.2.3


From a7dc05bf6e14fdaf2657e4c3e8c0600e663cc62f Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Wed, 26 Mar 2014 16:58:22 +0100
Subject: [WIP] website: add media editor template

bzr revid: chm@openerp.com-20140326155822-f4wascgyrm7ffeg8
---
 addons/website/static/src/xml/website.editor.xml | 175 +++++++++++++----------
 1 file changed, 103 insertions(+), 72 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 617a2cf59df..343e7070014 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -88,49 +88,83 @@
             </form>
         </t>
     </t>
-    <t t-name="website.editor.dialog.image">
-        <t t-call="website.editor.dialog">
-            <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="text-center">
-                        <input type="file" name="upload" accept="image/*" 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>
-                        <button type="button" class="btn btn-lg hidden wait" disabled="disabled"/>
-                        <p class="text-muted mt16">— or —</p>
+    <t t-name="website.editor.dialog.media">
+        <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>
+                        <!-- Nav tabs -->
+                        <ul class="nav nav-tabs">
+                            <li class="active"><a href="#editor-media-image" data-toggle="tab">Image</a></li>
+                            <li><a href="#editor-media-icon" data-toggle="tab">Pictogram</a></li>
+                            <li><a href="#editor-media-video" data-toggle="tab">Video</a></li>
+                        </ul>
                     </div>
-                    <div class="well">
-                        <a href="#existing" class="pull-right">Browse existing images</a>
-                        <h3 class="list-group-item-heading">Image URL</h3>
-                        <input type="text" class="form-control url"
-                               placeholder="http://openerp.com"/>
+                    <div class="modal-body">
+                        <!-- Tab panes -->
+                        <div class="tab-content">
+                            <div class="tab-pane fade in active" id="editor-media-image">
+                                
+                            </div>
+                            <div class="tab-pane fade" id="editor-media-icon">
+                                
+                            </div>
+                            <div class="tab-pane fade" id="editor-media-video">
+                                
+                            </div>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-primary save">Save</button>
+                        <button type="button" class="btn hidden wait" disabled="disabled"/>
+                        or
+                        <a href="#" data-dismiss="modal" aria-hidden="true">Discard</a>
                     </div>
-                    <input type="hidden" name="func"/>
-                    <div class="help-block"/>
-                </form>
-                <div class="col-sm-4 image-preview-container">
-                    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D"
-                         class="pull-right img-rounded image-preview"
-                         width="100%"/>
-                    <img src="/web/static/src/img/throbber-large.gif"
-                         class="pull-right img-rounded wait hidden"
-                         width="100%"/>
-                    <select class="form-control image-style">
-                        <option value="">No styling</option>
-                        <option value="img-rounded">Rounded corners</option>
-                        <option value="img-thumbnail">Box</option>
-                        <option value="img-circle">Circle</option>
-                        <option value="shadow">Shadow</option>
-                    </select>
                 </div>
             </div>
-            <iframe src="about:blank" name="fileframe" class="hidden"/>
-        </t>
+        </div>
+    </t>
+    <t t-name="website.editor.dialog.image">
+        <div class="row">
+            <form method="POST" action="/website/attach"
+                  enctype="multipart/form-data"
+                  target="fileframe"
+                  class="col-sm-8">
+                <div class="text-center">
+                    <input type="file" name="upload" accept="image/*" 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>
+                    <button type="button" class="btn btn-lg hidden wait" disabled="disabled"/>
+                    <p class="text-muted mt16">— or —</p>
+                </div>
+                <div class="well">
+                    <a href="#existing" class="pull-right">Browse existing images</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"/>
+                <div class="help-block"/>
+            </form>
+            <div class="col-sm-4 image-preview-container">
+                <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D"
+                     class="pull-right img-rounded image-preview"
+                     width="100%"/>
+                <img src="/web/static/src/img/throbber-large.gif"
+                     class="pull-right img-rounded wait hidden"
+                     width="100%"/>
+                <select class="form-control image-style">
+                    <option value="">No styling</option>
+                    <option value="img-rounded">Rounded corners</option>
+                    <option value="img-thumbnail">Box</option>
+                    <option value="img-circle">Circle</option>
+                    <option value="shadow">Shadow</option>
+                </select>
+            </div>
+        </div>
+        <iframe src="about:blank" name="fileframe" class="hidden"/>
     </t>
     <t t-name="website.editor.dialog.image.existing">
         <div class="modal" tabindex="-1" role="dialog" aria-hidden="true">
@@ -225,41 +259,38 @@
     </t>
 
     <t t-name="website.editor.dialog.font-icons">
-        <t t-call="website.editor.dialog">
-            <t t-set="title">Icon:</t>
-            <form>
-                <div class="form-group" id="fa-preview">
+        <form>
+            <div class="form-group" id="fa-preview">
 
+            </div>
+            <div class="form-group font-icons fa fa-search">
+                <input type="hidden" id="fa-icon" class="form-control"/>
+                <input type="hidden" id="fa-size" class="form-control"/>
+                <input type="search" class="form-control" id="icon-search"/>
+                <div class="font-icons-icons">
+                    <t t-call="website.editor.dialog.font-icons.icons">
+                        <t t-set="icons" t-value="widget.icons"/>
+                    </t>
                 </div>
-                <div class="form-group font-icons fa fa-search">
-                    <input type="hidden" id="fa-icon" class="form-control"/>
-                    <input type="hidden" id="fa-size" class="form-control"/>
-                    <input type="search" class="form-control" id="icon-search"/>
-                    <div class="font-icons-icons">
-                        <t t-call="website.editor.dialog.font-icons.icons">
-                            <t t-set="icons" t-value="widget.icons"/>
-                        </t>
-                    </div>
-                </div>
-                <div class="form-group">
-                    <label for="fa-rotation">Rotation</label>
-                    <select id="fa-rotation" class="form-control">
-                        <option value="">None</option>
-                        <option value="fa-spin">Spin</option>
-                        <option value="fa-rotate-90">Rotate 90º</option>
-                        <option value="fa-rotate-180">Rotate 180º</option>
-                        <option value="fa-rotate-270">Rotate 270º</option>
-                        <option value="fa-flip-horizontal">Horizontal flip</option>
-                        <option value="fa-flip-vertical">Vertical flip</option>
-                    </select>
-                </div>
-                <div class="form-group">
-                    <label>
-                        <input type="checkbox" id="fa-border"/> border
-                    </label>
-                </div>
-            </form>
-        </t>
+            </div>
+            <div class="form-group">
+                <label for="fa-rotation">Rotation</label>
+                <select id="fa-rotation" class="form-control">
+                    <option value="">None</option>
+                    <option value="fa-spin">Spin</option>
+                    <option value="fa-rotate-90">Rotate 90º</option>
+                    <option value="fa-rotate-180">Rotate 180º</option>
+                    <option value="fa-rotate-270">Rotate 270º</option>
+                    <option value="fa-flip-horizontal">Horizontal flip</option>
+                    <option value="fa-flip-vertical">Vertical flip</option>
+                </select>
+            </div>
+            <div class="form-group">
+                <label>
+                    <input type="checkbox" id="fa-border"/> border
+                </label>
+            </div>
+        </form>
     </t>
     <t t-name="website.editor.dialog.font-icons.icons">
         <span t-foreach="icons" t-as="icon"
-- 
cgit v1.2.3


From c15e5b5163de3310b4ffe9f486df79ecbe80e445 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 27 Mar 2014 11:51:03 +0100
Subject: [WIP] website media editor

bzr revid: chm@openerp.com-20140327105103-r4laze34bf0z62o2
---
 addons/website/static/src/xml/website.editor.xml | 37 +++++++++++++-----------
 1 file changed, 20 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 343e7070014..2f6977c990f 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -94,6 +94,7 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                        <div class="preview-container hidden"></div>
                         <!-- Nav tabs -->
                         <ul class="nav nav-tabs">
                             <li class="active"><a href="#editor-media-image" data-toggle="tab">Image</a></li>
@@ -126,17 +127,16 @@
         </div>
     </t>
     <t t-name="website.editor.dialog.image">
-        <div class="row">
+        <div>
             <form method="POST" action="/website/attach"
                   enctype="multipart/form-data"
-                  target="fileframe"
-                  class="col-sm-8">
+                  target="fileframe">
                 <div class="text-center">
                     <input type="file" name="upload" accept="image/*" 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>
-                    <button type="button" class="btn btn-lg hidden wait" disabled="disabled"/>
+                    <button type="button" class="btn btn-lg hidden wait" disabled="disabled">Uploading...</button>
                     <p class="text-muted mt16">— or —</p>
                 </div>
                 <div class="well">
@@ -148,20 +148,16 @@
                 <input type="hidden" name="func"/>
                 <div class="help-block"/>
             </form>
-            <div class="col-sm-4 image-preview-container">
-                <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D"
-                     class="pull-right img-rounded image-preview"
-                     width="100%"/>
-                <img src="/web/static/src/img/throbber-large.gif"
-                     class="pull-right img-rounded wait hidden"
-                     width="100%"/>
-                <select class="form-control image-style">
+            <div class="preview-container">
+                <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D" class="image-preview"/>
+                <img src="/web/static/src/img/throbber-large.gif" class="wait hidden"/>
+                <!--select class="form-control image-style">
                     <option value="">No styling</option>
                     <option value="img-rounded">Rounded corners</option>
                     <option value="img-thumbnail">Box</option>
                     <option value="img-circle">Circle</option>
                     <option value="shadow">Shadow</option>
-                </select>
+                </select-->
             </div>
         </div>
         <iframe src="about:blank" name="fileframe" class="hidden"/>
@@ -251,10 +247,17 @@
         </div>
     </t>
 
-    <t t-name="website.editor.hoverbutton">
-        <div contentEditable="false" class="hover-edition">
-            <button type="button" t-attf-class="btn btn-primary hover-edition-button #{classes or ''}"><t t-esc="label"/></button>
-            <button t-if="styleButton" type="button" t-attf-class="btn btn-primary hover-style-button #{classes or ''}">Style</button>
+    <t t-name="website.editor.hoverbutton.link">
+        <button contentEditable="false" type="button" class="btn btn-primary hover-edition-button btn-xs">Change</button>
+    </t>
+
+    <t t-name="website.editor.hoverbutton.image">
+        <div contentEditable="false" class="hover-edition dropdown">
+            <a class="btn btn-primary btn-sm" data-toggle="dropdown" href="#">Customize</a>
+            <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+                <li><a href="#" class="hover-edition-button">Change Media</a></li>
+                <li><a href="#" class="hover-style-button">Style</a></li>
+            </ul>
         </div>
     </t>
 
-- 
cgit v1.2.3


From c8d0175e61df8cc4abaf359b84a3453b4142cc10 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 27 Mar 2014 17:03:24 +0100
Subject: [IMP] website media editor: change template

bzr revid: chm@openerp.com-20140327160324-yb1cwpsgqymxsf83
---
 addons/website/static/src/xml/website.editor.xml | 83 +++++++++++++-----------
 1 file changed, 44 insertions(+), 39 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 2f6977c990f..f6fe37c5bd4 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -90,19 +90,34 @@
     </t>
     <t t-name="website.editor.dialog.media">
         <div class="modal" tabindex="-1" role="dialog" aria-hidden="true">
-            <div class="modal-dialog">
+            <div class="modal-dialog select-media">
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                        <div class="preview-container hidden"></div>
-                        <!-- Nav tabs -->
+                        <h3 class="modal-title">Select a Media</h3>
+                    </div>
+                    <div class="modal-body">
                         <ul class="nav nav-tabs">
                             <li class="active"><a href="#editor-media-image" data-toggle="tab">Image</a></li>
                             <li><a href="#editor-media-icon" data-toggle="tab">Pictogram</a></li>
                             <li><a href="#editor-media-video" data-toggle="tab">Video</a></li>
+                            <li style="float: right;">
+                                <ul class="pager mb0 mt0">
+                                    <li class="previous disabled"><a href="#">← Previous</a></li>
+                                    <li class="next disabled"><a href="#">Next →</a></li>
+                                </ul>
+                            </li>
+                            <li style="float: right;">
+                                <form>
+                                    <div class="form-group font-icons fa fa-search mb0">
+                                        <input type="hidden" id="fa-icon" class="form-control"/>
+                                        <input type="hidden" id="fa-size" class="form-control"/>
+                                        <input type="search" class="form-control" id="icon-search"/>
+                                    </div>
+                                </form>
+                            </li>
                         </ul>
-                    </div>
-                    <div class="modal-body">
+
                         <!-- Tab panes -->
                         <div class="tab-content">
                             <div class="tab-pane fade in active" id="editor-media-image">
@@ -128,37 +143,27 @@
     </t>
     <t t-name="website.editor.dialog.image">
         <div>
-            <form method="POST" action="/website/attach"
+            <form method="POST"
+                  action="/website/attach"
                   enctype="multipart/form-data"
-                  target="fileframe">
-                <div class="text-center">
-                    <input type="file" name="upload" accept="image/*" 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>
-                    <button type="button" class="btn btn-lg hidden wait" disabled="disabled">Uploading...</button>
-                    <p class="text-muted mt16">— or —</p>
-                </div>
+                  target="fileframe"
+                  class="form-inline">
                 <div class="well">
-                    <a href="#existing" class="pull-right">Browse existing images</a>
-                    <h3 class="list-group-item-heading">Image URL</h3>
-                    <input type="text" class="form-control url"
-                           placeholder="http://openerp.com"/>
+                    <div class="form-group">
+                        <input type="file" name="upload" accept="image/*" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
+                        <button type="button" class="btn btn-primary filepicker">Upload an image from your computer</button>
+                        <button type="button" class="btn hidden wait" disabled="disabled">Uploading...</button>
+                    </div>
+                    <span class="text-muted">— or —</span>
+                    <div class="form-group">
+                        <label for="iamgeurl">Image URL</label>
+                        <input type="text" name="url" class="form-control url" style="width: 300px;" id="iamgeurl" placeholder="http://openerp.com"/>
+                    </div>
                 </div>
                 <input type="hidden" name="func"/>
+                <div class="existing-attachments"/>
                 <div class="help-block"/>
             </form>
-            <div class="preview-container">
-                <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D" class="image-preview"/>
-                <img src="/web/static/src/img/throbber-large.gif" class="wait hidden"/>
-                <!--select class="form-control image-style">
-                    <option value="">No styling</option>
-                    <option value="img-rounded">Rounded corners</option>
-                    <option value="img-thumbnail">Box</option>
-                    <option value="img-circle">Circle</option>
-                    <option value="shadow">Shadow</option>
-                </select-->
-            </div>
         </div>
         <iframe src="about:blank" name="fileframe" class="hidden"/>
     </t>
@@ -263,18 +268,18 @@
 
     <t t-name="website.editor.dialog.font-icons">
         <form>
-            <div class="form-group" id="fa-preview">
-
-            </div>
-            <div class="form-group font-icons fa fa-search">
+            <div class="form-group hidden font-icons fa fa-search">
                 <input type="hidden" id="fa-icon" class="form-control"/>
                 <input type="hidden" id="fa-size" class="form-control"/>
                 <input type="search" class="form-control" id="icon-search"/>
-                <div class="font-icons-icons">
-                    <t t-call="website.editor.dialog.font-icons.icons">
-                        <t t-set="icons" t-value="widget.icons"/>
-                    </t>
-                </div>
+            </div>
+            <div class="font-icons-icons">
+                <t t-call="website.editor.dialog.font-icons.icons">
+                    <t t-set="icons" t-value="widget.icons"/>
+                </t>
+            </div>
+            <div class="form-group mt32" id="fa-preview">
+
             </div>
             <div class="form-group">
                 <label for="fa-rotation">Rotation</label>
-- 
cgit v1.2.3


From e289e23298fc91e675f0a7686d3a769ff53663fb Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Thu, 27 Mar 2014 18:14:17 +0100
Subject: [WIP] website media editor

bzr revid: chm@openerp.com-20140327171417-nz2cd8tn2dmmljge
---
 addons/website/static/src/xml/website.editor.xml | 39 ++++++++----------------
 1 file changed, 13 insertions(+), 26 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 f6fe37c5bd4..607e603e724 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -108,10 +108,8 @@
                                 </ul>
                             </li>
                             <li style="float: right;">
-                                <form>
+                                <form action="#">
                                     <div class="form-group font-icons fa fa-search mb0">
-                                        <input type="hidden" id="fa-icon" class="form-control"/>
-                                        <input type="hidden" id="fa-size" class="form-control"/>
                                         <input type="search" class="form-control" id="icon-search"/>
                                     </div>
                                 </form>
@@ -256,23 +254,29 @@
         <button contentEditable="false" type="button" class="btn btn-primary hover-edition-button btn-xs">Change</button>
     </t>
 
-    <t t-name="website.editor.hoverbutton.image">
+    <t t-name="website.editor.hoverbutton.media">
         <div contentEditable="false" class="hover-edition dropdown">
             <a class="btn btn-primary btn-sm" data-toggle="dropdown" href="#">Customize</a>
             <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
                 <li><a href="#" class="hover-edition-button">Change Media</a></li>
                 <li><a href="#" class="hover-style-button">Style</a></li>
+                <li class="dropdown-submenu">
+                    <a href="#" tabindex="-1">Rotation</a>
+                    <ul class="dropdown-menu">
+                        <li data-value="fa-spin"><a>Spin</a></li>
+                        <li data-value="fa-flip-horizontal"><a>Horizontal flip</a></li>
+                        <li data-value="fa-flip-vertical"><a>Vertical flip</a></li>
+                    </ul>
+                </li>
+                <li><a href="#" data-value="fa-border">border</a></li>
             </ul>
         </div>
     </t>
 
     <t t-name="website.editor.dialog.font-icons">
         <form>
-            <div class="form-group hidden font-icons fa fa-search">
-                <input type="hidden" id="fa-icon" class="form-control"/>
-                <input type="hidden" id="fa-size" class="form-control"/>
-                <input type="search" class="form-control" id="icon-search"/>
-            </div>
+            <input type="hidden" id="fa-icon" class="form-control"/>
+            <input type="hidden" id="fa-size" class="form-control"/>
             <div class="font-icons-icons">
                 <t t-call="website.editor.dialog.font-icons.icons">
                     <t t-set="icons" t-value="widget.icons"/>
@@ -281,23 +285,6 @@
             <div class="form-group mt32" id="fa-preview">
 
             </div>
-            <div class="form-group">
-                <label for="fa-rotation">Rotation</label>
-                <select id="fa-rotation" class="form-control">
-                    <option value="">None</option>
-                    <option value="fa-spin">Spin</option>
-                    <option value="fa-rotate-90">Rotate 90º</option>
-                    <option value="fa-rotate-180">Rotate 180º</option>
-                    <option value="fa-rotate-270">Rotate 270º</option>
-                    <option value="fa-flip-horizontal">Horizontal flip</option>
-                    <option value="fa-flip-vertical">Vertical flip</option>
-                </select>
-            </div>
-            <div class="form-group">
-                <label>
-                    <input type="checkbox" id="fa-border"/> border
-                </label>
-            </div>
         </form>
     </t>
     <t t-name="website.editor.dialog.font-icons.icons">
-- 
cgit v1.2.3


From b0625b1191eaf24a191b8937327809bc0ca0e7d4 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 28 Mar 2014 11:44:53 +0100
Subject: [IMP] website: add video media editor

bzr revid: chm@openerp.com-20140328104453-2faynhhc1wi5598l
---
 addons/website/static/src/xml/website.editor.xml | 48 +++++++++++++++++++++---
 1 file changed, 43 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 607e603e724..b703ab633ee 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -101,13 +101,13 @@
                             <li class="active"><a href="#editor-media-image" data-toggle="tab">Image</a></li>
                             <li><a href="#editor-media-icon" data-toggle="tab">Pictogram</a></li>
                             <li><a href="#editor-media-video" data-toggle="tab">Video</a></li>
-                            <li style="float: right;">
+                            <li class="search" style="float: right;">
                                 <ul class="pager mb0 mt0">
                                     <li class="previous disabled"><a href="#">← Previous</a></li>
                                     <li class="next disabled"><a href="#">Next →</a></li>
                                 </ul>
                             </li>
-                            <li style="float: right;">
+                            <li class="search" style="float: right;">
                                 <form action="#">
                                     <div class="form-group font-icons fa fa-search mb0">
                                         <input type="search" class="form-control" id="icon-search"/>
@@ -274,9 +274,9 @@
     </t>
 
     <t t-name="website.editor.dialog.font-icons">
-        <form>
-            <input type="hidden" id="fa-icon" class="form-control"/>
-            <input type="hidden" id="fa-size" class="form-control"/>
+        <form action="#">
+            <input type="hidden" id="fa-icon"/>
+            <input type="hidden" id="fa-size"/>
             <div class="font-icons-icons">
                 <t t-call="website.editor.dialog.font-icons.icons">
                     <t t-set="icons" t-value="widget.icons"/>
@@ -295,4 +295,42 @@
         </span>
     </t>
 
+    <t t-name="website.editor.dialog.video">
+        <form action="#" class="form-inline">
+            <div class="well">
+                <div class="form-group">
+                    <label for="urlvideo">Viedo URL</label>
+                    <input type="text"
+                        name="url"
+                        class="form-control url"
+                        style="width: 400px;"
+                        id="urlvideo"
+                        placeholder="http://openerp.com"
+                        value="//www.youtube.com/embed/yws1tbgNV7k"/>
+                    <span class="text-muted">
+                        Youtube, Vimeo, Dailymotion
+                    </span>
+                </div>
+            </div>
+            
+            <div id="video-preview" style="width: 450px; margin: 0 auto;">
+                <div class="media_iframe_video">
+                    <iframe
+                        src="//www.youtube.com/embed/yws1tbgNV7k"
+                        frameborder="0"
+                        allowfullscreen="allowfullscreen"></iframe>
+                </div>
+            </div>
+
+            <input type="hidden" id="video_id" value="yws1tbgNV7k"/>
+            <input type="hidden" id="video_type" value="youtube"/>
+
+            <div class="text-center mt32">
+                <div class="checkbox">
+                    <label><input type="checkbox" id="autoplay"/> Autoplay</label>
+                </div>
+            </div>
+        </form>
+    </t>
+
 </templates>
-- 
cgit v1.2.3


From 31269ba52fafb2238b027b3c42e81acbaacfd9d4 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Fri, 28 Mar 2014 15:16:19 +0100
Subject: [IMP] website: media editor doubleclick for video and begin to use
 snippet builder

bzr revid: chm@openerp.com-20140328141619-x9okgixai2v5dekr
---
 addons/website/static/src/xml/website.editor.xml | 2 +-
 1 file changed, 1 insertion(+), 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 b703ab633ee..89b184a2c4e 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -299,7 +299,7 @@
         <form action="#" class="form-inline">
             <div class="well">
                 <div class="form-group">
-                    <label for="urlvideo">Viedo URL</label>
+                    <label for="urlvideo">Video URL</label>
                     <input type="text"
                         name="url"
                         class="form-control url"
-- 
cgit v1.2.3


From 655142b04b32d48d29540552a7ebd9f20ef38856 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 31 Mar 2014 14:09:06 +0200
Subject: [IMP] website: media editor: add search result for images

bzr revid: chm@openerp.com-20140331120906-0qqa40xbvek27z4j
---
 addons/website/static/src/xml/website.editor.xml | 2 +-
 1 file changed, 1 insertion(+), 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 89b184a2c4e..8e6f9766ecf 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -194,7 +194,7 @@
                 <div class="col-sm-2 existing-attachment-cell"
                      t-foreach="row" t-as="attachment">
                     <i class="fa fa-times existing-attachment-remove" t-att-data-id="attachment.id"/>
-                    <img t-att-src="attachment.website_url" t-att-alt="attachment.name" class="img img-responsive"/>
+                    <img t-att-src="attachment.website_url" t-att-alt="attachment.name" t-att-title="attachment.name" class="img img-responsive"/>
                 </div>
             </div>
         </div>
-- 
cgit v1.2.3


From 583a47b7b9bf51acb36bea3600f3745668e0dd57 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 31 Mar 2014 15:55:58 +0200
Subject: [IMP] website: media editor: add embed video

bzr revid: chm@openerp.com-20140331135558-ulr1nzhwwvcnwswm
---
 addons/website/static/src/xml/website.editor.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 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 8e6f9766ecf..ca8a264ae6f 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -299,7 +299,7 @@
         <form action="#" class="form-inline">
             <div class="well">
                 <div class="form-group">
-                    <label for="urlvideo">Video URL</label>
+                    <label for="urlvideo" style="width: 200px;">Video URL</label>
                     <input type="text"
                         name="url"
                         class="form-control url"
@@ -308,9 +308,18 @@
                         placeholder="http://openerp.com"
                         value="//www.youtube.com/embed/yws1tbgNV7k"/>
                     <span class="text-muted">
-                        Youtube, Vimeo, Dailymotion
+                        (Youtube, Vimeo, Dailymotion)
                     </span>
                 </div>
+                <div class="form-group">
+                    <label for="urlvideo" style="width: 200px;">Html Embed Video</label>
+                    <input type="text"
+                        name="embed"
+                        class="form-control url"
+                        style="width: 400px;"
+                        id="embedvideo"
+                        placeholder='&lt;iframe src="//www.youtube.com/embed/yws1tbgNV7k"&gt;&lt;/iframe&gt;'/>
+                </div>
             </div>
             
             <div id="video-preview" style="width: 450px; margin: 0 auto;">
-- 
cgit v1.2.3


From ee4b8795361b693d209817d85004b715bdd24d52 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 7 Apr 2014 09:49:22 +0200
Subject: [IMP] website: media editor: insert add button for image loader and
 fix try_remove don't remove image

bzr revid: chm@openerp.com-20140407074922-zri6j4u9sw52nkkw
---
 addons/website/static/src/xml/website.editor.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 ca8a264ae6f..0f57dea33fe 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -153,14 +153,15 @@
                         <button type="button" class="btn hidden wait" disabled="disabled">Uploading...</button>
                     </div>
                     <span class="text-muted">— or —</span>
-                    <div class="form-group">
-                        <label for="iamgeurl">Image URL</label>
-                        <input type="text" name="url" class="form-control url" style="width: 300px;" id="iamgeurl" placeholder="http://openerp.com"/>
+                    <label for="iamgeurl">Image URL</label>
+                    <div class="form-group btn-group">
+                        <input type="text" name="url" class="form-control url" style="width: 320px; float: left;" id="iamgeurl" placeholder="http://openerp.com"/>
+                        <button class="btn btn-primary" type="submit">Add</button>
                     </div>
                 </div>
                 <input type="hidden" name="func"/>
-                <div class="existing-attachments"/>
                 <div class="help-block"/>
+                <div class="existing-attachments"/>
             </form>
         </div>
         <iframe src="about:blank" name="fileframe" class="hidden"/>
-- 
cgit v1.2.3


From 2f7950f19f6b6db9d3ab8a274cb2023f9f9960cb Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 7 Apr 2014 10:11:59 +0200
Subject: [IMP] website: media editor: insert add button for video loader

bzr revid: chm@openerp.com-20140407081159-434frpfqhe1zqrc0
---
 addons/website/static/src/xml/website.editor.xml | 18 +++++++++---------
 1 file changed, 9 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 0f57dea33fe..b8d8739f28d 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -299,27 +299,27 @@
     <t t-name="website.editor.dialog.video">
         <form action="#" class="form-inline">
             <div class="well">
-                <div class="form-group">
-                    <label for="urlvideo" style="width: 200px;">Video URL</label>
+                <div class="form-group btn-group">
+                    <span class="text-muted pull-right" style="margin-left:10px; line-height: 2em;">(Youtube, Vimeo, Dailymotion)</span>
+                    <label for="urlvideo" style="width: 180px; line-height: 2em;" class="pull-left">Video URL</label>
                     <input type="text"
                         name="url"
-                        class="form-control url"
+                        class="form-control url pull-left"
                         style="width: 400px;"
                         id="urlvideo"
                         placeholder="http://openerp.com"
                         value="//www.youtube.com/embed/yws1tbgNV7k"/>
-                    <span class="text-muted">
-                        (Youtube, Vimeo, Dailymotion)
-                    </span>
+                    <button class="btn btn-primary">Add</button>
                 </div>
-                <div class="form-group">
-                    <label for="urlvideo" style="width: 200px;">Html Embed Video</label>
+                <div class="form-group btn-group">
+                    <label for="urlvideo" style="width: 180px; line-height: 2em;" class="pull-left">Html Embed Video</label>
                     <input type="text"
                         name="embed"
-                        class="form-control url"
+                        class="form-control url pull-left"
                         style="width: 400px;"
                         id="embedvideo"
                         placeholder='&lt;iframe src="//www.youtube.com/embed/yws1tbgNV7k"&gt;&lt;/iframe&gt;'/>
+                    <button class="btn btn-primary">Add</button>
                 </div>
             </div>
             
-- 
cgit v1.2.3


From c7a16d134b5cdc418ccba7110dd3dbcefed39424 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 7 Apr 2014 12:24:19 +0200
Subject: [FIX] website: media editor, editor position

bzr revid: chm@openerp.com-20140407102419-u5lrqefulj7c8ta0
---
 addons/website/static/src/xml/website.editor.xml | 6 +++---
 1 file changed, 3 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 b8d8739f28d..b3012e5aa78 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -153,7 +153,7 @@
                         <button type="button" class="btn hidden wait" disabled="disabled">Uploading...</button>
                     </div>
                     <span class="text-muted">— or —</span>
-                    <label for="iamgeurl">Image URL</label>
+                    <label for="iamgeurl">Set an image URL</label>
                     <div class="form-group btn-group">
                         <input type="text" name="url" class="form-control url" style="width: 320px; float: left;" id="iamgeurl" placeholder="http://openerp.com"/>
                         <button class="btn btn-primary" type="submit">Add</button>
@@ -301,7 +301,7 @@
             <div class="well">
                 <div class="form-group btn-group">
                     <span class="text-muted pull-right" style="margin-left:10px; line-height: 2em;">(Youtube, Vimeo, Dailymotion)</span>
-                    <label for="urlvideo" style="width: 180px; line-height: 2em;" class="pull-left">Video URL</label>
+                    <label for="urlvideo" style="width: 180px; line-height: 2em;" class="pull-left">Set a video URL</label>
                     <input type="text"
                         name="url"
                         class="form-control url pull-left"
@@ -312,7 +312,7 @@
                     <button class="btn btn-primary">Add</button>
                 </div>
                 <div class="form-group btn-group">
-                    <label for="urlvideo" style="width: 180px; line-height: 2em;" class="pull-left">Html Embed Video</label>
+                    <label for="urlvideo" style="width: 180px; line-height: 2em;" class="pull-left"><span class="text-muted">— or —</span> Embed Video (HTML)</label>
                     <input type="text"
                         name="embed"
                         class="form-control url pull-left"
-- 
cgit v1.2.3


From 153e31d754fa254613c3da9da90b66eea9bb7aaa Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Mon, 7 Apr 2014 16:49:14 +0200
Subject: [FIX] website: media editor: add image with topbar

bzr revid: chm@openerp.com-20140407144914-50wblp9teywr8wk2
---
 addons/website/static/src/xml/website.editor.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 b3012e5aa78..f0602691515 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -301,7 +301,7 @@
             <div class="well">
                 <div class="form-group btn-group">
                     <span class="text-muted pull-right" style="margin-left:10px; line-height: 2em;">(Youtube, Vimeo, Dailymotion)</span>
-                    <label for="urlvideo" style="width: 180px; line-height: 2em;" class="pull-left">Set a video URL</label>
+                    <label for="urlvideo" style="width: 220px; line-height: 2em;" class="pull-left">Set a video URL</label>
                     <input type="text"
                         name="url"
                         class="form-control url pull-left"
@@ -312,7 +312,7 @@
                     <button class="btn btn-primary">Add</button>
                 </div>
                 <div class="form-group btn-group">
-                    <label for="urlvideo" style="width: 180px; line-height: 2em;" class="pull-left"><span class="text-muted">— or —</span> Embed Video (HTML)</label>
+                    <label for="urlvideo" style="width: 220px; line-height: 2em;" class="pull-left"><span class="text-muted">— or —</span> Embed Video (HTML)</label>
                     <input type="text"
                         name="embed"
                         class="form-control url pull-left"
-- 
cgit v1.2.3


From df9225295208a30fb994f81215cf8e8fecc5c760 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Tue, 8 Apr 2014 10:42:37 +0200
Subject: [FIX] website media editor: next previous

bzr revid: chm@openerp.com-20140408084237-y8yh8cb1gsv94gbo
---
 addons/website/static/src/xml/website.editor.xml | 4 ----
 1 file changed, 4 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 f0602691515..99ffe3f6820 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -187,10 +187,6 @@
     </t>
     <t t-name="website.editor.dialog.image.existing.content">
         <div class="existing-attachments">
-            <ul class="pager">
-                <li class="previous disabled"><a href="#">← Previous</a></li>
-                <li class="next disabled"><a href="#">Next →</a></li>
-            </ul>
             <div class="row mt16" t-foreach="rows" t-as="row">
                 <div class="col-sm-2 existing-attachment-cell"
                      t-foreach="row" t-as="attachment">
-- 
cgit v1.2.3


From d15ba59a23384bcebbbcf3c369a4fb6b287e7a23 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Tue, 8 Apr 2014 11:36:48 +0200
Subject: [IMP] website: media editor: placeholder and preview

bzr revid: chm@openerp.com-20140408093648-zcx3nj5k068ejrb4
---
 addons/website/static/src/xml/website.editor.xml | 26 ++++++++++++------------
 1 file changed, 13 insertions(+), 13 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 99ffe3f6820..0fcbc585ae5 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -147,17 +147,18 @@
                   target="fileframe"
                   class="form-inline">
                 <div class="well">
+                    <div class="pull-right">
+                        <label for="iamgeurl">Image URL</label>
+                        <div class="form-group btn-group">
+                            <input type="text" name="url" class="form-control url pull-left" style="width: 320px;" id="iamgeurl" placeholder="http://openerp.com/logo.png"/>
+                            <button class="btn btn-default" type="submit">Add</button>
+                        </div>
+                    </div>
                     <div class="form-group">
                         <input type="file" name="upload" accept="image/*" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
                         <button type="button" class="btn btn-primary filepicker">Upload an image from your computer</button>
                         <button type="button" class="btn hidden wait" disabled="disabled">Uploading...</button>
                     </div>
-                    <span class="text-muted">— or —</span>
-                    <label for="iamgeurl">Set an image URL</label>
-                    <div class="form-group btn-group">
-                        <input type="text" name="url" class="form-control url" style="width: 320px; float: left;" id="iamgeurl" placeholder="http://openerp.com"/>
-                        <button class="btn btn-primary" type="submit">Add</button>
-                    </div>
                 </div>
                 <input type="hidden" name="func"/>
                 <div class="help-block"/>
@@ -303,9 +304,8 @@
                         class="form-control url pull-left"
                         style="width: 400px;"
                         id="urlvideo"
-                        placeholder="http://openerp.com"
-                        value="//www.youtube.com/embed/yws1tbgNV7k"/>
-                    <button class="btn btn-primary">Add</button>
+                        placeholder="//www.youtube.com/embed/yws1tbgNV7k"/>
+                    <button class="btn btn-default">Preview</button>
                 </div>
                 <div class="form-group btn-group">
                     <label for="urlvideo" style="width: 220px; line-height: 2em;" class="pull-left"><span class="text-muted">— or —</span> Embed Video (HTML)</label>
@@ -315,21 +315,21 @@
                         style="width: 400px;"
                         id="embedvideo"
                         placeholder='&lt;iframe src="//www.youtube.com/embed/yws1tbgNV7k"&gt;&lt;/iframe&gt;'/>
-                    <button class="btn btn-primary">Add</button>
+                    <button class="btn btn-default">Preview</button>
                 </div>
             </div>
             
             <div id="video-preview" style="width: 450px; margin: 0 auto;">
                 <div class="media_iframe_video">
                     <iframe
-                        src="//www.youtube.com/embed/yws1tbgNV7k"
+                        src=""
                         frameborder="0"
                         allowfullscreen="allowfullscreen"></iframe>
                 </div>
             </div>
 
-            <input type="hidden" id="video_id" value="yws1tbgNV7k"/>
-            <input type="hidden" id="video_type" value="youtube"/>
+            <input type="hidden" id="video_id" value=""/>
+            <input type="hidden" id="video_type" value=""/>
 
             <div class="text-center mt32">
                 <div class="checkbox">
-- 
cgit v1.2.3


From 81f2c983e5e901a7c832b7213595f1bd6443a347 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Tue, 8 Apr 2014 11:47:03 +0200
Subject: [IMP] website: media editor: change button on keyup

bzr revid: chm@openerp.com-20140408094703-7qayghtm88qku3jz
---
 addons/website/static/src/xml/website.editor.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 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 0fcbc585ae5..879da3011f6 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -147,18 +147,19 @@
                   target="fileframe"
                   class="form-inline">
                 <div class="well">
-                    <div class="pull-right">
-                        <label for="iamgeurl">Image URL</label>
+                    <div class="form-group pull-left">
+                        <input type="file" name="upload" accept="image/*" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
+                        <button type="button" class="btn btn-primary filepicker">Upload an image from your computer</button>
+                        <button type="button" class="btn hidden wait" disabled="disabled">Uploading...</button>
+                    </div>
+                    <div>
+                        <span class="text-muted"> — or — </span>
+                        <label for="iamgeurl">Add an image URL</label>
                         <div class="form-group btn-group">
                             <input type="text" name="url" class="form-control url pull-left" style="width: 320px;" id="iamgeurl" placeholder="http://openerp.com/logo.png"/>
                             <button class="btn btn-default" type="submit">Add</button>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <input type="file" name="upload" accept="image/*" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
-                        <button type="button" class="btn btn-primary filepicker">Upload an image from your computer</button>
-                        <button type="button" class="btn hidden wait" disabled="disabled">Uploading...</button>
-                    </div>
                 </div>
                 <input type="hidden" name="func"/>
                 <div class="help-block"/>
-- 
cgit v1.2.3


From 7a905238f299816543ea99d7881f7da5d16eec85 Mon Sep 17 00:00:00 2001
From: "chm@openerp.com" <>
Date: Tue, 8 Apr 2014 11:53:43 +0200
Subject: [IMP] website: media editor: don't display id in error message

bzr revid: chm@openerp.com-20140408095343-bg9348ieabf3ayp8
---
 addons/website/static/src/xml/website.editor.xml | 2 +-
 1 file changed, 1 insertion(+), 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 879da3011f6..669d5f42e2f 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -206,7 +206,7 @@
                 <li>
                     <a t-attf-href="/web#model=ir.ui.view&amp;id=#{view.id}">
                         <t t-esc="view.name"/>
-                    </a> (id <t t-esc="view.id"/>)
+                    </a>
                 </li>
             </ul>
         </div>
-- 
cgit v1.2.3