From 57352367dc3b0ede2bb4aec05fa2fcb7c150f373 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Tue, 22 Jul 2014 23:00:58 +0200
Subject: [IMP] website: disable translations for example URLs

---
 addons/website/static/src/xml/website.editor.xml | 6 ++++--
 1 file changed, 4 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 0e3873b1de6..24d54ec017e 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -360,7 +360,8 @@
                         class="form-control url pull-left"
                         style="width: 400px;"
                         id="urlvideo"
-                        placeholder="//www.youtube.com/embed/yws1tbgNV7k"/>
+                        placeholder="//www.youtube.com/embed/yws1tbgNV7k"
+                        t-translation="off"/>
                     <button class="btn btn-default">Preview</button>
                 </div>
                 <div class="form-group btn-group">
@@ -370,7 +371,8 @@
                         class="form-control url pull-left"
                         style="width: 400px;"
                         id="embedvideo"
-                        placeholder='&lt;iframe src="//www.youtube.com/embed/yws1tbgNV7k"&gt;&lt;/iframe&gt;'/>
+                        placeholder='&lt;iframe src="//www.youtube.com/embed/yws1tbgNV7k"&gt;&lt;/iframe&gt;'
+                        t-translation="off"/>
                     <button class="btn btn-default">Preview</button>
                 </div>
             </div>
-- 
cgit v1.2.3


From 239b6bc0b5a2a644486737f2b0b71e7e6c0a2edf Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Thu, 21 Aug 2014 18:00:23 +0200
Subject: [IMP] website snippet new option, gallery

website.snippet: The methods described in javascript will be called automatically from the data-method_name = value on li snippets options. The methods are called in the order relative to children of xml (eg: <li data-method1=value1> ... <li data-method2=value2> ... </ li>, the method1 is then called method2). Methods receive two arguments: type (over, click, reset) and value. data-snippet-id-option becomes data-snippet-id. Several xml options can use the same data-snippet-id.

add a new gallery snippet

convert website_sale to the new option system
---
 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 24d54ec017e..607759cb0c2 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -203,7 +203,7 @@
                   class="form-inline">
                 <div class="well">
                     <div class="form-group pull-left">
-                        <input type="file" name="upload" accept="image/*" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
+                        <input type="file" name="upload" accept="image/*" multiple="multiple" 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>
-- 
cgit v1.2.3