diff options
| author | Yogesh Parekh (OpenERP) <ypa@tinyerp.com> | 2014-03-31 15:23:10 +0530 |
|---|---|---|
| committer | Yogesh Parekh (OpenERP) <ypa@tinyerp.com> | 2014-03-31 15:23:10 +0530 |
| commit | 9aadda1e1eca6f903ea2e54e94ef32e9b627198b (patch) | |
| tree | 097804665c8a0eec369777ee949540183089ae7a /addons/website/static/src/xml/website.editor.xml | |
| parent | c4424b597d3d062764574502e9b400ab812d4caf (diff) | |
| parent | fd43cecbdadcffee2be2ff078bd32a4521ad9574 (diff) | |
[MERGE]: Merge with addons branch
bzr revid: ypa@tinyerp.com-20140331095310-wkmxt02x6l85zho0
Diffstat (limited to 'addons/website/static/src/xml/website.editor.xml')
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index 1010ec05127..6edf553b7cb 100644 --- a/addons/website/static/src/xml/website.editor.xml +++ b/addons/website/static/src/xml/website.editor.xml @@ -6,7 +6,7 @@ <button type="button" data-action="save" class="btn btn-primary">Save</button> or - <a href="#" data-action="cancel">Discard</a> + <a href="#" data-action="cancel" class="btn btn-link">Discard</a> </form> <ul class="nav navbar-nav pull-right"> </ul> @@ -97,7 +97,7 @@ target="fileframe" class="col-sm-8"> <div class="text-center"> - <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/> + <input type="file" name="upload" accept="image/*" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/> <button type="button" class="btn btn-primary btn-lg filepicker"> Upload an image from your computer </button> |