From b6a366003783b908ba68dd0502b9a8e3f1cbb129 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 21 May 2012 16:59:02 +0200 Subject: [PATCH 01/27] [ADD] anonymous module (part 1) bzr revid: chs@openerp.com-20120521145902-cjea5015c8koboe1 --- addons/anonymous/__init__.py | 1 + addons/anonymous/__openerp__.py | 15 +++++++++++++++ addons/anonymous/anonymous.yml | 8 ++++++++ addons/anonymous/controllers/__init__.py | 1 + addons/anonymous/controllers/public.py | 17 +++++++++++++++++ addons/anonymous/static/src/js/anonymous.js | 4 ++++ 6 files changed, 46 insertions(+) create mode 100644 addons/anonymous/__init__.py create mode 100644 addons/anonymous/__openerp__.py create mode 100644 addons/anonymous/anonymous.yml create mode 100644 addons/anonymous/controllers/__init__.py create mode 100644 addons/anonymous/controllers/public.py create mode 100644 addons/anonymous/static/src/js/anonymous.js diff --git a/addons/anonymous/__init__.py b/addons/anonymous/__init__.py new file mode 100644 index 00000000000..ee5959455ad --- /dev/null +++ b/addons/anonymous/__init__.py @@ -0,0 +1 @@ +import controllers diff --git a/addons/anonymous/__openerp__.py b/addons/anonymous/__openerp__.py new file mode 100644 index 00000000000..d31e4017f60 --- /dev/null +++ b/addons/anonymous/__openerp__.py @@ -0,0 +1,15 @@ +{ + 'name': 'Anonymous', + 'description': 'Allow anonymous access to OpenERP', + 'author': 'OpenERP SA', + 'version': '1.0', + 'category': 'Tools', + 'website': 'http://www.openerp.com', + 'installable': True, + 'data': [ + 'anonymous.yml', + ], + 'js': [ + 'static/src/js/anonymous.js', + ], +} diff --git a/addons/anonymous/anonymous.yml b/addons/anonymous/anonymous.yml new file mode 100644 index 00000000000..014c2868a08 --- /dev/null +++ b/addons/anonymous/anonymous.yml @@ -0,0 +1,8 @@ +- + !record {model: res.users, id: user}: + name: Anonymous + login: anonymous + password: anonymous + groups_id: [] + avatar: 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 + diff --git a/addons/anonymous/controllers/__init__.py b/addons/anonymous/controllers/__init__.py new file mode 100644 index 00000000000..f6eefcae301 --- /dev/null +++ b/addons/anonymous/controllers/__init__.py @@ -0,0 +1 @@ +import public diff --git a/addons/anonymous/controllers/public.py b/addons/anonymous/controllers/public.py new file mode 100644 index 00000000000..ff3516f7109 --- /dev/null +++ b/addons/anonymous/controllers/public.py @@ -0,0 +1,17 @@ +import werkzeug + +from openerp.addons.web.common import http as oeweb +from openerp.addons.web.controllers.main import db_list + +class PublicController(oeweb.Controller): + _cp_path = '/public' + + @oeweb.httprequest + def index(self, req): + dbs = db_list(req) + dbs = ['trunk_anonymous'] + if len(dbs) == 1: + url = '/web/webclient/login?db=%s&login=anonymous&key=anonymous' % (dbs[0],) + else: + url = '/' + return werkzeug.utils.redirect(url) diff --git a/addons/anonymous/static/src/js/anonymous.js b/addons/anonymous/static/src/js/anonymous.js new file mode 100644 index 00000000000..32350a6b56d --- /dev/null +++ b/addons/anonymous/static/src/js/anonymous.js @@ -0,0 +1,4 @@ +openerp.anonymous = function(instance) { + // TODO change User menu + +}; From 6665eba38405cca9e9509df62b474468e0b23fab Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Wed, 23 May 2012 18:37:58 +0200 Subject: [PATCH 02/27] [IMP] anonymous: do login from js bzr revid: chs@openerp.com-20120523163758-jc2vzpoe03lw4wvz --- addons/anonymous/static/src/js/anonymous.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/addons/anonymous/static/src/js/anonymous.js b/addons/anonymous/static/src/js/anonymous.js index 32350a6b56d..e73bb3f02d6 100644 --- a/addons/anonymous/static/src/js/anonymous.js +++ b/addons/anonymous/static/src/js/anonymous.js @@ -1,4 +1,21 @@ openerp.anonymous = function(instance) { // TODO change User menu + instance.web.WebClient.include({ + show_login: function() { + var self = this, _super = this._super; + this.login.load_db_list().then(function() { + var dblist = self.login._db_list; + if (dblist && dblist.length === 1) { + // XXX get login/pass from server (via a rpc call) ? + self.login.do_login(dblist[0], 'anonymous', 'anonymous').fail(function() { + _super.apply(self, []); + }); + } else { + _super.apply(self, []); + } + }); + }, + }); + }; From f0abeb01cd75089735c940ac7f441b4de2ff7ecc Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Wed, 23 May 2012 18:51:53 +0200 Subject: [PATCH 03/27] [FIX] anonymous: comment test code bzr revid: chs@openerp.com-20120523165153-8c5m4yihczwsnsmq --- addons/anonymous/controllers/public.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/anonymous/controllers/public.py b/addons/anonymous/controllers/public.py index ff3516f7109..9272c456152 100644 --- a/addons/anonymous/controllers/public.py +++ b/addons/anonymous/controllers/public.py @@ -1,7 +1,10 @@ import werkzeug from openerp.addons.web.common import http as oeweb -from openerp.addons.web.controllers.main import db_list +#from openerp.addons.web.controllers.main import db_list + +def db_list(r): + return ['trunk_anonymous'] class PublicController(oeweb.Controller): _cp_path = '/public' @@ -9,7 +12,6 @@ class PublicController(oeweb.Controller): @oeweb.httprequest def index(self, req): dbs = db_list(req) - dbs = ['trunk_anonymous'] if len(dbs) == 1: url = '/web/webclient/login?db=%s&login=anonymous&key=anonymous' % (dbs[0],) else: From 3be6d4ef096daefff55d1143b0f0f58fb84aef5a Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Tue, 29 May 2012 18:17:48 +0530 Subject: [PATCH 04/27] [IMP]hr: Improve employee view kanban and leaves management bzr revid: mma@tinyerp.com-20120529124748-l4nqh230k9zat6yq --- addons/hr/hr.py | 1 + addons/hr/hr_view.xml | 34 +++++++++++++++++++++---- addons/hr_holidays/hr_holidays.py | 1 - addons/hr_holidays/hr_holidays_view.xml | 12 +++------ 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 9d1ba1c9f05..32c291044c0 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -209,6 +209,7 @@ class hr_employee(osv.osv): 'color': fields.integer('Color Index'), 'city': fields.related('address_id', 'city', type='char', string='City'), 'login': fields.related('user_id', 'login', type='char', string='Login', readonly=1), + 'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1), } def unlink(self, cr, uid, ids, context=None): diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 32eb3a84c83..7a3b294d5be 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -41,8 +41,6 @@ - - @@ -65,12 +63,12 @@ - + - + @@ -130,6 +128,7 @@ kanban +
@@ -139,6 +138,11 @@

()

    +
  • + + + +
  • Tel:
    • @@ -424,7 +428,27 @@ - + + + hr.job.employee.form + hr.job + form + 20 + +
    + + + + + + + + + + + +
    + Job Positions hr.job diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index 4e68cdfb2f9..d44bf71ef91 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -513,7 +513,6 @@ class hr_employee(osv.osv): 'current_leave_id': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Type",type='many2one', relation='hr.holidays.status'), 'leave_date_from': fields.function(_get_leave_status, multi='leave_status', type='date', string='From Date'), 'leave_date_to': fields.function(_get_leave_status, multi='leave_status', type='date', string='To Date'), - 'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1) } hr_employee() diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 32cdcb53011..35f0d0fa37c 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -303,7 +303,7 @@ - + Requests Approve @@ -512,8 +512,8 @@ - - + + @@ -525,20 +525,16 @@ - -
  • +
  • - - -
    • From f90e53c96a7e9d14a48737efddd0d44d300880fd Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 29 May 2012 16:30:51 +0200 Subject: [PATCH 05/27] [IMP] anomymous: yml -> xml bzr revid: chs@openerp.com-20120529143051-m9kchh0hs6g7ofh8 --- addons/anonymous/__openerp__.py | 2 +- addons/anonymous/anonymous.xml | 12 ++++++++++++ addons/anonymous/anonymous.yml | 8 -------- 3 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 addons/anonymous/anonymous.xml delete mode 100644 addons/anonymous/anonymous.yml diff --git a/addons/anonymous/__openerp__.py b/addons/anonymous/__openerp__.py index d31e4017f60..df43478d3a3 100644 --- a/addons/anonymous/__openerp__.py +++ b/addons/anonymous/__openerp__.py @@ -7,7 +7,7 @@ 'website': 'http://www.openerp.com', 'installable': True, 'data': [ - 'anonymous.yml', + 'anonymous.xml', ], 'js': [ 'static/src/js/anonymous.js', diff --git a/addons/anonymous/anonymous.xml b/addons/anonymous/anonymous.xml new file mode 100644 index 00000000000..36be96db5ad --- /dev/null +++ b/addons/anonymous/anonymous.xml @@ -0,0 +1,12 @@ + + + + + Anonymous + anonymous + anonymous + + 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 + + + diff --git a/addons/anonymous/anonymous.yml b/addons/anonymous/anonymous.yml deleted file mode 100644 index 014c2868a08..00000000000 --- a/addons/anonymous/anonymous.yml +++ /dev/null @@ -1,8 +0,0 @@ -- - !record {model: res.users, id: user}: - name: Anonymous - login: anonymous - password: anonymous - groups_id: [] - avatar: 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 - From b68e86b89c3f1c8f2b1156da64475e3599a7546d Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Wed, 30 May 2012 17:59:12 +0530 Subject: [PATCH 06/27] [IMP] hr_holidays: small improvemnt in kanban or employee bzr revid: psi@tinyerp.com-20120530122912-vqzv3q39yvdxj7qm --- addons/hr_holidays/hr_holidays_view.xml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index b3fa870def0..faf6ec54511 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -528,14 +528,12 @@ - -
  • - - - - + + + + -
    • +     From 2bf24f9a0ae423d0cdb09effe6a2dc04ef23834b Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Wed, 30 May 2012 18:03:43 +0530 Subject: [PATCH 07/27] [IMP] hr: misc bzr revid: psi@tinyerp.com-20120530123343-i3qe7u1a80xxfdmc --- addons/hr/hr_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 7a3b294d5be..af3a64ad211 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -426,14 +426,14 @@ -     - + + hr.job.employee.form hr.job form - 20 + 20
    From 4de3f2032e0bee154465570f58ac5fef4f07cfd9 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 5 Jun 2012 14:46:37 +0200 Subject: [PATCH 08/27] [IMP] anonymous: change UserMenu when logged as anonymous bzr revid: chs@openerp.com-20120605124637-2h2ln3211yqlpxcp --- addons/anonymous/__openerp__.py | 3 +++ addons/anonymous/static/src/js/anonymous.js | 25 ++++++++++++++++++- addons/anonymous/static/src/xml/anonymous.xml | 17 +++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 addons/anonymous/static/src/xml/anonymous.xml diff --git a/addons/anonymous/__openerp__.py b/addons/anonymous/__openerp__.py index df43478d3a3..36b45c3e5e9 100644 --- a/addons/anonymous/__openerp__.py +++ b/addons/anonymous/__openerp__.py @@ -12,4 +12,7 @@ 'js': [ 'static/src/js/anonymous.js', ], + 'qweb': [ + 'static/src/xml/anonymous.xml', + ], } diff --git a/addons/anonymous/static/src/js/anonymous.js b/addons/anonymous/static/src/js/anonymous.js index e73bb3f02d6..a28c56ac411 100644 --- a/addons/anonymous/static/src/js/anonymous.js +++ b/addons/anonymous/static/src/js/anonymous.js @@ -1,5 +1,6 @@ openerp.anonymous = function(instance) { - // TODO change User menu + + instance.web.client_actions.add("login", "instance.web.Login"); instance.web.WebClient.include({ show_login: function() { @@ -7,6 +8,7 @@ openerp.anonymous = function(instance) { this.login.load_db_list().then(function() { var dblist = self.login._db_list; if (dblist && dblist.length === 1) { + self.login.remember_credentials = false; // XXX get login/pass from server (via a rpc call) ? self.login.do_login(dblist[0], 'anonymous', 'anonymous').fail(function() { _super.apply(self, []); @@ -18,4 +20,25 @@ openerp.anonymous = function(instance) { }, }); + + instance.web.UserMenu.include({ + init: function(parent) { + this._super(parent); + if (this.session.username == 'anonymous') { + this.template = 'UserMenu.anonymous'; + this.do_update = function() {}; // avoid change of avatar + } + }, + start: function() { + var self = this; + this._super.apply(this, arguments); + this.$element.find('.oe_topbar_anonymous_login').click(function() { + var p = self.getParent(); + var am = p.action_manager; + am.do_action({type:'ir.actions.client', tag:'login'}); + am.client_widget.on('login', p, p.show_application); + }); + } + }); + }; diff --git a/addons/anonymous/static/src/xml/anonymous.xml b/addons/anonymous/static/src/xml/anonymous.xml new file mode 100644 index 00000000000..afa0ac545a6 --- /dev/null +++ b/addons/anonymous/static/src/xml/anonymous.xml @@ -0,0 +1,17 @@ + + + + + + + + + From d38dcb8473598b11480284e1ea1fa1447c73062a Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 5 Jun 2012 14:47:58 +0200 Subject: [PATCH 09/27] [IMP] anomymous: remove /public controller bzr revid: chs@openerp.com-20120605124758-u7fsjdldwnc0y2on --- addons/anonymous/__init__.py | 1 - addons/anonymous/controllers/__init__.py | 1 - addons/anonymous/controllers/public.py | 19 ------------------- 3 files changed, 21 deletions(-) delete mode 100644 addons/anonymous/controllers/__init__.py delete mode 100644 addons/anonymous/controllers/public.py diff --git a/addons/anonymous/__init__.py b/addons/anonymous/__init__.py index ee5959455ad..e69de29bb2d 100644 --- a/addons/anonymous/__init__.py +++ b/addons/anonymous/__init__.py @@ -1 +0,0 @@ -import controllers diff --git a/addons/anonymous/controllers/__init__.py b/addons/anonymous/controllers/__init__.py deleted file mode 100644 index f6eefcae301..00000000000 --- a/addons/anonymous/controllers/__init__.py +++ /dev/null @@ -1 +0,0 @@ -import public diff --git a/addons/anonymous/controllers/public.py b/addons/anonymous/controllers/public.py deleted file mode 100644 index 9272c456152..00000000000 --- a/addons/anonymous/controllers/public.py +++ /dev/null @@ -1,19 +0,0 @@ -import werkzeug - -from openerp.addons.web.common import http as oeweb -#from openerp.addons.web.controllers.main import db_list - -def db_list(r): - return ['trunk_anonymous'] - -class PublicController(oeweb.Controller): - _cp_path = '/public' - - @oeweb.httprequest - def index(self, req): - dbs = db_list(req) - if len(dbs) == 1: - url = '/web/webclient/login?db=%s&login=anonymous&key=anonymous' % (dbs[0],) - else: - url = '/' - return werkzeug.utils.redirect(url) From b69ad4590410b31c237701ea8000cddf14cc53c3 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 12 Jun 2012 13:52:05 +0200 Subject: [PATCH 10/27] [ADD] Added oe_form_field_one2many classname bzr revid: fme@openerp.com-20120612115205-3wj6odknj61qpvit --- addons/web/static/src/js/view_form.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 134f3f7b1d3..8f14431ac17 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2741,6 +2741,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ }, start: function() { this._super.apply(this, arguments); + this.$element.addClass('oe_form_field_one2many'); var self = this; From 8121627ff0c122c4aa37cad1a5a6aba3ccf3b20f Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 11 Jun 2012 10:50:19 +0200 Subject: [PATCH 11/27] [FIX] broken unit tests bzr revid: xmo@openerp.com-20120611085019-hk9hz31yctmr5qcn --- addons/web/static/src/xml/base.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index e2d4798225a..c48fff4c1f5 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1409,10 +1409,10 @@ -
    +
    -
    +

    M Custom Filters

      From 80950bd071d4f284b2c5a07892bdb1d1f6bdc344 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Tue, 12 Jun 2012 11:40:22 +0200 Subject: [PATCH 12/27] [FIX] anonymous: correct dependencies bzr revid: chs@openerp.com-20120612094022-k5c601sqsizlc7yc --- addons/anonymous/__openerp__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/anonymous/__openerp__.py b/addons/anonymous/__openerp__.py index 36b45c3e5e9..6babe973aba 100644 --- a/addons/anonymous/__openerp__.py +++ b/addons/anonymous/__openerp__.py @@ -6,6 +6,7 @@ 'category': 'Tools', 'website': 'http://www.openerp.com', 'installable': True, + 'depends': ['web'], 'data': [ 'anonymous.xml', ], From 250ae50514a2371c0db49aa25380d0608ab93b86 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 12 Jun 2012 14:19:47 +0200 Subject: [PATCH 13/27] [FIX] box-shadow mixin bzr revid: xmo@openerp.com-20120612121947-67c59hg3fmzwanp3 --- addons/web/static/src/css/base.css | 72 ++++++++++++++--------------- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 0daae4da3c4..aca2a7f0c2a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -177,7 +177,7 @@ border-radius: 3px; -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; - -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); -webkit-font-smoothing: antialiased; outline: none; @@ -203,7 +203,7 @@ background-image: linear-gradient(to bottom, #f6f6f6, #e3e3e3); -moz-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; -webkit-box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; - -box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; + box-shadow: 0 0 3px #80bfff, 0 1px 1px rgba(255, 255, 255, 0.8) inset; } .openerp a.button:active, .openerp a.button.active, .openerp button:active, .openerp button.active, .openerp input[type='submit']:active, .openerp input[type='submit'].active { background: #e3e3e3; @@ -212,14 +212,14 @@ background: linear-gradient(top, #e3e3e3, #f6f6f6) #1b468f; -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; } .openerp a.button.disabled, .openerp button:disabled, .openerp input[type='submit']:disabled { background: #efefef !important; border: 1px solid #d1d1d1 !important; -moz-box-shadow: none !important; -webkit-box-shadow: none !important; - -box-shadow: none !important; + box-shadow: none !important; color: #aaaaaa !important; cursor: default; text-shadow: 0 1px 1px white !important; @@ -235,7 +235,7 @@ background-image: linear-gradient(to bottom, #dc5f59, #b33630); -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; } .openerp button.primary:hover { background-color: #df6b66; @@ -247,7 +247,7 @@ 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); + box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); } .openerp button.primary:active { background-color: #b33630; @@ -259,7 +259,7 @@ background-image: linear-gradient(to bottom, #b33630, #dc5f59); -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; } .openerp button.following { color: white; @@ -334,7 +334,7 @@ border-radius: 4px; -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; - -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; } .openerp .oe_login input, .openerp .oe_login select { width: 252px; @@ -343,7 +343,7 @@ background: whitesmoke; -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); - -box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); + box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -403,7 +403,7 @@ border-radius: 8px; -moz-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); - -box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); + box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); } .openerp .oe_login .oe_login_pane h2 { margin-top: 0; @@ -447,7 +447,7 @@ border-radius: 4px; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8); -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8); - -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.8); } .openerp .oe_login_invalid .oe_login_error_message { display: inline-block; @@ -501,7 +501,7 @@ color: white; -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } .openerp .oe_topbar .oe_topbar_item .oe_active { background: #303030; @@ -509,7 +509,7 @@ color: white; -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } .openerp .oe_topbar .oe_topbar_avatar { width: 24px; @@ -611,7 +611,7 @@ border-radius: 0 0 6px 6px; -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); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; @@ -640,7 +640,7 @@ background-image: linear-gradient(to bottom, #292929, #191919); -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; } .openerp .oe_user_menu .oe_dropdown_options li hr { border-top: 1px solid #999999; @@ -678,7 +678,7 @@ border-radius: 0 0 6px 6px; -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); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); -webkit-background-clip: padding-box; -moz-background-clip: padding-box; background-clip: padding-box; @@ -706,7 +706,7 @@ background-image: linear-gradient(to bottom, #292929, #191919); -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; } .openerp .oe_menu { float: left; @@ -730,7 +730,7 @@ color: white; -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } .openerp .oe_menu .oe_active { background: #303030; @@ -738,7 +738,7 @@ color: white; -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } .openerp .oe_menu_more_container { position: relative; @@ -794,7 +794,7 @@ border-radius: 4px; -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); - -box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); } .openerp .oe_secondary_submenu .oe_menu_counter { float: right; @@ -816,7 +816,7 @@ text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); - -box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); } .openerp .oe_secondary_submenu .oe_active a { color: white; @@ -827,7 +827,7 @@ text-shadow: 0 1px 1px white; -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - -box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); } .openerp .oe_secondary_submenu .oe_active .oe_menu_counter { background: #eeeeee; @@ -879,7 +879,7 @@ background-image: linear-gradient(to bottom, #fcfcfc, #dedede); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); - -box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1); } .openerp .oe_view_manager_header .oe_header_row { clear: both; @@ -934,7 +934,7 @@ background: #999999; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; - -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; } .openerp .oe_view_manager_header .oe_button_group .active a { color: white; @@ -982,7 +982,7 @@ background: #999999; -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; - -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3) inset; } .openerp .oe_pager_group .active a { color: white; @@ -1063,7 +1063,7 @@ 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); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); } .openerp .oe_dropdown_menu li { list-style-type: none; @@ -1092,7 +1092,7 @@ background-image: linear-gradient(to bottom, #f0f0fa, #eeeef6); -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; } .openerp .oe_sidebar { white-space: nowrap; @@ -1111,7 +1111,7 @@ border-radius: 13px; -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; - -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; } .openerp .oe_searchview input, .openerp .oe_searchview textarea { padding: 3px; @@ -1127,7 +1127,7 @@ border-color: #a6a6fe; -moz-box-shadow: 0 1px 2px #a6a6fe inset; -webkit-box-shadow: 0 1px 2px #a6a6fe inset; - -box-shadow: 0 1px 2px #a6a6fe inset; + box-shadow: 0 1px 2px #a6a6fe inset; } .openerp .oe_searchview .oe_searchview_clear { cursor: pointer; @@ -1210,7 +1210,7 @@ border-color: #a6a6fe; -moz-box-shadow: 0 0 3px 1px #a6a6fe; -webkit-box-shadow: 0 0 3px 1px #a6a6fe; - -box-shadow: 0 0 3px 1px #a6a6fe; + box-shadow: 0 0 3px 1px #a6a6fe; } .openerp .oe_searchview .oe_searchview_facets .oe_searchview_facet .oe_facet_values { background: #f0f0fa; @@ -1276,7 +1276,7 @@ border-radius: 4px; -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); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); } .openerp .oe_searchview .oe_searchview_drawer > div { border-top: 1px solid #cccccc; @@ -1314,7 +1314,7 @@ padding: 0 2px; -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; @@ -1610,7 +1610,7 @@ border: 1px solid #afafb6; -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); - -box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); + box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); } .openerp .oe_form_invisible { display: none !important; @@ -1729,7 +1729,7 @@ padding-left: 8px; -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; @@ -2105,7 +2105,7 @@ visibility: visible; -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; filter: alpha(opacity=60); opacity: 0.6; } @@ -2128,7 +2128,7 @@ padding: 0; -moz-box-shadow: none; -webkit-box-shadow: none; - -box-shadow: none; + box-shadow: none; } .openerp .oe-listview-content > tbody > tr > td.oe_list_checkbox:first-child, .openerp .oe-listview-content > tbody > tr th.oe_list_checkbox:first-child { width: 17px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 616caac7739..66398bc899d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -52,7 +52,7 @@ $colour4: #8a89ba @mixin box-shadow($bsval: 0px 1px 4px #777) -moz-box-shadow: $bsval -webkit-box-shadow: $bsval - -box-shadow: $bsval + box-shadow: $bsval @mixin transition($transval: (border linear 0.2s, box-shadow linear 0.2s)) -webkit-transition: $transval From 762b602ecebb80519c9af67239d15f91d7fff31f Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 12 Jun 2012 14:25:58 +0200 Subject: [PATCH 14/27] [IMP] hr: improve employee form bzr revid: rco@openerp.com-20120612122558-bzaqf1dd5z14975k --- addons/hr/hr_view.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index cf6ef3226e3..a69ab432d35 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -31,16 +31,17 @@
      - + @@ -71,7 +72,7 @@ - + From 554195630b2a184babee7ef43a951c62cd377d46 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 12 Jun 2012 15:15:43 +0200 Subject: [PATCH 15/27] [IMP] Improved o2m and m2m viewmanager/listview styling bzr revid: fme@openerp.com-20120612131543-qmltlt7p1h8g5xk5 --- addons/web/static/src/css/base.css | 6 ++++++ addons/web/static/src/css/base.sass | 10 ++++++++++ addons/web/static/src/js/view_form.js | 5 +++-- addons/web/static/src/js/view_list.js | 1 + addons/web/static/src/xml/base.xml | 8 ++++---- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index aca2a7f0c2a..40a97e92f2e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2026,6 +2026,12 @@ .openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager { display: none; } +.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 { + display: none; +} .openerp .oe_form td.oe_form_group_cell_label { border-right: 1px solid #dddddd; padding: 2px 0px 2px 0px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 66398bc899d..d53d66363a2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1674,6 +1674,16 @@ $colour4: #8a89ba display: none // }}} + // 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 diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 8f14431ac17..7a51cbce3c5 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3283,6 +3283,7 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({ }, start: function() { this._super.apply(this, arguments); + this.$element.addClass('oe_form_field_many2many'); var self = this; @@ -3291,7 +3292,7 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({ this.dataset.on_unlink.add_last(function(ids) { self.dataset_changed(); }); - + this.is_setted.then(function() { self.load_view(); }); @@ -3304,7 +3305,7 @@ instance.web.form.FieldMany2Many = instance.web.form.AbstractField.extend({ }); }); }); - }) + }); }, set_value: function(value_) { value_ = value_ || []; diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index de73ec21884..a90dabe1b4c 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -364,6 +364,7 @@ instance.web.ListView = instance.web.View.extend( /** @lends instance.web.ListVi } var total = dataset.size(); + this.$pager.toggleClass('oe_list_pager_single_page', (total <= this.limit())); var spager = '-'; if (total) { var range_start = this.page * this.limit() + 1; diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c48fff4c1f5..5e3df49b89b 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -404,7 +404,7 @@ - +

      @@ -642,8 +642,8 @@
      - - or Import @@ -1204,7 +1204,7 @@ - + this.attr('t-if', 'views.length != 1'); From f48bf470246c7b04e440465ef6a30b6c099202d8 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 12 Jun 2012 15:34:37 +0200 Subject: [PATCH 16/27] [IMP] Improved sass mixin usage bzr revid: fme@openerp.com-20120612133437-19d75fct3g844p84 --- addons/web/static/src/css/base.css | 48 +++++++++++++++-------- addons/web/static/src/css/base.sass | 61 +++++++++-------------------- 2 files changed, 51 insertions(+), 58 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 40a97e92f2e..bbb412da384 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1324,8 +1324,9 @@ width: 100%; } .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_section > div { - -moz-box-sizing: border-box; -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; box-sizing: border-box; display: table-cell; width: 50%; @@ -1488,12 +1489,16 @@ .openerp .oe_form_button_save_dirty { color: white; background: #dc5f59; - background: -moz-linear-gradient(#dc5f59, #b33630); - background: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); - background: -webkit-linear-gradient(#dc5f59, #b33630); + 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; + box-shadow: none; font-weight: bold; } .openerp .oe_form_button_save_dirty:hover { @@ -1577,21 +1582,29 @@ .openerp .oe_form_readonly button.oe_form_button_hi { color: white; background: #dc5f59; - background: -moz-linear-gradient(#dc5f59, #b33630); - background: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); - background: -webkit-linear-gradient(#dc5f59, #b33630); + 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; + box-shadow: none; } .openerp .oe_form_readonly button.oe_form_button_hi:hover { background: #df6b66; - background: -moz-linear-gradient(#df6b66, #bf3a33); - background: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33)); - background: -webkit-linear-gradient(#df6b66, #bf3a33); + 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); + box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); } .openerp .oe_application .oe_form_sheetbg { background: url(/web/static/src/img/form_sheetbg.png); @@ -1702,8 +1715,8 @@ .openerp .oe_form input[type="file"], .openerp .oe_form select, .openerp .oe_form textarea { - -moz-box-sizing: border-box; -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; padding: 0 2px; @@ -1766,6 +1779,9 @@ } .openerp .oe_form .oe_form_field_many2manytags .oe_form_field_many2manytags_box { border-radius: 2px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; box-sizing: border-box; position: relative; float: left; @@ -1899,8 +1915,8 @@ text-align: center; background: url(/web/static/src/img/form_sheetbg.png); border-bottom: 1px dotted black; - -moz-box-sizing: border-box; -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; } @@ -1989,8 +2005,8 @@ .openerp .oe_form .oe_form_field_progressbar.ui-progressbar { height: 22px; font-size: 10px; - -moz-box-sizing: border-box; -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; border: 1px solid #999999; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d53d66363a2..350b9382d94 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -70,10 +70,12 @@ $colour4: #8a89ba -moz-background-clip: $clip background-clip: $clip -@mixin unscrew-box - -moz-box-sizing: border-box - -webkit-box-sizing: border-box - box-sizing: border-box +@mixin box-sizing($type: content) + // type = border || content || padding + -webkit-box-sizing: #{$type}-box + -moz-box-sizing: #{$type}-box + -ms-box-sizing: #{$type}-box + box-sizing: #{$type}-box // Transforms the (readable) text of an inline element into an mmlicons icon, // allows for actual readable text in-code (and in readers?) with iconic looks @@ -1050,7 +1052,7 @@ $colour4: #8a89ba display: table width: 100% > div - @include unscrew-box + @include box-sizing(border) display: table-cell width: 50% ul @@ -1190,12 +1192,8 @@ $colour4: #8a89ba .oe_form_button_save_dirty color: white background: #dc5f59 - background: -moz-linear-gradient(#dc5f59, #b33630) - background: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)) - background: -webkit-linear-gradient(#dc5f59, #b33630) - -moz-box-shadow: none - -webkit-box-shadow: none - -box-shadow: none + @include vertical-gradient(#dc5f59, #b33630) + @include box-shadow(none) font-weight: bold &:hover background: #ED6F6A @@ -1260,20 +1258,12 @@ $colour4: #8a89ba button.oe_form_button_hi color: white background: #DC5F59 - background: -moz-linear-gradient(#DC5F59, #B33630) - background: -webkit-gradient(linear, left top, left bottom, from(#DC5F59), to(#B33630)) - background: -webkit-linear-gradient(#DC5F59, #B33630) - -moz-box-shadow: none - -webkit-box-shadow: none - -box-shadow: none + @include vertical-gradient(#dc5f59, #b33630) + @include box-shadow(none) button.oe_form_button_hi:hover background: #DF6B66 - background: -moz-linear-gradient( #DF6B66, #BF3A33) - background: -webkit-gradient(linear, left top, left bottom, from( #DF6B66), to( #BF3A33)) - background: -webkit-linear-gradient( #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) + @include vertical-gradient(#DF6B66, #BF3A33) + @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) .oe_application .oe_form_sheetbg background: url(/web/static/src/img/form_sheetbg.png) @@ -1375,15 +1365,10 @@ $colour4: #8a89ba input[type="file"], select, textarea - -moz-box-sizing: border-box - -webkit-box-sizing: border-box - -ms-box-sizing: border-box - box-sizing: border-box + @include box-sizing(border) padding: 0 2px border: 1px solid #999 - -moz-border-radius: 3px - -webkit-border-radius: 3px - border-radius: 3px + @include radius(3px) background: white min-width: 70px color: #1f1f1f @@ -1427,7 +1412,7 @@ $colour4: #8a89ba width: 100% !important .oe_form_field_many2manytags_box border-radius: 2px - box-sizing: border-box + @include box-sizing(border) position: relative float: left border: 1px solid #9DACCC @@ -1561,10 +1546,7 @@ $colour4: #8a89ba text-align: center background: url(/web/static/src/img/form_sheetbg.png) border-bottom: 1px dotted black - -moz-box-sizing: border-box - -webkit-box-sizing: border-box - -ms-box-sizing: border-box - box-sizing: border-box + @include box-sizing(border) &:hover .oe_form_field_image_controls display: block // }}} @@ -1637,14 +1619,9 @@ $colour4: #8a89ba .oe_form_field_progressbar.ui-progressbar height: 22px font-size: 10px - -moz-box-sizing: border-box - -webkit-box-sizing: border-box - -ms-box-sizing: border-box - box-sizing: border-box + @include box-sizing(border) border: 1px solid #999 - -moz-border-radius: 3px - -webkit-border-radius: 3px - border-radius: 3px + @include radius(3px) background: white min-width: 50px From 4746506598cb29475e346dc267bb5e2ea68796eb Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 12 Jun 2012 15:34:52 +0200 Subject: [PATCH 17/27] [FIX] hr: improve the simplified form view of hr.job, and use it in the employee form bzr revid: rco@openerp.com-20120612133452-23s6ta98tybd2371 --- addons/hr/hr_view.xml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index a69ab432d35..5775e672021 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -66,7 +66,8 @@ - + @@ -435,16 +436,13 @@ form 20 - - - - - - - - - - + + + + + +