diff options
| author | Cedric Snauwaert <csn@openerp.com> | 2014-02-10 17:43:42 +0100 |
|---|---|---|
| committer | Cedric Snauwaert <csn@openerp.com> | 2014-02-10 17:43:42 +0100 |
| commit | 6bc5056f3e06fc0b24edc8e3578d512dcd8698e1 (patch) | |
| tree | 907a851c0054ce77ee772ac5ed1f46b19fb57d80 /addons/website/static/src/xml/website.editor.xml | |
| parent | 3ba9e8715a1517b9708ca4f027166166fcb1eef3 (diff) | |
| parent | 9b249181e381d837c696ee678a72748472d9f5cd (diff) | |
[MERGE]merge with latest trunk-wms
bzr revid: csn@openerp.com-20140210164342-3x81l53zy1n43mwy
Diffstat (limited to 'addons/website/static/src/xml/website.editor.xml')
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index 448c615bb07..6c1e387c958 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"> @@ -110,11 +111,15 @@ 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> |
