diff options
| author | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-08-25 16:42:57 +0200 |
|---|---|---|
| committer | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-08-25 16:42:57 +0200 |
| commit | d7f93defb899b2b48a14d679e5dffffdb4a00eff (patch) | |
| tree | f8572183b480477622917a1f504cf49a8e202f6e /addons/website/static/src/xml/website.editor.xml | |
| parent | 2b67528fe9e366829d44d8aba756bc6e359b4c61 (diff) | |
| parent | 36146b3fadc47543f4b696ab75c31b3459afb15b (diff) | |
Merge branch 'master' into master-pos-new-payment-screen-fva
Conflicts:
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
Diffstat (limited to 'addons/website/static/src/xml/website.editor.xml')
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index 0e3873b1de6..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> @@ -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='<iframe src="//www.youtube.com/embed/yws1tbgNV7k"></iframe>'/> + placeholder='<iframe src="//www.youtube.com/embed/yws1tbgNV7k"></iframe>' + t-translation="off"/> <button class="btn btn-default">Preview</button> </div> </div> |