From 7c12d5d200141907e5f3b7492e958c3c8c83b6f5 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 3 Feb 2014 17:03:31 +0100
Subject: [IMP] clearer indication that images are being up/downloaded

bzr revid: xmo@openerp.com-20140203160331-04h1erlunelb9kkn
---
 addons/website/static/src/xml/website.editor.xml | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 448c615bb07..1a860ec5f77 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -101,6 +101,7 @@
                         <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">
@@ -115,6 +116,9 @@
                     <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>
-- 
cgit v1.2.3


From 7d1f7ee10a6a71df6e031547a31dc24bd4494e24 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 4 Feb 2014 17:58:23 +0100
Subject: [IMP] handling of overly large images in website image upload

bzr revid: xmo@openerp.com-20140204165823-q05aoq83q28b2hhg
---
 addons/website/static/src/xml/website.editor.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 1a860ec5f77..6c1e387c958 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -111,6 +111,7 @@
                                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"
-- 
cgit v1.2.3


From 14b4efcd281b33a29d280974148b5f2fa02e303e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 6 Feb 2014 15:52:36 +0100
Subject: [FIX] tour and translate title

bzr revid: chm@openerp.com-20140206145236-vwdq74yyz21qvyzu
---
 addons/website/static/src/xml/website.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 5890350e2dc..f25a491a106 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -102,7 +102,7 @@
                         <h3 class="modal-title"><t t-esc="window_title"/></h3>
                     </div>
                     <div class="modal-body">
-                        <form class="form-horizontal" role="form">
+                        <form class="form-horizontal" role="form" t-att-id="id">
                         <div class="form-group mb0">
                             <label for="page-name" class="col-sm-3 control-label">
                                 <t t-esc="field_name"/>:
-- 
cgit v1.2.3


From 92567bc102731afb7ed1a8d8bcc368a1514ad5d8 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 8 Feb 2014 11:15:53 +0100
Subject: [IMP] small useability trick to avoid people writing several keywords
 in the same input

bzr revid: fp@tinyerp.com-20140208101553-i6l27e6hpy0d0h3n
---
 addons/website/static/src/xml/website.seo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index 0c055487dd8..a38d423662f 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -18,7 +18,7 @@
                             <div class="form-horizontal" role="form">
                                 <div class="form-group">
                                     <label for="seo_page_keywords" class="col-lg-2 control-label">Add keyword:</label>
-                                    <div class="col-lg-4">
+                                    <div class="col-lg-3 col-sm-4">
                                         <div class="input-group">
                                           <input type="text" name="seo_page_keywords" class="form-control" maxlength="30"/>
                                           <span class="input-group-btn">
-- 
cgit v1.2.3


From 3a273b989cf403d4c35f03f7032fcb5b5a5239db Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 10 Feb 2014 16:17:41 +0100
Subject: [IMP] website: typo for tutorial

bzr revid: chm@openerp.com-20140210151741-grf5wsvjonuihxw0
---
 addons/website/static/src/xml/website.tour.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/website/static/src/xml/website.tour.xml b/addons/website/static/src/xml/website.tour.xml
index 1365ba08307..dcecef021bb 100644
--- a/addons/website/static/src/xml/website.tour.xml
+++ b/addons/website/static/src/xml/website.tour.xml
@@ -22,6 +22,6 @@
         </div>
     </t>
     <t t-name="website.tour_popover_title">
-        <t t-esc="title"/><button title="Close Tutorial" type="button" class="close" data-role="end">×</button>
+        <t t-esc="title"/><button title="End This Tutorial" type="button" class="close" data-role="end">×</button>
     </t>
 </templates>
-- 
cgit v1.2.3