diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-11-27 17:16:27 +0100 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-11-27 17:16:27 +0100 |
| commit | b37be42fd68aa43c3072bb828a8e581c22c7d2d4 (patch) | |
| tree | 2c6971fb854a575d0f1967e1e77abbfaf1a486a0 /addons/website/static/src/xml | |
| parent | 1421d02e5978c5573789bf5a5931e8bcff6a8c15 (diff) | |
[FIX] website: in all popups, always order buttons in the same order
bzr revid: chm@openerp.com-20131127161627-fwokmahwvp8jxhgl
Diffstat (limited to 'addons/website/static/src/xml')
| -rw-r--r-- | addons/website/static/src/xml/website.editor.xml | 4 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.seo.xml | 2 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.translator.xml | 23 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.xml | 2 |
4 files changed, 13 insertions, 18 deletions
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml index 01ed1ca9950..8f749374485 100644 --- a/addons/website/static/src/xml/website.editor.xml +++ b/addons/website/static/src/xml/website.editor.xml @@ -23,9 +23,9 @@ </div> <div class="modal-body"><t t-raw="__content__"/></div> <div class="modal-footer"> - <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Discard</button> + <button type="button" class="btn btn-primary save">Save</button> <button type="button" class="btn hidden wait" disabled="disabled"/> - <button type="button" class="btn btn-primary save">Save Changes</button> + <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Discard</button> </div> </div> </div> diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml index 2c3f8cab52a..676a4c7760e 100644 --- a/addons/website/static/src/xml/website.seo.xml +++ b/addons/website/static/src/xml/website.seo.xml @@ -56,8 +56,8 @@ </section> --> </div><div class="modal-footer"> + <button type="button" data-action="update" class="btn btn-primary">Save</button> <button data-action="discard" data-dismiss="modal" href="#" class="btn btn-default">Discard</button> - <button type="button" data-action="update" class="btn btn-primary">Apply Changes</button> </div> </div> </div> diff --git a/addons/website/static/src/xml/website.translator.xml b/addons/website/static/src/xml/website.translator.xml index dc5f93e87bf..d1d9ab14a39 100644 --- a/addons/website/static/src/xml/website.translator.xml +++ b/addons/website/static/src/xml/website.translator.xml @@ -36,20 +36,15 @@ versions. </p> </section> - <hr/> - <section class="row"> - <div class="col-md-6"> - <button type="button" data-action="activate" class="btn btn-primary">Ok</button> - or - <a data-action="discard" data-dismiss="modal" href="#">Cancel</a> - </div> - <div class="col-md-6"> - <label> - <input type="checkbox" name="do_not_show"/> - Do not show this dialog later. - </label> - </div> - </section> + </div> + <div class="modal-footer"> + <div class="pull-left"> + <input type="checkbox" name="do_not_show"/> + Do not show this dialog later. + </div> + <button type="button" data-action="activate" class="btn btn-primary">Ok</button> + or + <a data-action="discard" data-dismiss="modal" href="#">Cancel</a> </div> </div> </div> diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml index d5368ec7b94..17f8dbd5d89 100644 --- a/addons/website/static/src/xml/website.xml +++ b/addons/website/static/src/xml/website.xml @@ -116,8 +116,8 @@ </form> </div> <div class="modal-footer"> - <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button> <button type="button" class="btn btn-primary">Continue</button> + <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button> </div> </div> </div> |