diff options
| author | Darshan Kalola (OpenERP) <dka@tinyerp.com> | 2014-03-31 14:59:34 +0530 |
|---|---|---|
| committer | Darshan Kalola (OpenERP) <dka@tinyerp.com> | 2014-03-31 14:59:34 +0530 |
| commit | 0b34b27d875eeb2c3ec36e2c18ea9c665b8475be (patch) | |
| tree | ffe3420b661b896d608f1388126ab158f931829e /addons/website/static/src/xml/website.editor.xml | |
| parent | 38cdfeea45df0f65a4c85ea6fbdfc32f9a53d227 (diff) | |
| parent | fd43cecbdadcffee2be2ff078bd32a4521ad9574 (diff) | |
[MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-20140331092934-qsaib7n3m3iuuv4g
Diffstat (limited to 'addons/website/static/src/xml/website.editor.xml')
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index 6c1e387c958..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> @@ -140,8 +140,9 @@ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h3 class="modal-title">Select a Picture</h3> </div> - <div class="modal-body"> + <div class="modal-body has-error"> <div class="existing-attachments"/> + <div class="help-block"/> </div> <div class="modal-footer"> <a href="#" data-dismiss="modal" aria-hidden="true">Discard</a> @@ -157,12 +158,27 @@ <li class="next disabled"><a href="#">Next →</a></li> </ul> <div class="row mt16" t-foreach="rows" t-as="row"> - <div class="col-sm-2" t-foreach="row" t-as="attachment"> + <div class="col-sm-2 existing-attachment-cell" + t-foreach="row" t-as="attachment"> + <i class="fa fa-times existing-attachment-remove" t-att-data-id="attachment.id"/> <img t-att-src="attachment.website_url" t-att-alt="attachment.name" class="img img-responsive"/> </div> </div> </div> </t> + <t t-name="website.editor.dialog.image.existing.error"> + <div class="help-block"> + <p>The image could not be deleted because it is used in the + following pages or views:</p> + <ul t-foreach="views" t-as="view"> + <li> + <a t-attf-href="/web#model=ir.ui.view&id=#{view.id}"> + <t t-esc="view.name"/> + </a> (id <t t-esc="view.id"/>) + </li> + </ul> + </div> + </t> <t t-name="website.editor.table.panel"> <table class="editorbar-panel"> <tr t-foreach="rows"><td t-foreach="cols">​</td></tr> |