From b6a366003783b908ba68dd0502b9a8e3f1cbb129 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 21 May 2012 16:59:02 +0200 Subject: [PATCH 01/59] [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: iVBORw0KGgoAAAANSUhEUgAAAJYAAACWCAAAAAAZai4+AAAMQElEQVR4nO2ce4wV1R3Hv7/fmbvrPliQZWEXWFgWEFgQBRNI0dZW7euPxliTRhNbW5NatammoaaPNKmpKRYiUunDFzEU28YYkRaiaX0hYhUELApaKG90l2VZdmVl2WXvnPPrH/c1M3d2uWdmePzB75+9d+7Mmc/8zjm/+T3OWRJciMLnGyBcLmLZyEUsG7mIZSNOAm2IQAAQQAAEAhBRrCYprjkVI6GPpkXFIIuHJYYJ6D/Wsb+97fiJk339A0ZVDa8bP3lG4xhAjDofWGIUcOifW3ceOFr026Q5V980CSbq2I2B5To49dILL/YAQE4tkhlf0ABG3Pzta+FG7EqJKEZL1/IZANgJuzMrBpxvvCuio7QeFcsVWTsLUEMogxSh7IEBcc8dVlrabyeoM40cRfjS3ihc0bC0bJoOp5R5lkLT1ghckbC0WV1bqiF20PCB/fiKpq30VUiVRgUozOgUY3mDaHaFKkmXeq5O/XehsTVDEc2dzX3Szqp1XPJTZCRRD4KYw+yFyBJtaVSTxGIxRkKmp6ZNG9nYNZUQEgAyo66ZnQrTizLPw250JYfF+OmHG7ZsukWKuQzeH1B2XJEMhHt10fM4+HHGDPwQRf1IqD1oZ7uS0hbpkfcYDWj51VgT1Jeo4+12vZhYJ8qoOlaAkrqWsGdtt2stMW3lfC6RyWG/n7ZrLvnIh04mcJ+ksYzqWE8hNmqYXTMRAzJWAXvOxABgDN/XporeNEL1sLLzEbF6deDWGr0AtOKFzxa//8g01Nq1HxFrfmUq0FO6UYmb6r37GcctOptkyuhzoS1+NGibBMSU2nTfu1xMBZYpZdoqZoyGRcVevGF1YvGy/lQ65HQj11m+EyMHZH4xrpi/zRpkYhPVHbH0T5PBckVeuQYYJDpTuM82ykgEKy2d38Wg4RnzsI+MZZCRBJaWVy4DDzqkU1hsHZIlgOXKCmeIQMjBl11jG/nEx3JllaJB32GUwhWt1lTxsbS8VD44FQM3tEbIjsTFMuZkS7E7moNycMnP+qPkbOJiubJ8MJNMCvjKZrGOqBPAMiZ9HYUqixygeZVIOgpVeDq2dBFufR9hIaDSbt1d99RDR7tBXCx0HA+LTJUu+8G9U+CWlGxKHivcSSfS1y5aAM2RWz8rVQymn7+6QJsYifkkqhhBYf3gL030nDxwVrSlzNd/4cZs+CxgGbqbB7f7pUn8TuQAAUnVVbGfNjaWMUX2IV0et9H4WJWTHT8X6ZpYoz3TSNzCnT5VbAaq4hUTkQDW2ZH4Qz77XCIioEwKILayktJWvqKpQ3PN1pIMllY4/f7h42r8lfUwiZjCeP5WRlxp/3VLJQA0LjwWrYAYkCSwXHm1GQA7DgPTdyfBlUhAtiYFJzvYHUw7oiM5pAljabO7xjOhU7gtUr3VL/HHp9BDPZ6clque26zsKikhEhtL+MA6b7JUaGBN3DYTwDK0q0vEd2BT/D5IwMik/VUekb2nbJNsRZIAVlFWpNeyNhAiCah7Qk1ANzWXxG00PhaZGXN9LjLTnIqQ4p2dJGAg+E4fBcnXwsoYdhL/VS3QX329YLhS6VnvVMV3bWIbZDFycAJSTABIpVD/XgIvxWRe1R/NBaAUA5gfYY1IsSTk2PQsagaAinlP9SXi2CTjBhpG95ZuU9Ewj5JxAxNzmjOOjZELyWkGIEZAcWP8vFygAdkFukr3IpaNXMSykeg5CI/bEMgk5X/QkVeCRzMQIia8duE/iwDRFMXAWmPliU6o6uwhs9eT6qZ09dgsVNdT82aOBgAtbKk1m04UgYCZobt27HhLLctm14w8s2RYbkkGG17dIAyAzMhh1zW3tMyb05gCRJO3e0u4V0lidDoTK3e/ufLez9cqVG7PuwpGfwsOcsH+s/mg2pUHAaBq7veffKNLRETSbol5gBKwjE6ntYhI/4F/PXzjpDIAoIo3CyG9lr4FcEBE5GCRJ9R35TsoZwBINd+8fENbBi1dQo5iaCxjXNcVETndvfH3d3wus1BGOaqMVspA4TQthyeDATDu9FbqjHtyPhSxykyP8Tfc/+yeUyIi2nWH9soGxzI6nbnDwO7V919bT1kiJoLCbyTtPdeVrWNAYHzTrwotB5vAAIiVwwBQOev2Fe/1ioiYoXo0FMtoN3PJwKH1S2+9fExmMDu5ma5wh0n7r0jLYjhEFfsCvqkr/x6WNxCUXV0/fPpNi9d/rEVE9CBsRTNRRDKrP/p2bv5o5+4OAHBgRPJlAaVv/ENw1SuZk4DA9AXsjXIXPHkrZa2QaIDA9NmJXWtQP+PK2dc0OQxooMi0ebEERkgRYPbv2rHzncMaABPE+BYZsZ73VEVwQRLTAQiQPjozwOW4t+x5wJOSkCyFtLevR/nsBbNmT68BoIXYG8XlsTSYoKAPtW3btr31GAAwS3HlBISb69ygkknvgoDNkaKkCJvvLT4VMNoGADHM6S1bUFl/+fx5k8aVAzCeCqSnQ/v3vHD/9fWZxkL3fWR+QsuJ4JIZIx0jQFBYKoFBJ2n50aA2mzhbNK79wsJ/7Pdemcd6+6HbWioZAKngur+AKPwlmIbU8hYDcPCTIJY2H1YPadyJM/Glqp57558O5NaXZLCMkesBwEmVUMhlXNUXmD6urAABDm4JArty16CrNzxsynEA4Jnc5Rl/iwyanXKGm9ZnfnUbtW1dYHOBoBUMCHrAvgYM/++vJSRKRLsuOFU5MzfsOdfuBNctPc/yWGAmEvaDAMGJgYC26dHPuEQnRdIVjQEswujSE4uaNmz0reIUdg9CAEHHp75mDO9YWXJWiTBlZO5zHmt86OKPcFHmCb+jRt1tGZyj/pXDgiWnSlUWCNNY/NoCGpzSk1Ka1273rhURnGiDAMI9x73aMvzBmtJ3OxCmIu+25Q6Nqyn1ckCod6nvOw71cmZD52H/eb/rLdn9JYOW/Jc8Vk1d6VgwtHa3Tw37cqr+xKMtrXY8V7y+efBGKxrznZf7a6jWIrMo3LPSd/a+3IdDvvMW9ZbcJAijJuYR8lhlE2wSnoZWdhbGMmFPFheefZ1GbX3eKrnbWCdBLNBEGyxR7U/nx6ewuy/Td4SufCsCLHNLnoYAoblgpAtRdVPpUAA0Huss7JHp+iyDJWjPJwPtpiEAzCh8zDVCaLQq1Ig6uDrXQ4JPjufU8ml3buqR/LbPQlkQzCn0VwGrPlgjOUMr9ETOjTI42MPZpk92ZZ/O8NvP22xoI6meWowFNIwo2p8zlBj+z4v5PtqdP9zTmf/4SNoqZJfLxoRpa/gltrWHx3N1Q9mVGwA0kH0pat60tvQ9jAAY44aJ51u2PakaaYel6fUXM6OLB/ZksYTRkZuTj7hWSSrCJOjiTjSYYNMKAMbjGXWw25bXFg6DAGje+He7rZLiefX40m7jLLE0vbyNDWDQ6jGinRmdm0VpuyGhaaoHxoM10RILnP4jAAj29ecXAOEoGNDqjdfsbBbBOxG9WPW2WIbX7WUD4KDHtB/JeBKPpG3r1RO99/dgNdpWJ4W7l8NAsN/TzLEBiOENL1uuhWBMTZkQbRHGVNvWcjX9+bAjjD0ebbX3ADLwYNi+mqGEMM2rXg9WlY1rk4GgnhXQ3F+IpQV9ndDq9ddsdywLZoRiATWWG6oAgFZ1KnS1FuIAlm6QWWLdjuZxXpaCtkzFKNvGYPjQGsLRo4W3DA+0Qb1su18ZhNomr1IKhELjI1S+aWk3DnntuXyC9MMh+8jOJOObJBwLY+3XoGjevUYO+B7nY7xgabMAMGb6pm4BizAqwtIYweO0y3fkY3dZlNLFXN837+u00SKCzYmhLRtafWk1943NVq5D9rLJ/hHkSQZtt4hg86Loi/63xuXFW8HPKISyHb6sawHLSJela5OcMCZ3+DbeeB+sujESVvCaKJUnNF7qO+Ad8qmmSFjBeRKh5kZodnz/GsGjLYNo2kpADFr8T+M1hLDcZZycCKb4NeLDsvVPkxKS8mmDYgHjYBWTJSgN4/0kni+EusrYy9QiCaGp3G+BfVijLVJvSQqhJeWfvz6s2gRWz0URwhWBI14sqR5zTmnyImWBEe8baOfLcJEe0zwEFjD2XNLkhTC8PgDi/2Yb7ycjhCnBf+PgxxoXe410NGkJ3teLRZhwnrCmBw/4tXVpVezVyBHE8LTgIb+2Kkach6lIMnps0KH1YZnhDecBizFhZHDs/B9R17D2kvkawAAAAABJRU5ErkJggg== + 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/59] [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/59] [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 ee04e1002f7b1816b69057fe14b679415875b767 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Tue, 29 May 2012 11:44:15 +0530 Subject: [PATCH 04/59] [IMP]project : add new group to restrict delegation bzr revid: cha@tinyerp.com-20120529061415-x8salptgz19hyop2 --- addons/project/project_view.xml | 4 ++-- addons/project/security/project_security.xml | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 70cdac1efa0..a5e22d96343 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -310,7 +310,7 @@ 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 29/59] [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 30/59] [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 - - - - - - - - - - + + + + + +