diff options
| author | Xavier Morel <xmo@openerp.com> | 2013-09-02 13:15:51 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2013-09-02 13:15:51 +0200 |
| commit | ba2076f400dee422d7a2ea78a0dee94319efc821 (patch) | |
| tree | fd33b267c216af253e72a979e158f17b304ee964 | |
| parent | 9733c396fe1ca31f584b2775a7ff59ae7b2b4914 (diff) | |
[FIX] correctly set @type of non-submit buttons to button
because of fix to $raw_editables links disabler, buttons which were
(apparently) previously cancelDefault-ed now are not, and blow up
various things when used.
bzr revid: xmo@openerp.com-20130902111551-ryldrw8kebz98u1w
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 8 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.xml | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index 25005cc4e0e..b1258a91873 100644 --- a/addons/website/static/src/xml/website.editor.xml +++ b/addons/website/static/src/xml/website.editor.xml @@ -3,11 +3,13 @@ <t t-jquery="#website-top-view" t-operation="after"> <div class="navbar-inner" id="website-top-edit"> <form class="navbar-form pull-left"> - <button data-action="save" class="btn btn-primary">Save</button> - <button data-action="cancel" class="btn">Cancel</button> + <button type="button" data-action="save" + class="btn btn-primary">Save</button> + <button type="button" data-action="cancel" + class="btn">Cancel</button> </form> <ul class="nav navbar-nav pull-right"> - <li class="navbar-form"><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li> + <li class="navbar-form"><button type="button" data-action="snippet" class="btn btn-primary">Building Blocks</button></li> </ul> </div> </t> diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml index f550f8cb372..47ddb2fd8d1 100644 --- a/addons/website/static/src/xml/website.xml +++ b/addons/website/static/src/xml/website.xml @@ -14,7 +14,8 @@ <span class="icon-bar"></span> </button> <form class="navbar-form navbar-left"> - <button data-action="edit" class="btn btn-primary">Edit</button> + <button type="button" data-action="edit" + class="btn btn-primary">Edit</button> </form> </div> <div class="collapse navbar-collapse navbar-edit-collapse"> |