diff options
| author | Amit Vora <avo@tinyerp.com> | 2014-03-13 18:18:45 +0530 |
|---|---|---|
| committer | Amit Vora <avo@tinyerp.com> | 2014-03-13 18:18:45 +0530 |
| commit | 2a50034bfcb897445161c142d7c8e387b18a4ea2 (patch) | |
| tree | 8ac42c08b4d9e3e13819f0591db5c2e942063f3e /addons/website/static/src/xml | |
| parent | 2a732812817755cec4a11da05e0b52fcf142f1a7 (diff) | |
| parent | b92001f1d8759d6695ab2e2b19d8a41d2e859b6c (diff) | |
[MERGE] merge with main branch
bzr revid: avo@tinyerp.com-20140313124845-p248ahqot4v2x74q
Diffstat (limited to 'addons/website/static/src/xml')
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 20 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.snippets.xml | 10 |
2 files changed, 23 insertions, 7 deletions
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index 6c1e387c958..1010ec05127 100644 --- a/addons/website/static/src/xml/website.editor.xml +++ b/addons/website/static/src/xml/website.editor.xml @@ -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> diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml index d73e0c3934a..ae109139e3c 100644 --- a/addons/website/static/src/xml/website.snippets.xml +++ b/addons/website/static/src/xml/website.snippets.xml @@ -46,11 +46,11 @@ <div t-name="website.snippets.resize" data-snippet-id='resize'> <!-- custom data for the widget --> <div class='oe_handles'> - <div class='oe_handle n'></div> - <div class='oe_handle e'></div> - <div class='oe_handle w'></div> - <div class='oe_handle size'><div class="oe_handle_button size">Resize</div><div class="oe_border"/></div> - <div class='oe_handle s'></div> + <div class='oe_handle n'><div></div></div> + <div class='oe_handle e'><div></div></div> + <div class='oe_handle w'><div></div></div> + <div class='oe_handle size'><div class="oe_handle_button size">Resize</div></div> + <div class='oe_handle s'><div></div></div> </div> <div class='oe_snippet_thumbnail'>Margin resize</div> </div> |