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