pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website: in all popups, always order buttons in the same order

Browse Source 
bzr revid: chm@openerp.com-20131127161627-fwokmahwvp8jxhgl
This commit is contained in:
Christophe Matthieu
2013-11-27 17:16:27 +01:00
parent 1421d02e59
commit b37be42fd6
4 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/xml/website.editor.xml
+2 -2
View File
@@ -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>
addons/website/static/src/xml/website.seo.xml
+1 -1
View File
@@ -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>
addons/website/static/src/xml/website.translator.xml
+9 -14
View File
@@ -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>
addons/website/static/src/xml/website.xml
+1 -1
View File
@@ -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>