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

[IMP] *: uniformize modals buttons: remove 'oe_link' class and 'or' between buttons

Browse Source
This commit is contained in:
jpr-odoo
2016-11-09 15:27:01 +01:00
committed by Yannick Tivisse
parent 5a3d0fc3ff
commit 9e26d875db
14 changed files with 29 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/wizard/account_report_aged_partner_balance_view.xml
+1 -2
View File
@@ -18,8 +18,7 @@
<field name="journal_ids" required="0" invisible="1"/>
<footer>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
<button string="Cancel" class="btn btn-default" special="cancel"/>
</footer>
</form>
</field>
addons/account/wizard/account_report_common_view.xml
+1 -2
View File
@@ -17,8 +17,7 @@
</group>
<footer>
<button name="check_report" string="Print" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
<button string="Cancel" class="btn btn-default" special="cancel" />
</footer>
</form>
</field>
addons/account/wizard/wizard_tax_adjustments_view.xml
+1 -2
View File
@@ -27,8 +27,7 @@
</group>
<footer>
<button name="create_move" string="Create and post move" type="object" default_focus="1" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
<button string="Cancel" class="btn btn-default" special="cancel" />
</footer>
</form>
</field>
addons/account_check_printing/wizard/print_prenumbered_checks_views.xml
+1 -2
View File
@@ -13,8 +13,7 @@
</group>
<footer>
<button name="print_checks" string="Print" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
<button string="Cancel" class="btn btn-default" special="cancel"/>
</footer>
</form>
</field>
addons/crm/wizard/base_partner_merge_views.xml
+2 -6
View File
@@ -92,12 +92,8 @@
type='object'
confirm="Are you sure to execute the list of automatic merges of your contacts ?"
attrs="{'invisible': [('state', '!=', 'option')]}" />
<span class="or_cancel" attrs="{'invisible': [('state', '=', 'finished')]} ">or
<button special="cancel" string="Cancel" type="object" class="oe_link oe_inline"/>
</span>
<span class="or_cancel" attrs="{'invisible': [('state', '!=', 'finished')]} ">
<button special="cancel" string="Close" type="object" class="oe_link oe_inline"/>
</span>
<button special="cancel" string="Cancel" type="object" class="btn btn-default oe_inline" attrs="{'invisible': [('state', '=', 'finished')]}"/>
<button special="cancel" string="Close" type="object" class="btn btn-default oe_inline" attrs="{'invisible': [('state', '!=', 'finished')]}"/>
</footer>
</form>
</field>
addons/hr_expense/wizard/hr_expense_refuse_reason.xml
+1 -2
View File
@@ -9,8 +9,7 @@
<field name="description"/>
<footer>
<button string='Refuse' name="expense_refuse_reason" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel"/>
<button string="Cancel" class="btn btn-default" special="cancel"/>
</footer>
</form>
</field>
addons/l10n_fr_fec/wizard/account_fr_fec_view.xml
+1 -2
View File
@@ -13,8 +13,7 @@
<footer>
<button string="Generate" name="generate_fec" type="object"
class="oe_highlight"/>
<button string="Cancel" special="cancel"
class="oe_link"/>
<button string="Cancel" class="btn btn-default" special="cancel"/>
</footer>
</form>
</field>
addons/lunch/wizard/lucky_order_view.xml
+1 -2
View File
@@ -14,8 +14,7 @@
</group>
<footer>
<button name="random_pick" string="I'm feeling lucky" type="object" class="oe_highlight"/>
or
<button string="Cancel" class="oe_link" special="cancel" />
<button string="Cancel" class="btn btn-default" special="cancel" />
</footer>
</form>
</field>
addons/web/static/src/xml/base_common.xml
+1 -1
View File
@@ -17,7 +17,7 @@
</div>
<t t-name="WidgetButton">
<button type="button" t-attf-class="btn btn-sm #{widget.node.attrs.class or ''}"
<button type="button" t-attf-class="btn btn-sm #{widget.node.attrs.class or 'btn-default'}"
t-att-style="widget.node.attrs.style"
t-att-tabindex="widget.node.attrs.tabindex"
t-att-autofocus="widget.node.attrs.autofocus"
addons/website_crm_partner_assign/views/website_crm_partner_assign_templates.xml
+8 -8
View File
@@ -441,8 +441,8 @@
</div>
</div>
<div class="modal-footer">
<button t-attf-class="btn btn-primary interested_partner_assign_confirm">Confirm</button> or
<button type="button" class="btn btn-link" data-dismiss="modal" style="padding: 0">Cancel</button>
<button t-attf-class="btn btn-primary interested_partner_assign_confirm">Confirm</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
</div>
</form>
</div>
@@ -474,8 +474,8 @@
</div>
</div>
<div class="modal-footer">
<button t-attf-class="btn btn-primary desinterested_partner_assign_confirm">Confirm</button> or
<button type="button" class="btn btn-link" data-dismiss="modal" style="padding: 0">Cancel</button>
<button t-attf-class="btn btn-primary desinterested_partner_assign_confirm">Confirm</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
</div>
</form>
</div>
@@ -623,8 +623,8 @@
</div>
</div>
<div class="modal-footer">
<button t-attf-class="btn btn-primary edit_contact_confirm">Confirm</button> or
<button type="button" class="btn btn-link" data-dismiss="modal" style="padding: 0">Cancel</button>
<button t-attf-class="btn btn-primary edit_contact_confirm">Confirm</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
</div>
</form>
</div>
@@ -743,8 +743,8 @@
</div>
</div>
<div class="modal-footer">
<button t-attf-class="btn btn-primary edit_opp_confirm">Confirm</button> or
<button type="button" class="btn btn-link" data-dismiss="modal" style="padding: 0">Cancel</button>
<button t-attf-class="btn btn-primary edit_opp_confirm">Confirm</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
</div>
</form>
</div>
addons/website_event/views/website_event_templates.xml
+2 -2
View File
@@ -498,8 +498,8 @@
</div>
<div class="modal-footer">
<div class="pull-left">
<button type="submit" class="btn btn-primary">Continue</button> or
<a class="js_goto_event" style="cursor: pointer;"> Cancel Registration</a>
<button type="submit" class="btn btn-primary">Continue</button>
<button type="button" class="btn btn-default js_goto_event" data-dismiss="modal">Cancel Registration</button>
</div>
</div>
</div>
addons/website_gengo/static/src/xml/website.gengo.xml
+3 -6
View File
@@ -45,8 +45,7 @@
</div>
<div>
<button type="button" data-action="activate" class="btn btn-primary">Ok</button>
or
<a data-action="discard" data-dismiss="modal" href="#">Cancel</a>
<button type="button" class="btn btn-default" data-action="discard" data-dismiss="modal">Cancel</button>
</div>
</div>
</div>
@@ -74,8 +73,7 @@
</div>
<div class="modal-footer">
<button type="button" data-action="service_level" class="btn btn-primary">Post</button>
or
<a data-action="discard" data-dismiss="modal" href="#">Cancel</a>
<button type="button" class="btn btn-default" data-action="discard" data-dismiss="modal">Cancel</button>
</div>
</div>
</div>
@@ -152,8 +150,7 @@
</div>
<div class="modal-footer">
<button type="button" data-action="set_config" class="btn btn-primary">Submit</button>
or
<a data-action="discard" data-dismiss="modal" href="#">Close</a>
<button type="button" class="btn btn-default" data-action="discard" data-dismiss="modal">Close</button>
</div>
</div>
</div>
addons/website_quote/views/website_quote_templates.xml
+5 -5
View File
@@ -310,8 +310,8 @@
</div>
<div class="modal-footer">
<div t-if="not acquirers">
<button type="submit" t-attf-class="btn btn-primary">Sign &amp; Confirm</button> or
<button type="button" class="btn btn-link" data-dismiss="modal" style="padding: 0">Cancel</button>
<button type="submit" t-attf-class="btn btn-primary">Sign &amp; Confirm</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
</div>
</div>
</form>
@@ -387,8 +387,8 @@
<textarea rows="4" name="decline_message" placeholder="Your feedback....." class="form-control"/>
</div>
<div class="modal-footer">
<button type="submit" t-att-id="quotation.id" class="btn btn-primary">Reject</button> or
<button type="button" class="btn btn-link" data-dismiss="modal" style="padding: 0">Cancel</button>
<button type="submit" t-att-id="quotation.id" class="btn btn-primary">Reject</button>
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
</div>
</form>
</div>
@@ -440,7 +440,7 @@
<xpath expr="//a[@data-target='#modaldecline']" position="before">
<a type="submit" href="#discussion">
Ask Changes
</a> or
</a>
</xpath>
<xpath expr="//div[@id='quotation_toolbar']/a[@data-target='#modaldecline']" position="before">
<a class="btn btn-info" type="submit" href="#discussion">
addons/website_slides/static/src/xml/website_slides.xml
+1 -2
View File
@@ -68,8 +68,7 @@
<div class="modal-footer">
<button type="button" data-loading-text="Loading..." class="btn btn-primary save">Save as Draft</button>
<button type="button" data-loading-text="Loading..." data-published="true" class="btn btn-primary save">Save and Publish</button>
or
<a href="#" data-dismiss="modal" aria-hidden="true">Discard</a>
<button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">Discard</button>
</div>
</div>
</div>