diff options
| author | Fabien Meghazi <fme@openerp.com> | 2014-02-10 14:47:35 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2014-02-10 14:47:35 +0100 |
| commit | de7c5f76bd48fe3929e393e19091e130411740c8 (patch) | |
| tree | 5eaa45c3b6ec530f34d7b3d585c5ac9af1668c68 /addons/website/static/src/xml/website.editor.xml | |
| parent | 3bdc08a2c220dfe1f339ecb296a0e37b0740c44c (diff) | |
| parent | d8c5a1c4c2a5f3a7f11c66fdbc624485e6485489 (diff) | |
[MERGE] upstream
bzr revid: fme@openerp.com-20140210134735-59csf1137d6v10ev
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> |