From 11edf8df8a09057ee9b5d90cccc6f128864a51a6 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Tue, 15 May 2012 17:15:38 +0530 Subject: [PATCH 001/293] [IMP] change HR Menu bzr revid: kjo@tinyerp.com-20120515114538-cja1xnu64scpm0um --- addons/hr/hr_view.xml | 2 +- .../wizard/hr_attendance_sign_in_out_view.xml | 36 ------------------- addons/hr_evaluation/hr_evaluation_view.xml | 2 +- .../hr_holidays_summary_department_view.xml | 4 +-- addons/hr_recruitment/hr_recruitment_menu.xml | 2 +- .../hr_timesheet_print_employee_view.xml | 2 +- .../wizard/hr_timesheet_print_users_view.xml | 2 +- .../hr_timesheet_analytic_profit_view.xml | 2 +- 8 files changed, 7 insertions(+), 45 deletions(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 4147ebc30a9..32032cdadaa 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -312,7 +312,7 @@ + parent="hr.menu_hr_configuration" sequence="1" groups="base.group_no_one"/> Categories Structure diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml index 13ce91c79d4..a37ec4275d5 100644 --- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml +++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml @@ -1,29 +1,6 @@ - - hr.sign.in.out.form - hr.sign.in.out - form - -
- -
From 204882916a07523d49ca7687a67a12144f910c07 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 19 Jun 2012 10:00:17 +0200 Subject: [PATCH 215/293] [IMP] modules view: rename title to 'Install a Module' bzr revid: rco@openerp.com-20120619080017-4xw8vwx3sckzasni --- openerp/addons/base/module/module_view.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index da345ea3fb6..2fe4ff4a9df 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -191,7 +191,7 @@ - Modules + Install a Module ir.module.module form kanban,tree,form @@ -199,7 +199,8 @@ You can install new modules in order to activate new features, menu, reports or data in your OpenERP instance. To install some modules, click on the button "Install" from the form view and then click on "Start Upgrade". - + From f02c8858b34d9062517a2bb03d68926458b51862 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 19 Jun 2012 10:10:05 +0200 Subject: [PATCH 216/293] [IMP] translations: rename 'Load an Official Translation' to 'Load a Translation' bzr revid: rco@openerp.com-20120619081005-uqx5e9add4k2ufvr --- .../base/module/wizard/base_language_install_view.xml | 10 +++++----- openerp/addons/base/res/res_users.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/module/wizard/base_language_install_view.xml b/openerp/addons/base/module/wizard/base_language_install_view.xml index d7afd223303..0ebe9256a52 100644 --- a/openerp/addons/base/module/wizard/base_language_install_view.xml +++ b/openerp/addons/base/module/wizard/base_language_install_view.xml @@ -3,11 +3,11 @@ - Load Official Translation + Load a Translation base.language.install form - + @@ -19,7 +19,7 @@ - + @@ -46,7 +46,7 @@ You must change the preferences of the user and open a new menu to view the chan - Load Official Translation + Load a Translation ir.actions.act_window base.language.install form @@ -55,7 +55,7 @@ You must change the preferences of the user and open a new menu to view the chan diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index 8f424e534b0..e22b5addf48 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -226,7 +226,7 @@ class users(osv.osv): 'company_ids':fields.many2many('res.company','res_company_users_rel','user_id','cid','Companies'), 'context_lang': fields.selection(_lang_get, 'Language', required=True, - help="The default language used in the graphical user interface, when translations are available. To add a new language, you can use the 'Load an Official Translation' wizard available from the 'Administration' menu."), + help="The default language used in the graphical user interface, when translations are available. To add a new language, you can use the 'Load a Translation' wizard available from the 'Administration' menu."), 'context_tz': fields.selection(_tz_get, 'Timezone', size=64, help="The user's timezone, used to output proper date and time values inside printed reports. " "It is important to set a value for this field. You should use the same timezone " From 55e32e992b5352728ed3f9b1c099037ed49eda5d Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 19 Jun 2012 10:37:32 +0200 Subject: [PATCH 217/293] [IMP] Settings: hide menus 'Companies', 'Users' and 'OpenERP Enterprise' by restricting to group_no_one bzr revid: rco@openerp.com-20120619083732-fet0psn4wksbujbx --- openerp/addons/base/base_menu.xml | 2 +- .../addons/base/publisher_warranty/publisher_warranty_view.xml | 3 ++- openerp/addons/base/res/res_company_view.xml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/base_menu.xml b/openerp/addons/base/base_menu.xml index 8dddc0c60a3..abba27b7ed7 100644 --- a/openerp/addons/base/base_menu.xml +++ b/openerp/addons/base/base_menu.xml @@ -8,7 +8,7 @@ - + diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml index 5130fa878f2..7820aeb6f62 100644 --- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml +++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml @@ -1,7 +1,8 @@ - + publisher_warranty.contract.tree diff --git a/openerp/addons/base/res/res_company_view.xml b/openerp/addons/base/res/res_company_view.xml index e5e2480d4af..8c7c05d0451 100644 --- a/openerp/addons/base/res/res_company_view.xml +++ b/openerp/addons/base/res/res_company_view.xml @@ -1,7 +1,8 @@ - + From 4bf0b0b0596122b868af08e39f6924c8989136c1 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 19 Jun 2012 10:38:30 +0200 Subject: [PATCH 218/293] [IMP] base_setup: show hidden menus 'Companies', 'Users' and 'OpenERP Enterprise' in Settings bzr revid: rco@openerp.com-20120619083830-7qqhikd1qaes3bm9 --- addons/base_setup/base_setup_views.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml index 1dceb87d621..e4b9b9dadb2 100644 --- a/addons/base_setup/base_setup_views.xml +++ b/addons/base_setup/base_setup_views.xml @@ -1,6 +1,17 @@ + + + + + + + + + + + Specify Your Terminology From 682f5cbe87e1cb3be515a955501742c681180a3b Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 19 Jun 2012 10:45:26 +0200 Subject: [PATCH 219/293] [IMP] sass cleanup bzr revid: al@openerp.com-20120619084526-kif8cq0zdsti8jwy --- addons/web/static/src/css/base.css | 678 ++++++++++++++-------------- addons/web/static/src/css/base.sass | 540 ++++++++++------------ addons/web/static/src/xml/base.xml | 10 +- 3 files changed, 591 insertions(+), 637 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 84f1b7ed2a0..ba10cbcc04c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -25,20 +25,6 @@ position: relative; } -.ui-widget { - font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; - font-size: 13px; -} - -.ui-menu .ui-menu-item { - margin: 0 8px 0 0; - padding: 0 0 0 12px; - width: auto; -} -.ui-menu .ui-menu-item a.ui-state-active { - background: #f0f0fa; -} - .openerp { padding: 0; margin: 0; @@ -55,7 +41,6 @@ } .openerp table { padding: 0; - font-size: 13px; border-collapse: collapse; } .openerp thead { @@ -98,13 +83,6 @@ background-image: -o-linear-gradient(top, #eeeeee, #dedede); background-image: linear-gradient(to bottom, #eeeeee, #dedede); } -.openerp .numeric { - text-align: right; - width: 82px; -} -.openerp .numeric input { - text-align: right; -} .openerp ul, .openerp li, .openerp ol { margin: 0; padding: 0; @@ -124,39 +102,6 @@ .openerp h4 { margin: 4px 0; } -.openerp .oe_i { - font-family: "mnmliconsRegular" !important; - font-size: 21px; - font-weight: 300 !important; -} -.openerp .oe_e { - font-family: "entypoRegular" !important; - font-size: 34px; - font-weight: 300 !important; -} -.openerp .oe_left { - float: left; - margin-right: 8px; -} -.openerp .oe_right { - float: right; - margin-left: 8px; -} -.openerp .oe_text_right { - text-align: right; -} -.openerp .oe_clear { - clear: both; -} -.openerp .oe_wait { - cursor: wait; -} -.openerp .oe_fade { - color: #888888; -} -.openerp .oe_bold { - font-weight: bold; -} .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'] { display: inline-block; border: 1px solid #ababab; @@ -284,6 +229,286 @@ background-image: -o-linear-gradient(top, #dc5f59, #b33630); background-image: linear-gradient(to bottom, #dc5f59, #b33630); } +.openerp .ui-widget { + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif; + font-size: 13px; +} +.openerp .ui-menu .ui-menu-item { + margin: 0 8px 0 0; + padding: 0 0 0 12px; + width: auto; +} +.openerp .ui-menu .ui-menu-item a.ui-state-active { + background: #f0f0fa; +} +.openerp .oe_i { + font-family: "mnmliconsRegular" !important; + font-size: 21px; + font-weight: 300 !important; +} +.openerp .oe_e { + font-family: "entypoRegular" !important; + font-size: 34px; + font-weight: 300 !important; +} +.openerp .oe_left { + float: left; + margin-right: 8px; +} +.openerp .oe_right { + float: right; + margin-left: 8px; +} +.openerp .oe_text_right { + text-align: right; +} +.openerp .oe_clear { + clear: both; +} +.openerp .oe_wait { + cursor: wait; +} +.openerp .oe_fade { + color: #888888; +} +.openerp .oe_bold { + font-weight: bold; +} +.openerp .oe_inline  { + width: auto; +} +.openerp .oe_highlight { + color: white; + background: #dc5f59; +} +.openerp button.oe_highlight { + background-color: #dc5f59; + background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); + background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); + background-image: -moz-linear-gradient(top, #dc5f59, #b33630); + background-image: -ms-linear-gradient(top, #dc5f59, #b33630); + background-image: -o-linear-gradient(top, #dc5f59, #b33630); + background-image: linear-gradient(to bottom, #dc5f59, #b33630); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +.openerp button.oe_highlight:hover { + background: #df6b66; + background-color: #df6b66; + background-image: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33)); + background-image: -webkit-linear-gradient(top, #df6b66, #bf3a33); + background-image: -moz-linear-gradient(top, #df6b66, #bf3a33); + background-image: -ms-linear-gradient(top, #df6b66, #bf3a33); + background-image: -o-linear-gradient(top, #df6b66, #bf3a33); + background-image: linear-gradient(to bottom, #df6b66, #bf3a33); + -moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); +} +.openerp.oe_tooltip { + font-size: 12px; +} +.openerp.oe_tooltip .oe_tooltip_string { + color: #ffdd55; + font-weight: bold; + font-size: 13px; +} +.openerp.oe_tooltip .oe_tooltip_help { + white-space: pre-wrap; +} +.openerp.oe_tooltip .oe_tooltip_technical { + padding: 0 0 4px 0; + margin: 5px 0 0 15px; +} +.openerp.oe_tooltip .oe_tooltip_technical li { + list-style: circle; +} +.openerp.oe_tooltip .oe_tooltip_technical_title { + font-weight: bold; +} +.openerp .oe_notebook { + margin: 8px 0; + padding: 0 8px; + list-style: none; + zoom: 1; +} +.openerp .oe_notebook:before, .openerp .oe_notebook:after { + display: table; + content: ""; + zoom: 1; +} +.openerp .oe_notebook:after { + clear: both; +} +.openerp .oe_notebook > li { + float: left; +} +.openerp .oe_notebook > li > a { + display: block; + color: #4c4c4c; +} +.openerp .oe_notebook { + border-color: #dddddd; + border-style: solid; + border-width: 0 0 1px; +} +.openerp .oe_notebook > li { + position: relative; + margin-bottom: -1px; +} +.openerp .oe_notebook > li > a { + padding: 0 12px; + margin-right: 2px; + line-height: 30px; + border: 1px solid transparent; + -moz-border-radius: 4px 4px 0 0; + -webkit-border-radius: 4px 4px 0 0; + border-radius: 4px 4px 0 0; +} +.openerp .oe_notebook > li > a:hover { + text-decoration: none; + background-color: #eeeeee; + border-color: #eeeeee #eeeeee #dddddd; +} +.openerp .oe_notebook > li.ui-state-active > a, .openerp .oe_notebook > li.ui-state-active > a:hover { + background-color: white; + border: 1px solid #dddddd; + border-bottom-color: transparent; + cursor: default; +} +.openerp .oe_notebook_page { + padding: 0; +} +.openerp div.ui-tabs { + padding: 3px 0px 3px 0px; +} +.openerp .ui-tabs-hide { + display: none; +} +.openerp .oe_dropdown_toggle:after { + width: 0; + height: 0; + display: inline-block; + content: "&darr"; + text-indent: -99999px; + vertical-align: top; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid white; + filter: alpha(opacity=50); + opacity: 0.5; + margin-top: 7px; + margin-left: 6px; + border-top-color: #404040; +} +.openerp .oe_dropdown_menu { + display: none; + position: absolute; + top: 28px; + left: 0px; + padding: 8px; + border: 1px solid #afafb6; + min-width: 120px; + overflow-x: hidden; + z-index: 900; + text-align: left; + background: white; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); +} +.openerp .oe_dropdown_menu li { + position: relative; + list-style-type: none; + float: none; + display: block; + background-color: none; +} +.openerp .oe_dropdown_menu li:hover { + background-color: #f0f0fa; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); + background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} +.openerp .oe_dropdown_menu li a { + display: block; + padding: 3px 6px; + clear: both; + font-weight: normal; + line-height: 14px; + color: #4c4c4c; + text-decoration: none; + cursor: pointer; +} +.openerp .oe_dropdown_menu li a:hover { + text-decoration: none; +} +.openerp .oe_dropdown_menu li .oe_sidebar_delete_item { + position: absolute; + bottom: 1px; + right: 4px; + display: none; + width: 12px; + height: 12px; + line-height: 12px; + padding: 1px; + color: #8786b7; + line-height: 8px; + text-align: center; + font-weight: bold; + text-shadow: 0 1px 1px white; +} +.openerp .oe_dropdown_menu li .oe_sidebar_delete_item:hover { + text-decoration: none; + color: white; + background: #8786b7; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); + -moz-border-radius: 2px; + -webkit-border-radius: 2px; + border-radius: 2px; +} +.openerp .oe_dropdown_menu li:hover .oe_sidebar_delete_item { + display: inline-block; +} +.openerp .oe_sidebar { + white-space: nowrap; +} +.openerp .oe_sidebar .oe_dropdown_menu li { + padding-right: 16px; +} +.openerp .oe_sidebar .oe_sidebar_add_attachment { + cursor: pointer; + padding-left: 6px; + margin-top: 6px; +} +.openerp .oe_sidebar .oe_sidebar_add_attachment span { + font-weight: bold; +} +.openerp .oe_sidebar .oe_sidebar_add_attachment .oe_hidden_input_file { + width: 200px; +} +.openerp .oe_sidebar .oe_sidebar_add_attachment:hover { + background-color: #f0f0fa; + background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); + background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); + background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; +} .openerp .oe_loading { display: none; z-index: 100; @@ -1040,135 +1265,8 @@ .openerp .oe_view_manager_global > .oe_view_manager_header .oe_header_row:first-child td { padding-top: 8px; } -.openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top { - display: none; -} -.openerp .oe_form_dropdown_section { - position: relative; - display: inline-block; -} -.openerp .oe_dropdown_toggle:after { - width: 0; - height: 0; - display: inline-block; - content: "&darr"; - text-indent: -99999px; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid white; - filter: alpha(opacity=50); - opacity: 0.5; - margin-top: 7px; - margin-left: 6px; - border-top-color: #404040; -} -.openerp .oe_dropdown_menu { - display: none; - position: absolute; - top: 28px; - left: 0px; - padding: 8px; - border: 1px solid #afafb6; - min-width: 120px; - overflow-x: hidden; - z-index: 900; - text-align: left; - background: white; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); -} -.openerp .oe_dropdown_menu li { - position: relative; - list-style-type: none; - float: none; - display: block; - background-color: none; -} -.openerp .oe_dropdown_menu li:hover { - background-color: #f0f0fa; - background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); - background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} -.openerp .oe_dropdown_menu li a { - display: block; - padding: 3px 6px; - clear: both; - font-weight: normal; - line-height: 14px; - color: #4c4c4c; - text-decoration: none; - cursor: pointer; -} -.openerp .oe_dropdown_menu li a:hover { - text-decoration: none; -} -.openerp .oe_dropdown_menu li .oe_sidebar_delete_item { - position: absolute; - bottom: 1px; - right: 4px; - display: none; - width: 12px; - height: 12px; - line-height: 12px; - padding: 1px; - color: #8786b7; - line-height: 8px; - text-align: center; - font-weight: bold; - text-shadow: 0 1px 1px white; -} -.openerp .oe_dropdown_menu li .oe_sidebar_delete_item:hover { - text-decoration: none; - color: white; - background: #8786b7; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); - -moz-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; -} -.openerp .oe_dropdown_menu li:hover .oe_sidebar_delete_item { - display: inline-block; -} -.openerp .oe_sidebar { - white-space: nowrap; -} -.openerp .oe_sidebar .oe_dropdown_menu li { - padding-right: 16px; -} -.openerp .oe_sidebar .oe_sidebar_add_attachment { - cursor: pointer; - padding-left: 6px; - margin-top: 6px; -} -.openerp .oe_sidebar .oe_sidebar_add_attachment span { - font-weight: bold; -} -.openerp .oe_sidebar .oe_sidebar_add_attachment .oe_hidden_input_file { - width: 200px; -} -.openerp .oe_sidebar .oe_sidebar_add_attachment:hover { - background-color: #f0f0fa; - background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); - background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -moz-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -ms-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: -o-linear-gradient(top, #f0f0fa, #eeeef6); - background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; +.openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager { + display: none !important; } .openerp .oe_searchview { cursor: text; @@ -1549,6 +1647,10 @@ padding: 0 8px; line-height: 30px; } +.openerp .oe_form_dropdown_section { + position: relative; + display: inline-block; +} .openerp .oe_formview { background: white; } @@ -1652,32 +1754,40 @@ font-weight: bold; color: #b33630; } -.openerp .oe_form_readonly button.oe_form_button_hi { - color: white; - background: #dc5f59; - background-color: #dc5f59; - background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); - background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); - background-image: -moz-linear-gradient(top, #dc5f59, #b33630); - background-image: -ms-linear-gradient(top, #dc5f59, #b33630); - background-image: -o-linear-gradient(top, #dc5f59, #b33630); - background-image: linear-gradient(to bottom, #dc5f59, #b33630); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; +.openerp .oe_form td.oe_form_group_cell_label { + border-right: 1px solid #dddddd; + padding: 2px 0px 2px 0px; } -.openerp .oe_form_readonly button.oe_form_button_hi:hover { - background: #df6b66; - background-color: #df6b66; - background-image: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33)); - background-image: -webkit-linear-gradient(top, #df6b66, #bf3a33); - background-image: -moz-linear-gradient(top, #df6b66, #bf3a33); - background-image: -ms-linear-gradient(top, #df6b66, #bf3a33); - background-image: -o-linear-gradient(top, #df6b66, #bf3a33); - background-image: linear-gradient(to bottom, #df6b66, #bf3a33); - -moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); - box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); +.openerp .oe_form td.oe_form_group_cell_label label { + line-height: 18px; + display: block; + min-width: 120px; +} +.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { + padding-left: 8px; +} +.openerp .oe_form .oe_form_subtotal_footer { + width: auto; + float: right; +} +.openerp .oe_form .oe_form_subtotal_footer td.oe_form_group_cell { + text-align: right; + padding: 0; +} +.openerp .oe_form .oe_form_subtotal_footer td.oe_form_group_cell_label { + border: none; +} +.openerp .oe_form .oe_form_subtotal_footer .oe_form_field { + width: auto !important; +} +.openerp .oe_form .oe_form_subtotal_footer .oe_form_subtotal_footer_separator { + border-top: 1px solid #cacaca; + font-size: 120%; + font-weight: bold; +} +.openerp .oe_form .oe_form_subtotal_footer label.oe_form_subtotal_footer_separator { + font-weight: bold !important; + padding: 2px 8px 2px 0px !important; } .openerp .oe_application .oe_form_sheetbg { background: url(/web/static/src/img/form_sheetbg.png); @@ -1701,10 +1811,10 @@ .openerp .oe_form_invisible { display: none !important; } -.openerp .oe_form_editable .oe_form_editable_hidden { +.openerp .oe_form_editable .oe_edit_only { display: none !important; } -.openerp .oe_form_readonly .oe_form_readonly_hidden, .openerp .oe_form_readonly .oe_form_field:empty { +.openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty { display: none !important; } .openerp .oe_form .oe_form_field_text { @@ -1773,9 +1883,6 @@ .openerp .oe_form .oe_form_field_datetime { width: 11em; } -.openerp .oe_form .oe_form_inline { - width: auto; -} .openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], @@ -2006,65 +2113,6 @@ border-left: 1px solid #666666; padding: 0 4px 0 4px; } -.openerp .oe_form_notebook { - margin: 8px 0; - padding: 0 8px; - list-style: none; - zoom: 1; -} -.openerp .oe_form_notebook:before, .openerp .oe_form_notebook:after { - display: table; - content: ""; - zoom: 1; -} -.openerp .oe_form_notebook:after { - clear: both; -} -.openerp .oe_form_notebook > li { - float: left; -} -.openerp .oe_form_notebook > li > a { - display: block; - color: #4c4c4c; -} -.openerp .oe_form_notebook { - border-color: #dddddd; - border-style: solid; - border-width: 0 0 1px; -} -.openerp .oe_form_notebook > li { - position: relative; - margin-bottom: -1px; -} -.openerp .oe_form_notebook > li > a { - padding: 0 12px; - margin-right: 2px; - line-height: 30px; - border: 1px solid transparent; - -moz-border-radius: 4px 4px 0 0; - -webkit-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.openerp .oe_form_notebook > li > a:hover { - text-decoration: none; - background-color: #eeeeee; - border-color: #eeeeee #eeeeee #dddddd; -} -.openerp .oe_form_notebook > li.ui-state-active > a, .openerp .oe_form_notebook > li.ui-state-active > a:hover { - background-color: white; - border: 1px solid #dddddd; - border-bottom-color: transparent; - cursor: default; -} -.openerp .oe_form_notebook_page { - padding: 0; -} -.openerp div.ui-tabs { - padding: 3px 0px 3px 0px; -} -.openerp .ui-tabs-hide { - display: none; -} .openerp .oe_form .oe_form_field_progressbar { display: inline-block; min-width: 70px; @@ -2091,64 +2139,29 @@ .openerp .oe_form .oe_form_field_progressbar.ui-progressbar .ui-widget-header { background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; } -.openerp .oe_form .oe_view_manager_header2 td { - padding: 0px 8px; - line-height: 16px; -} -.openerp .oe_form .oe_view_manager_header2 td .oe_i { - font-size: 13px; -} -.openerp .oe_form .oe_view_manager_header2 td .oe_pager_group { - height: auto; - line-height: 16px; -} -.openerp .oe_form .oe_view_manager_header2 td .oe_pager_group li { - height: auto; - line-height: 16px; -} -.openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager { - display: none !important; -} .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; } -.openerp .oe_form .oe_form_field_many2many > .oe-listview .oe_list_pager_single_page { +.openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top { display: none; } -.openerp .oe_form td.oe_form_group_cell_label { - border-right: 1px solid #dddddd; - padding: 2px 0px 2px 0px; +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td { + padding: 0px 8px; + line-height: 16px; } -.openerp .oe_form td.oe_form_group_cell_label label { - line-height: 18px; - display: block; - min-width: 120px; +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_i { + font-size: 13px; } -.openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { - padding-left: 8px; +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group { + height: auto; + line-height: 16px; } -.openerp .oe_form .oe_form_subtotal_footer { - width: auto; - float: right; +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_header2 td .oe_pager_group li { + height: auto; + line-height: 16px; } -.openerp .oe_form .oe_form_subtotal_footer td.oe_form_group_cell { - text-align: right; - padding: 0; -} -.openerp .oe_form .oe_form_subtotal_footer td.oe_form_group_cell_label { - border: none; -} -.openerp .oe_form .oe_form_subtotal_footer .oe_form_field { - width: auto !important; -} -.openerp .oe_form .oe_form_subtotal_footer .oe_form_subtotal_footer_separator { - border-top: 1px solid #cacaca; - font-size: 120%; - font-weight: bold; -} -.openerp .oe_form .oe_form_subtotal_footer label.oe_form_subtotal_footer_separator { - font-weight: bold !important; - padding: 2px 8px 2px 0px !important; +.openerp .oe_form .oe_form_field_many2many > .oe-listview .oe_list_pager_single_page { + display: none; } .openerp .oe-listview-content { width: 100%; @@ -2263,27 +2276,6 @@ .openerp .oe_trad_field.touched { border: 1px solid green !important; } -.openerp.oe_tooltip { - font-size: 12px; -} -.openerp.oe_tooltip .oe_tooltip_string { - color: #ffdd55; - font-weight: bold; - font-size: 13px; -} -.openerp.oe_tooltip .oe_tooltip_help { - white-space: pre-wrap; -} -.openerp.oe_tooltip .oe_tooltip_technical { - padding: 0 0 4px 0; - margin: 5px 0 0 15px; -} -.openerp.oe_tooltip .oe_tooltip_technical li { - list-style: circle; -} -.openerp.oe_tooltip .oe_tooltip_technical_title { - font-weight: bold; -} .openerp .oe_view_editor { width: 100%; border-collapse: collapse; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1640960be4f..2e59af56e70 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -36,7 +36,6 @@ $colour4: #8a89ba background-image: -o-linear-gradient(top, $startColor, $endColor) /* Opera 11.10+ */ background-image: linear-gradient(to bottom, $startColor, $endColor) - @mixin radial-gradient($gradient) background-position: center center background-image: -webkit-radial-gradient(circle, $gradient) @@ -91,24 +90,10 @@ $colour4: #8a89ba // }}} - .openerp.openerp-web-client-container height: 100% position: relative -// Jquery ui Overrides {{{ -.ui-widget - font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif - font-size: 13px -.ui-menu - .ui-menu-item - margin: 0 8px 0 0 - padding: 0 0 0 12px - width: auto - a.ui-state-active - background: #f0f0fa -// }}} - .openerp // Global style {{{ padding: 0 @@ -123,7 +108,6 @@ $colour4: #8a89ba text-decoration: none table padding: 0 - font-size: 13px border-collapse: collapse thead font-weight: bold @@ -145,11 +129,6 @@ $colour4: #8a89ba @include vertical-gradient(#f0f0fa, #eeeef6) .zebra tbody tr:hover td @include vertical-gradient(#eee, #dedede) - .numeric - text-align: right - width: 82px - input - text-align: right ul, li, ol margin: 0 padding: 0 @@ -162,34 +141,6 @@ $colour4: #8a89ba vertical-align: middle h4 margin: 4px 0 - - // }}} - // Generic classes {{{ - .oe_i - font-family: "mnmliconsRegular" !important - font-size: 21px - font-weight: 300 !important - .oe_e - font-family: "entypoRegular" !important - font-size: 34px - font-weight: 300 !important - .oe_left - float: left - margin-right: 8px - .oe_right - float: right - margin-left: 8px - .oe_text_right - text-align: right - .oe_clear - clear: both - .oe_wait - cursor: wait - .oe_fade - color: #888 - //font-size: 12px - .oe_bold - font-weight: bold // }}} // Button style {{{ a.button:link, a.button:visited, button, input[type='submit'] @@ -256,6 +207,211 @@ $colour4: #8a89ba @include vertical-gradient(#dc5f59, #b33630) // }}} + // Jquery ui Overrides {{{ + .ui-widget + font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif + font-size: 13px + .ui-menu + .ui-menu-item + margin: 0 8px 0 0 + padding: 0 0 0 12px + width: auto + a.ui-state-active + background: #f0f0fa + // }}} + // Generic classes {{{ + .oe_i + font-family: "mnmliconsRegular" !important + font-size: 21px + font-weight: 300 !important + .oe_e + font-family: "entypoRegular" !important + font-size: 34px + font-weight: 300 !important + .oe_left + float: left + margin-right: 8px + .oe_right + float: right + margin-left: 8px + .oe_text_right + text-align: right + .oe_clear + clear: both + .oe_wait + cursor: wait + .oe_fade + color: #888 + .oe_bold + font-weight: bold + .oe_inline  + width: auto + .oe_highlight + color: white + background: #DC5F59 + button.oe_highlight + @include vertical-gradient(#dc5f59, #b33630) + @include box-shadow(none) + button.oe_highlight:hover + background: #DF6B66 + @include vertical-gradient(#DF6B66, #BF3A33) + @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) + //.oe_avatar  + //.oe_button_box  + //.oe_edit_only  + // }}} + // Tooltips {{{ + &.oe_tooltip + font-size: 12px + .oe_tooltip_string + color: #FD5 + font-weight: bold + font-size: 13px + .oe_tooltip_help + white-space: pre-wrap + .oe_tooltip_technical + padding: 0 0 4px 0 + margin: 5px 0 0 15px + li + list-style: circle + .oe_tooltip_technical_title + font-weight: bold + // }}} + // Notebook {{{ + .oe_notebook + margin: 8px 0 + padding: 0 8px + list-style: none + zoom: 1 + .oe_notebook:before, .oe_notebook:after + display: table + content: "" + zoom: 1 + .oe_notebook:after + clear: both + .oe_notebook > li + float: left + .oe_notebook > li > a + display: block + color: #4c4c4c + .oe_notebook + border-color: #ddd + border-style: solid + border-width: 0 0 1px + .oe_notebook > li + position: relative + margin-bottom: -1px + .oe_notebook > li > a + padding: 0 12px + margin-right: 2px + line-height: 30px + border: 1px solid transparent + @include radius(4px 4px 0 0) + .oe_notebook > li > a:hover + text-decoration: none + background-color: #eee + border-color: #eee #eee #ddd + .oe_notebook > li.ui-state-active > a, .oe_notebook > li.ui-state-active > a:hover + background-color: #ffffff + border: 1px solid #ddd + border-bottom-color: transparent + cursor: default + .oe_notebook_page + padding: 0 + div.ui-tabs + padding: 3px 0px 3px 0px + .ui-tabs-hide + display: none + // }}} + // Dropdown {{{ + .oe_dropdown_toggle:after + width: 0 + height: 0 + display: inline-block + content: "&darr" + text-indent: -99999px + vertical-align: top + border-left: 4px solid transparent + border-right: 4px solid transparent + border-top: 4px solid white + @include opacity(0.5) + margin-top: 7px + margin-left: 6px + border-top-color: #404040 + .oe_dropdown_menu + display: none + position: absolute + top: 28px + left: 0px + padding: 8px + border: 1px solid #afafb6 + min-width: 120px + overflow-x: hidden + z-index: 900 + text-align: left + background: white + @include radius(3px) + @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) + li + &:hover + @include vertical-gradient(#f0f0fa, #eeeef6) + @include box-shadow(none) + position: relative + list-style-type: none + float: none + display: block + background-color: none + a + display: block + padding: 3px 6px + clear: both + font-weight: normal + line-height: 14px + color: #4c4c4c + text-decoration: none + cursor: pointer + &:hover + text-decoration: none + .oe_sidebar_delete_item + position: absolute + bottom: 1px + right: 4px + display: none + width: 12px + height: 12px + line-height: 12px + padding: 1px + color: #8786b7 + line-height: 8px + text-align: center + font-weight: bold + text-shadow: 0 1px 1px white + &:hover + text-decoration: none + color: white + background: #8786b7 + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) + @include radius(2px) + &:hover + .oe_sidebar_delete_item + display: inline-block + .oe_sidebar + white-space: nowrap + .oe_dropdown_menu li + padding-right: 16px + .oe_sidebar_add_attachment + cursor: pointer + padding-left: 6px + margin-top: 6px + span + font-weight: bold + .oe_hidden_input_file + width: 200px + &:hover + @include vertical-gradient(#f0f0fa, #eeeef6) + @include box-shadow(none) + // }}} + // Loading {{{ .oe_loading display: none @@ -409,7 +565,6 @@ $colour4: #8a89ba height: 31px border-top: solid 1px #d3d3d3 @include vertical-gradient(#646060, #262626) - .oe_topbar_item li float: left @@ -706,15 +861,13 @@ $colour4: #8a89ba > div height: 100% // }}} - - // ViewManager common styles + // ViewManager common {{{ .oe_view_manager .oe_view_manager_body height: inherit .oe_view_manager_view_kanban height: inherit - // ViewManager.header {{{ .oe_view_manager_header width: 100% .oe_header_row @@ -826,8 +979,7 @@ $colour4: #8a89ba .oe_vm_switch_diagram:after content: "f" // }}} - - // ViewManager top header specific style {{{ + // ViewManager application {{{ .oe_view_manager_global height: 100% > .oe_view_manager_header @@ -842,104 +994,9 @@ $colour4: #8a89ba td padding-top: 8px // }}} - - // ViewManager one2many specific style {{{ - .oe_form_field_one2many > .oe_view_manager - .oe_header_row_top - display: none - // }}} - - - // ViewManager.sidebar {{{ - .oe_form_dropdown_section - position: relative - display: inline-block - .oe_dropdown_toggle:after - width: 0 - height: 0 - display: inline-block - content: "&darr" - text-indent: -99999px - vertical-align: top - border-left: 4px solid transparent - border-right: 4px solid transparent - border-top: 4px solid white - @include opacity(0.5) - margin-top: 7px - margin-left: 6px - border-top-color: #404040 - .oe_dropdown_menu - display: none - position: absolute - top: 28px - left: 0px - padding: 8px - border: 1px solid #afafb6 - min-width: 120px - overflow-x: hidden - z-index: 900 - text-align: left - background: white - @include radius(3px) - @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) - li - &:hover - @include vertical-gradient(#f0f0fa, #eeeef6) - @include box-shadow(none) - position: relative - list-style-type: none - float: none - display: block - background-color: none - a - display: block - padding: 3px 6px - clear: both - font-weight: normal - line-height: 14px - color: #4c4c4c - text-decoration: none - cursor: pointer - &:hover - text-decoration: none - .oe_sidebar_delete_item - position: absolute - bottom: 1px - right: 4px - display: none - width: 12px - height: 12px - line-height: 12px - padding: 1px - color: #8786b7 - line-height: 8px - text-align: center - font-weight: bold - text-shadow: 0 1px 1px white - &:hover - text-decoration: none - color: white - background: #8786b7 - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) - @include radius(2px) - &:hover - .oe_sidebar_delete_item - display: inline-block - .oe_sidebar - white-space: nowrap - .oe_dropdown_menu li - padding-right: 16px - .oe_sidebar_add_attachment - cursor: pointer - padding-left: 6px - margin-top: 6px - span - font-weight: bold - .oe_hidden_input_file - width: 200px - &:hover - @include vertical-gradient(#f0f0fa, #eeeef6) - @include box-shadow(none) + // Viewmanager popup {{{ + .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager + display: none !important // }}} // SearchView {{{ .oe_searchview @@ -1244,6 +1301,9 @@ $colour4: #8a89ba line-height: 30px // }}} // FormView.body {{{ + .oe_form_dropdown_section + position: relative + display: inline-block .oe_formview background: white .oe_form_header @@ -1261,7 +1321,7 @@ $colour4: #8a89ba &:hover background: #ED6F6A // }}} - // FormView.customdivs {{{ + // FormView.custom tags and classes {{{ .oe_form header position: relative border-bottom: 1px solid #cacaca @@ -1317,16 +1377,33 @@ $colour4: #8a89ba .oe_form_steps_active font-weight: bold color: #b33630 - .oe_form_readonly - button.oe_form_button_hi - color: white - background: #DC5F59 - @include vertical-gradient(#dc5f59, #b33630) - @include box-shadow(none) - button.oe_form_button_hi:hover - background: #DF6B66 - @include vertical-gradient(#DF6B66, #BF3A33) - @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) + .oe_form + td.oe_form_group_cell_label + border-right: 1px solid #ddd + padding: 2px 0px 2px 0px + label + line-height: 18px + display: block + min-width: 120px + td.oe_form_group_cell + .oe_form_group_cell + padding-left: 8px + .oe_form_subtotal_footer + width: auto + float: right + td.oe_form_group_cell + text-align: right + padding: 0 + td.oe_form_group_cell_label + border: none + .oe_form_field + width: auto !important + .oe_form_subtotal_footer_separator + border-top: 1px solid #cacaca + font-size: 120% + font-weight: bold + label.oe_form_subtotal_footer_separator + font-weight: bold !important + padding: 2px 8px 2px 0px !important .oe_application .oe_form_sheetbg background: url(/web/static/src/img/form_sheetbg.png) @@ -1346,10 +1423,10 @@ $colour4: #8a89ba // FormView.layout {{{ .oe_form_invisible display: none !important - .oe_form_editable .oe_form_editable_hidden + .oe_form_editable .oe_edit_only display: none !important .oe_form_readonly - .oe_form_readonly_hidden, .oe_form_field:empty + .oe_edit_only, .oe_form_field:empty display: none !important .oe_form .oe_form_field_text @@ -1414,8 +1491,6 @@ $colour4: #8a89ba width: 7em .oe_form_field_datetime width: 11em - .oe_form_inline - width: auto input[type="text"], input[type="password"], @@ -1553,12 +1628,6 @@ $colour4: #8a89ba .oe_form_button > img vertical-align: -3px padding: 0 2px - // From FP: .oe_form_group_cell > .oe_form_button.oe_button - // From FP: display: block - // From FP: white-space: nowrap - // From FP: min-width: 100% - // From FP: width: 100% - // }}} // FormView.binaryfile {{{ /* http://www.quirksmode.org/dom/inputfile.html @@ -1620,53 +1689,6 @@ $colour4: #8a89ba border-left: 1px solid #666 padding: 0 4px 0 4px // }}} - // FormView.notebook {{{ - .oe_form_notebook - margin: 8px 0 - padding: 0 8px - list-style: none - zoom: 1 - .oe_form_notebook:before, .oe_form_notebook:after - display: table - content: "" - zoom: 1 - .oe_form_notebook:after - clear: both - .oe_form_notebook > li - float: left - .oe_form_notebook > li > a - display: block - color: #4c4c4c - .oe_form_notebook - border-color: #ddd - border-style: solid - border-width: 0 0 1px - .oe_form_notebook > li - position: relative - margin-bottom: -1px - .oe_form_notebook > li > a - padding: 0 12px - margin-right: 2px - line-height: 30px - border: 1px solid transparent - @include radius(4px 4px 0 0) - .oe_form_notebook > li > a:hover - text-decoration: none - background-color: #eee - border-color: #eee #eee #ddd - .oe_form_notebook > li.ui-state-active > a, .oe_form_notebook > li.ui-state-active > a:hover - background-color: #ffffff - border: 1px solid #ddd - border-bottom-color: transparent - cursor: default - .oe_form_notebook_page - padding: 0 - div.ui-tabs - padding: 3px 0px 3px 0px - .ui-tabs-hide - display: none - - // }}} // FormView.progressbar {{{ .oe_form .oe_form_field_progressbar @@ -1689,8 +1711,13 @@ $colour4: #8a89ba .ui-widget-header background: #cccccc url(/web/static/lib/jquery.ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x // }}} - // FormView.viewmanager {{{ - .oe_form + // FormView.one2many {{{ + .oe_form .oe_form_field_one2many > .oe_view_manager + .oe_list_pager_single_page + display: none + .oe_form_field_one2many > .oe_view_manager + .oe_header_row_top + display: none .oe_view_manager_header2 td padding: 0px 8px @@ -1703,49 +1730,12 @@ $colour4: #8a89ba li height: auto line-height: 16px - .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager - display: none !important - - // }}} - // FormView.one2many {{{ - .oe_form .oe_form_field_one2many > .oe_view_manager - .oe_list_pager_single_page - display: none // }}} // FormView.many2many {{{ .oe_form .oe_form_field_many2many > .oe-listview .oe_list_pager_single_page display: none // }}} - // FormView.classes for openerp views {{{ - .oe_form - td.oe_form_group_cell_label - border-right: 1px solid #ddd - padding: 2px 0px 2px 0px - label - line-height: 18px - display: block - min-width: 120px - td.oe_form_group_cell + .oe_form_group_cell - padding-left: 8px - .oe_form_subtotal_footer - width: auto - float: right - td.oe_form_group_cell - text-align: right - padding: 0 - td.oe_form_group_cell_label - border: none - .oe_form_field - width: auto !important - .oe_form_subtotal_footer_separator - border-top: 1px solid #cacaca - font-size: 120% - font-weight: bold - label.oe_form_subtotal_footer_separator - font-weight: bold !important - padding: 2px 8px 2px 0px !important - // }}} // ListView {{{ .oe-listview-content width: 100% @@ -1782,15 +1772,6 @@ $colour4: #8a89ba visibility: visible @include box-shadow(none) @include opacity(0.6) - // TODO mit - //th:hover:after - // border-bottom: none - // border-left: 4px solid transparent - // border-right: 4px solid transparent - // border-top: 4px solid #000 - // visibility: visible - // @include box-shadow(none) - // @include opacity(0.6) > tbody cursor: pointer background: white @@ -1833,23 +1814,6 @@ $colour4: #8a89ba .oe_trad_field.touched border: 1px solid green !important // }}} - // Tooltips {{{ - &.oe_tooltip - font-size: 12px - .oe_tooltip_string - color: #FD5 - font-weight: bold - font-size: 13px - .oe_tooltip_help - white-space: pre-wrap - .oe_tooltip_technical - padding: 0 0 4px 0 - margin: 5px 0 0 15px - li - list-style: circle - .oe_tooltip_technical_title - font-weight: bold - // }}} // View Editor {{{ .oe_view_editor width: 100% @@ -1869,6 +1833,7 @@ $colour4: #8a89ba .oe_view_editor tr:hover background-color: #ecebf2 // }}} + // Debugging stuff {{{ .oe_layout_debugging .oe_form_group @@ -1886,7 +1851,6 @@ $colour4: #8a89ba float: right .oe_form_group_row_incomplete.oe_form_group_row_newline > td:last-child:after content: "[newline]" - .oe_debug_view float: left .oe_debug_view_log @@ -1904,7 +1868,6 @@ $colour4: #8a89ba float: right color: #333 // }}} - // Kitten Mode {{{ .kitten-mode-activated background-image: url(http://placekitten.com/g/1365/769) @@ -1913,7 +1876,6 @@ $colour4: #8a89ba >* opacity: 0.70 // }}} - // Transitional overrides for old styles {{{ .openerp .oe_form_field_many2one diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 2a51e179f08..5e43fdf58a1 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -117,7 +117,7 @@
-
    +
    • Create
    • Drop
    • Backup
      • @@ -616,7 +616,7 @@
      - or Import @@ -768,7 +768,7 @@ -
      +
      @@ -1022,7 +1022,7 @@ -
      +
      -
      -
      +
      + +
      -
      -
      +
      +

      -

      ,

      -

      - +

      @@ -136,11 +136,11 @@       X
      - +
      diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 19a2ff6d950..e4e70fac7ed 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -82,12 +82,12 @@
      - +
      -
      -