summaryrefslogtreecommitdiff
path: root/odoo
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2018-07-16 16:48:59 +0200
committerqsm-odoo <qsm@odoo.com>2018-07-27 12:36:54 +0200
commitc59380bac5bbd47bc7dcd92b38049af29a62c3d1 (patch)
treed7d2597657a11138e243f228ebef98cd4ffc4cf6 /odoo
parent81f359c81c69af2a5ec0645602e2bb43b2e16721 (diff)
[REF] *: BS4, rename btn-default to btn-secondary
BS4 "btn-default" class was replaced with "btn-secondary", which makes more sense.
Diffstat (limited to 'odoo')
-rw-r--r--odoo/addons/base/data/ir_demo_data.xml2
-rw-r--r--odoo/addons/base/tests/test_views.py4
-rw-r--r--odoo/addons/base/views/ir_model_views.xml2
-rw-r--r--odoo/addons/base/views/ir_module_views.xml8
-rw-r--r--odoo/addons/base/views/onboarding_views.xml2
-rw-r--r--odoo/addons/base/views/res_config_views.xml4
-rw-r--r--odoo/addons/base/views/res_users_views.xml4
-rw-r--r--odoo/addons/base/wizard/base_export_language_views.xml2
-rw-r--r--odoo/addons/base/wizard/base_import_language_views.xml2
-rw-r--r--odoo/addons/base/wizard/base_language_install_views.xml2
-rw-r--r--odoo/addons/base/wizard/base_module_uninstall_views.xml2
-rw-r--r--odoo/addons/base/wizard/base_module_update_views.xml4
-rw-r--r--odoo/addons/base/wizard/base_module_upgrade.py2
-rw-r--r--odoo/addons/base/wizard/base_module_upgrade_views.xml4
-rw-r--r--odoo/addons/base/wizard/base_partner_merge_views.xml4
-rw-r--r--odoo/addons/base/wizard/base_update_translations_views.xml2
16 files changed, 25 insertions, 25 deletions
diff --git a/odoo/addons/base/data/ir_demo_data.xml b/odoo/addons/base/data/ir_demo_data.xml
index e108590147a..e0e42387ab4 100644
--- a/odoo/addons/base/data/ir_demo_data.xml
+++ b/odoo/addons/base/data/ir_demo_data.xml
@@ -15,7 +15,7 @@
<p>Are you sure you want to load demo data?</p>
<footer>
<button name="install_demo" string="Load demo data" type="object" class="btn-primary"/>
- <button special="cancel" string="Discard" class="btn-default"/>
+ <button special="cancel" string="Discard" class="btn-secondary"/>
</footer>
</form>
</field>
diff --git a/odoo/addons/base/tests/test_views.py b/odoo/addons/base/tests/test_views.py
index 3a417ba61ca..ab137d70ed6 100644
--- a/odoo/addons/base/tests/test_views.py
+++ b/odoo/addons/base/tests/test_views.py
@@ -866,7 +866,7 @@ class TestViews(ViewCase):
<separator name="separator" string="Separator" colspan="4"/>
<footer>
<button name="action_next" type="object" string="Next button" class="btn-primary"/>
- <button string="Skip" special="cancel" class="btn-default"/>
+ <button string="Skip" special="cancel" class="btn-secondary"/>
</footer>
</form>
"""
@@ -991,7 +991,7 @@ class TestViews(ViewCase):
<separator name="separator" string="Separator" colspan="4"/>
<footer>
<button name="action_next" type="object" string="Next button" class="btn-primary"/>
- <button string="Skip" special="cancel" class="btn-default"/>
+ <button string="Skip" special="cancel" class="btn-secondary"/>
</footer>
</form>
"""
diff --git a/odoo/addons/base/views/ir_model_views.xml b/odoo/addons/base/views/ir_model_views.xml
index b20c49a413d..f8ab6ed25fa 100644
--- a/odoo/addons/base/views/ir_model_views.xml
+++ b/odoo/addons/base/views/ir_model_views.xml
@@ -13,7 +13,7 @@
</group>
<footer>
<button name="menu_create" string="Create _Menu" type="object" class="btn-primary"/>
- <button string="Cancel" class="btn-default" special="cancel" />
+ <button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
diff --git a/odoo/addons/base/views/ir_module_views.xml b/odoo/addons/base/views/ir_module_views.xml
index 99fdf5b91eb..d873046b4c1 100644
--- a/odoo/addons/base/views/ir_module_views.xml
+++ b/odoo/addons/base/views/ir_module_views.xml
@@ -68,10 +68,10 @@
<div>
<button name="button_immediate_install" states="uninstalled" string="Install" type="object" class="btn btn-primary"/>
<button name="button_immediate_upgrade" states="installed" string="Upgrade" type="object" class="btn btn-primary"/>
- <button name="button_uninstall_wizard" states="installed" string="Uninstall" type="object" class="btn btn-default"/>
- <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" type="object" class="btn btn-default"/>
- <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" type="object" class="btn btn-default"/>
- <button name="button_install_cancel" states="to install" string="Cancel Install" type="object" class="btn btn-default"/>
+ <button name="button_uninstall_wizard" states="installed" string="Uninstall" type="object" class="btn btn-secondary"/>
+ <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" type="object" class="btn btn-secondary"/>
+ <button name="button_upgrade_cancel" states="to upgrade" string="Cancel Upgrade" type="object" class="btn btn-secondary"/>
+ <button name="button_install_cancel" states="to install" string="Cancel Install" type="object" class="btn btn-secondary"/>
</div>
</div>
<div class="oe_clear"/>
diff --git a/odoo/addons/base/views/onboarding_views.xml b/odoo/addons/base/views/onboarding_views.xml
index 470e78157ec..6da8ab74e24 100644
--- a/odoo/addons/base/views/onboarding_views.xml
+++ b/odoo/addons/base/views/onboarding_views.xml
@@ -25,7 +25,7 @@
This action is definitive.
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-default" data-dismiss="modal">
+ <button type="button" class="btn btn-secondary" data-dismiss="modal">
No
</button>
<a type="action" class="btn btn-primary" data-dismiss="modal"
diff --git a/odoo/addons/base/views/res_config_views.xml b/odoo/addons/base/views/res_config_views.xml
index d4c3d760c02..f8cadae3bd6 100644
--- a/odoo/addons/base/views/res_config_views.xml
+++ b/odoo/addons/base/views/res_config_views.xml
@@ -10,7 +10,7 @@
<group name="res_config_contents"/>
<footer>
<button name="action_next" type="object" string="Apply" class="btn-primary"/>
- <button name="action_skip" type="object" special="cancel" string="Cancel" class="btn-default"/>
+ <button name="action_skip" type="object" special="cancel" string="Cancel" class="btn-secondary"/>
</footer>
</form>
</field>
@@ -24,7 +24,7 @@
<separator string="title" colspan="4"/>
<footer>
<button name="action_next" type="object" string="Install Apps" class="btn-primary"/>
- <button string="Skip" class="btn-default" special="cancel" />
+ <button string="Skip" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
diff --git a/odoo/addons/base/views/res_users_views.xml b/odoo/addons/base/views/res_users_views.xml
index 9135eca564a..ea676aac324 100644
--- a/odoo/addons/base/views/res_users_views.xml
+++ b/odoo/addons/base/views/res_users_views.xml
@@ -11,7 +11,7 @@
<field name="user_ids"/>
<footer>
<button string="Change Password" name="change_password_button" type="object" class="btn-primary"/>
- <button string="Cancel" class="btn-default" special="cancel" />
+ <button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
@@ -370,7 +370,7 @@
</group>
<footer>
<button name="preference_save" type="object" string="Save" class="btn-primary"/>
- <button name="preference_cancel" string="Cancel" special="cancel" class="btn-default"/>
+ <button name="preference_cancel" string="Cancel" special="cancel" class="btn-secondary"/>
</footer>
</form>
</field>
diff --git a/odoo/addons/base/wizard/base_export_language_views.xml b/odoo/addons/base/wizard/base_export_language_views.xml
index f06dc590156..f177c8a60a4 100644
--- a/odoo/addons/base/wizard/base_export_language_views.xml
+++ b/odoo/addons/base/wizard/base_export_language_views.xml
@@ -32,7 +32,7 @@
</div>
<footer states="choose">
<button name="act_getfile" string="Export" type="object" class="btn-primary"/>
- <button special="cancel" string="Cancel" type="object" class="btn-default"/>
+ <button special="cancel" string="Cancel" type="object" class="btn-secondary"/>
</footer>
<footer states="get">
<button special="cancel" string="Close" type="object" class="btn-primary"/>
diff --git a/odoo/addons/base/wizard/base_import_language_views.xml b/odoo/addons/base/wizard/base_import_language_views.xml
index 7fb452f4853..70ebb4a78c7 100644
--- a/odoo/addons/base/wizard/base_import_language_views.xml
+++ b/odoo/addons/base/wizard/base_import_language_views.xml
@@ -16,7 +16,7 @@
</group>
<footer>
<button name="import_lang" string="_Import" type="object" class="btn-primary"/>
- <button string="Cancel" class="btn-default" special="cancel" />
+ <button string="Cancel" class="btn-secondary" special="cancel" />
</footer>
</form>
</field>
diff --git a/odoo/addons/base/wizard/base_language_install_views.xml b/odoo/addons/base/wizard/base_language_install_views.xml
index 936197d810e..8f8901a409a 100644
--- a/odoo/addons/base/wizard/base_language_install_views.xml
+++ b/odoo/addons/base/wizard/base_language_install_views.xml
@@ -18,7 +18,7 @@ You must change the preferences of the user to view the changes.</span>
</group>
<footer states="init">
<button name="lang_install" string="Load" type="object" class="btn-primary"/>
- <button special="cancel" string="Cancel" class="btn-default"/>
+ <button special="cancel" string="Cancel" class="btn-secondary"/>
</footer>
<footer states="done">
<button name="reload" string="Close" type="object" class="btn-primary"/>
diff --git a/odoo/addons/base/wizard/base_module_uninstall_views.xml b/odoo/addons/base/wizard/base_module_uninstall_views.xml
index 4f10bebc276..00a493637f6 100644
--- a/odoo/addons/base/wizard/base_module_uninstall_views.xml
+++ b/odoo/addons/base/wizard/base_module_uninstall_views.xml
@@ -42,7 +42,7 @@
</field>
<footer>
<button string="Confirm" class="btn-primary" type="object" name="action_uninstall"/>
- <button string="Cancel" class="btn-default" special="cancel"/>
+ <button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
diff --git a/odoo/addons/base/wizard/base_module_update_views.xml b/odoo/addons/base/wizard/base_module_update_views.xml
index e465479e6ff..478d548e7b6 100644
--- a/odoo/addons/base/wizard/base_module_update_views.xml
+++ b/odoo/addons/base/wizard/base_module_update_views.xml
@@ -19,11 +19,11 @@
<footer>
<div states="init">
<button name="update_module" string="Update" type="object" class="btn-primary"/>
- <button special="cancel" string="Cancel" class="btn-default"/>
+ <button special="cancel" string="Cancel" class="btn-secondary"/>
</div>
<div states="done">
<button name="action_module_open" string="Open Apps" type="object" class="btn-primary"/>
- <button special="cancel" string="Close" class="btn-default"/>
+ <button special="cancel" string="Close" class="btn-secondary"/>
</div>
</footer>
</form>
diff --git a/odoo/addons/base/wizard/base_module_upgrade.py b/odoo/addons/base/wizard/base_module_upgrade.py
index bd0875d1cba..07475ffeaf9 100644
--- a/odoo/addons/base/wizard/base_module_upgrade.py
+++ b/odoo/addons/base/wizard/base_module_upgrade.py
@@ -36,7 +36,7 @@ class BaseModuleUpgrade(models.TransientModel):
<separator string="Upgrade Completed" colspan="4"/>
<footer>
<button name="config" string="Start Configuration" type="object" class="btn-primary"/>
- <button special="cancel" string="Close" class="btn-default"/>
+ <button special="cancel" string="Close" class="btn-secondary"/>
</footer>
</form>'''
diff --git a/odoo/addons/base/wizard/base_module_upgrade_views.xml b/odoo/addons/base/wizard/base_module_upgrade_views.xml
index 53bf47d409f..d8301c636f0 100644
--- a/odoo/addons/base/wizard/base_module_upgrade_views.xml
+++ b/odoo/addons/base/wizard/base_module_upgrade_views.xml
@@ -14,7 +14,7 @@
<field name="module_info"/>
<footer>
<button name="upgrade_module" string="Confirm" type="object" class="btn-primary"/>
- <button string="Cancel" class="btn-default" name="upgrade_module_cancel" type="object"/>
+ <button string="Cancel" class="btn-secondary" name="upgrade_module_cancel" type="object"/>
</footer>
</form>
</field>
@@ -47,7 +47,7 @@
<div><span class="o_form_label">We suggest to reload the menu tab to see the new menus (Ctrl+T then Ctrl+R)."</span></div>
<footer>
<button name="config" string="Start configuration" type="object" class="btn-primary"/>
- <button string="Cancel" class="btn-default" special="cancel"/>
+ <button string="Cancel" class="btn-secondary" special="cancel"/>
</footer>
</form>
</field>
diff --git a/odoo/addons/base/wizard/base_partner_merge_views.xml b/odoo/addons/base/wizard/base_partner_merge_views.xml
index 153f5eee01c..c4afd88378e 100644
--- a/odoo/addons/base/wizard/base_partner_merge_views.xml
+++ b/odoo/addons/base/wizard/base_partner_merge_views.xml
@@ -92,8 +92,8 @@
type='object'
confirm="Are you sure to execute the list of automatic merges of your contacts ?"
attrs="{'invisible': [('state', '!=', 'option')]}" />
- <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')]}"/>
+ <button special="cancel" string="Cancel" type="object" class="btn btn-secondary oe_inline" attrs="{'invisible': [('state', '=', 'finished')]}"/>
+ <button special="cancel" string="Close" type="object" class="btn btn-secondary oe_inline" attrs="{'invisible': [('state', '!=', 'finished')]}"/>
</footer>
</form>
</field>
diff --git a/odoo/addons/base/wizard/base_update_translations_views.xml b/odoo/addons/base/wizard/base_update_translations_views.xml
index 42baf0b04af..8b1e7c69788 100644
--- a/odoo/addons/base/wizard/base_update_translations_views.xml
+++ b/odoo/addons/base/wizard/base_update_translations_views.xml
@@ -11,7 +11,7 @@
</group>
<footer>
<button name="act_update" string="Update" type="object" class="btn-primary"/>
- <button special="cancel" string="Cancel" type="object" class="btn-default"/>
+ <button special="cancel" string="Cancel" type="object" class="btn-secondary"/>
</footer>
</form>
</field>