diff options
| author | Antony Lesuisse <al@openerp.com> | 2014-02-09 15:03:15 +0100 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2014-02-09 15:03:15 +0100 |
| commit | 87172d90d25c278a4b42db0b90a759d83b29f6cd (patch) | |
| tree | f6c50386fb126d6faf7cad694dc3ec804eb97acc /addons/website/static/src/xml/website.editor.xml | |
| parent | e8aa9751b2154e72a7ed55c027543082c39bf728 (diff) | |
| parent | a3710efdb13d108887bdb9655f77fbab7742b48c (diff) | |
[MERGE] saas-3
bzr revid: al@openerp.com-20140209140315-ukqlf90ngy6ycu2k
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> |