diff options
| author | Christophe Matthieu <chm@openerp.com> | 2014-02-21 10:43:43 +0100 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2014-02-21 10:43:43 +0100 |
| commit | bfeb2b963151c36544bc884175be4ef5e97334ec (patch) | |
| tree | bfba526303cb90aca4806a9a24a067852b8344b2 /addons/website/static/src/xml | |
| parent | ff37d0ebcaed01b628be188c4b0a29810765d18c (diff) | |
| parent | d24b67ed3ec568e3eb5b4296519e28a2721314b2 (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20140221094343-s1oh3iq07zi2jo0x
Diffstat (limited to 'addons/website/static/src/xml')
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 5 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.seo.xml | 2 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.tour.xml | 2 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.xml | 2 |
4 files changed, 8 insertions, 3 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> diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml index 0c055487dd8..a38d423662f 100644 --- a/addons/website/static/src/xml/website.seo.xml +++ b/addons/website/static/src/xml/website.seo.xml @@ -18,7 +18,7 @@ <div class="form-horizontal" role="form"> <div class="form-group"> <label for="seo_page_keywords" class="col-lg-2 control-label">Add keyword:</label> - <div class="col-lg-4"> + <div class="col-lg-3 col-sm-4"> <div class="input-group"> <input type="text" name="seo_page_keywords" class="form-control" maxlength="30"/> <span class="input-group-btn"> diff --git a/addons/website/static/src/xml/website.tour.xml b/addons/website/static/src/xml/website.tour.xml index 1365ba08307..dcecef021bb 100644 --- a/addons/website/static/src/xml/website.tour.xml +++ b/addons/website/static/src/xml/website.tour.xml @@ -22,6 +22,6 @@ </div> </t> <t t-name="website.tour_popover_title"> - <t t-esc="title"/><button title="Close Tutorial" type="button" class="close" data-role="end">×</button> + <t t-esc="title"/><button title="End This Tutorial" type="button" class="close" data-role="end">×</button> </t> </templates> diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml index 5890350e2dc..f25a491a106 100644 --- a/addons/website/static/src/xml/website.xml +++ b/addons/website/static/src/xml/website.xml @@ -102,7 +102,7 @@ <h3 class="modal-title"><t t-esc="window_title"/></h3> </div> <div class="modal-body"> - <form class="form-horizontal" role="form"> + <form class="form-horizontal" role="form" t-att-id="id"> <div class="form-group mb0"> <label for="page-name" class="col-sm-3 control-label"> <t t-esc="field_name"/>: |