diff options
| author | Jeremy Kersten <jke@odoo.com> | 2015-02-12 18:17:11 +0100 |
|---|---|---|
| committer | Jeremy Kersten <jke@odoo.com> | 2015-02-12 18:19:19 +0100 |
| commit | 165c67e8794a7f9fe08fb469f412e0d5e18aac6a (patch) | |
| tree | 534698eeec5c52f3a17c6873744f78f410404e3d /addons/website/static/src/xml/website.xml | |
| parent | a9bf846b6f600d41420adb208809c326189542a8 (diff) | |
[FIX] website: improve delete page
Clear cache after delete view
Move menu to keep all 'New page', 'New blog', 'New forum', ... together
Disable continue button from popup while user don't confirm with checkbox
English typo
Diffstat (limited to 'addons/website/static/src/xml/website.xml')
| -rw-r--r-- | addons/website/static/src/xml/website.xml | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml index 4394dc8fb3e..29716a0fdba 100644 --- a/addons/website/static/src/xml/website.xml +++ b/addons/website/static/src/xml/website.xml @@ -87,7 +87,7 @@ <div class="modal-body"> <div class="alert alert-warning alert-dismissible fade in mt16" role="alert"> <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button> - <strong>Be careful !</strong> Some dependencies could existed ... + <strong>Be careful !</strong> Some dependencies can exist ... </div> <t t-if="dependencies"> <t t-set='tid' t-value='0'/> @@ -104,10 +104,16 @@ <div t-att-id="'collapseDependencies'+tid" class="panel-collapse collapse in" role="tabpanel" aria-expanded="false" > <ul class="list-group"> <t t-foreach="dependencies[type]" t-as="error"> - <li class="list-group-item"><a t-att-href="error.link"><i class='fa fa-share fa-flip-vertical'/> <t t-raw="error.text"/></a></li> + <li class="list-group-item"> + <i class='fa fa-share fa-flip-vertical'/> + <a t-if="!_.contains(['', '#', false,], error.link)" t-att-href="error.link"> + <t t-raw="error.text"/> + </a> + <t t-if="_.contains(['', '#', false,], error.link)" t-raw="error.text"/> + </li> </t> </ul> - <div class="panel-footer"><t t-esc="dependencies[type].length"/> dependencies found</div> + <div class="panel-footer">Reference(s) found: <t t-esc="dependencies[type].length"/></div> </div> </div> </div> @@ -117,13 +123,13 @@ <form class="form-horizontal" role="form" t-att-id="id"> <div class="form-group"> <label class="col-sm-offset-2 col-sm-8 text-left alert alert-danger"> - <input type="checkbox"/> I'm sure, I want to delete this page definitively + <input type="checkbox" onchange="$('.btn-continue').prop('disabled', !this.checked)"/> I'm sure, I want to delete this page definitively </label> </div> </form> </div> <div class="modal-footer"> - <button type="button" class="btn btn-primary">Continue</button> + <button type="button" class="btn btn-primary btn-continue" disabled="disabled">Continue</button> <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button> </div> </div> |