From afccc9a008780198a2c7201be789d01a4469058e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 30 Jul 2012 10:36:26 +0200 Subject: [PATCH 1/4] [FIX] topbar avatar: avatar -> image_small. bzr revid: tde@openerp.com-20120730083626-oxe0wauf5217lq77 --- addons/web/static/src/js/chrome.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index a1759397e21..2f0cf8e9ee1 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -806,7 +806,7 @@ instance.web.UserMenu = instance.web.Widget.extend({ if(res.company_id[0] > 1) topbar_name = _.str.sprintf("%s (%s)", topbar_name, res.company_id[1]); self.$element.find('.oe_topbar_name').text(topbar_name); - var avatar_src = _.str.sprintf('%s/web/binary/image?session_id=%s&model=res.users&field=avatar&id=%s', self.session.prefix, self.session.session_id, self.session.uid); + var avatar_src = _.str.sprintf('%s/web/binary/image?session_id=%s&model=res.users&field=image_small&id=%s', self.session.prefix, self.session.session_id, self.session.uid); $avatar.attr('src', avatar_src); }); }; From 38552a9c49eec29136c620ae99ebbc363fd45031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 3 Aug 2012 10:01:30 +0200 Subject: [PATCH 2/4] [IMP] base.css: added image_small and image_medium css. bzr revid: tde@openerp.com-20120803080130-qhs1wokpmjx3ejqa --- addons/web/static/src/css/base.css | 8 ++++++++ addons/web/static/src/css/base.sass | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index ac04fb4d1e1..02c9db98eb5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2243,6 +2243,14 @@ .openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls { display: block; } +.openerp .oe_form .oe_form_field_image_small img { + max-width: 50px; + max-height: 50px; +} +.openerp .oe_form .oe_form_field_image_medium img { + max-width: 180px; + max-height: 180px; +} .openerp .oe_form_field_many2one td:first-child { position: relative; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2698787c5a3..58d24152b0e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1737,6 +1737,14 @@ $sheet-max-width: 860px @include box-sizing(border) &:hover .oe_form_field_image_controls display: block + .oe_form_field_image_small + img + max-width: 50px + max-height: 50px + .oe_form_field_image_medium + img + max-width: 180px + max-height: 180px // }}} // FormView.many2one {{{ .oe_form_field_many2one From acc5adf758c561efa20f89395d392646040f57b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 6 Aug 2012 17:54:18 +0200 Subject: [PATCH 3/4] [IMP] Renamed css oe_form_field_image_small and _medium to oe_image_small and _medium. bzr revid: tde@openerp.com-20120806155418-33zkumr6t4ez8k6e --- addons/web/static/src/css/base.css | 16 ++++++++-------- addons/web/static/src/css/base.sass | 14 ++++++-------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 22e3fa28357..77393168d7e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -509,6 +509,14 @@ .openerp .oe_avatar + div { margin-left: 5px; } +.openerp .oe_image_small > img { + max-width: 50px; + max-height: 50px; +} +.openerp .oe_image_medium > img { + max-width: 180px; + max-height: 180px; +} .openerp .oe_button.oe_link { border: none; padding: 0; @@ -2275,14 +2283,6 @@ .openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls { display: block; } -.openerp .oe_form .oe_form_field_image_small img { - max-width: 50px; - max-height: 50px; -} -.openerp .oe_form .oe_form_field_image_medium img { - max-width: 180px; - max-height: 180px; -} .openerp .oe_form_field_many2one td:first-child { position: relative; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 482dd490988..a2dde29f094 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -408,6 +408,12 @@ $sheet-max-width: 860px border: none .oe_avatar + div margin-left: 5px + .oe_image_small > img + max-width: 50px + max-height: 50px + .oe_image_medium > img + max-width: 180px + max-height: 180px .oe_button.oe_link @include reset() img @@ -1764,14 +1770,6 @@ $sheet-max-width: 860px @include box-sizing(border) &:hover .oe_form_field_image_controls display: block - .oe_form_field_image_small - img - max-width: 50px - max-height: 50px - .oe_form_field_image_medium - img - max-width: 180px - max-height: 180px // }}} // FormView.many2one {{{ .oe_form_field_many2one From 35c54c57798ca45378faf5d4d419d08b538b62e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 7 Aug 2012 13:02:02 +0200 Subject: [PATCH 4/4] [IMP] Renamed oe_kanban_avatar_toto to oe_kanban_avatar_smallbox; this is used only for nested partners in partner form view. The name is a bit more clear now. Also removed dead class oe_kanban_gravatar. bzr revid: tde@openerp.com-20120807110202-f87n3068k89utq5k --- addons/web_kanban/static/src/css/kanban.css | 13 +------------ addons/web_kanban/static/src/css/kanban.sass | 8 +------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index b2f45866ea7..7a1baa5a2fc 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -194,18 +194,7 @@ .openerp .oe_kanban_view.oe_kanban_grouped .oe_kanban_record { margin-bottom: 6px; } -.openerp .oe_kanban_view .oe_kanban_gravatar { - display: block; - width: 20px; - height: 20px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); - -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -} -.openerp .oe_kanban_view .oe_kanban_avatar_toto { +.openerp .oe_kanban_view .oe_kanban_avatar_smallbox { height: 40px; width: 40px; border: 1px solid; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 22ad21523be..5d2a0c54b4b 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -193,13 +193,7 @@ margin: 2px 4px &.oe_kanban_grouped .oe_kanban_record margin-bottom: 6px - .oe_kanban_gravatar - display: block - width: 20px - height: 20px - @include radius(3px) - @include box-shadow(0 1px 2px rgba(0,0,0,0.2)) - .oe_kanban_avatar_toto + .oe_kanban_avatar_smallbox height: 40px width: 40px border: 1px solid