summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2012-08-07 15:13:00 +0200
committerThibault Delavallée <tde@openerp.com>2012-08-07 15:13:00 +0200
commit35ac2be207eb069ed90a0b988e10fc0e62b9bd4d (patch)
tree6a42510b64f797c5a2a3d8fd13d5c9117a08c6c4 /addons/web/static/src
parent0e77a7d45c597a35b216bd502075ff8fec0b7cb1 (diff)
parent35c54c57798ca45378faf5d4d419d08b538b62e6 (diff)
[MERGE] MyNotChatterTask: image resize.
This revision adds standard image field names and sizes (image: 1024x1024; image_medium: 180x180; image_small: 50x50, the last two being function fields). This web-side branch holds the field name change for the topbar avatar. It also adds 2 CSS classes when using images: oe_image_small and oe_image_medium, that fix the max-width and mex-height to respectively 50x50 and 180x180 px. Misc : - deleted oe_kanban_gravatar CSS class - renamed oe_kanban_avatar_toto to oe_kanban_avatar_smallbox; this class is used only in res.partner form view, for child partners. bzr revid: tde@openerp.com-20120807131300-i6helnvao10o0go7
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/css/base.css8
-rw-r--r--addons/web/static/src/css/base.sass6
-rw-r--r--addons/web/static/src/js/chrome.js2
3 files changed, 15 insertions, 1 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index fd2f0db381d..09081426fca 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;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 0efd43dc5ac..0ef8f83f330 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
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 45cbaf46bfb..dbff734da98 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -874,7 +874,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);
});
};