pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Typo] Set the avatar of calendar event, before text to always have the picture at top 0px (float right on the first line)

Browse Source 
bzr revid: jke@openerp.com-20131213163005-439v2vy300b362m1
This commit is contained in:
jke-openerp
2013-12-13 17:30:05 +01:00
parent 5f4e3ea835
commit 0578ceabaa
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_calendar/static/src/css/web_fullcalendar.css
+4
View File
@@ -2,6 +2,10 @@
.openerp .oe_view_manager_view_calendar {
position: relative;
}
.openerp .oe_calendar_table {
margin-top : 10px;
margin-left: 5px;
}
.openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer {
z-index: 10;
addons/web_calendar/static/src/css/web_fullcalendar.sass
+4
View File
@@ -41,6 +41,10 @@ $fontcolor: #0d0d0d
.oe_view_manager_view_calendar
position: relative
.oe_calendar_table
margin-top : 10px
margin-left: 5px
.openerp
.oe_searchview.oe_searchview_open_drawer
.oe_searchview_drawer
addons/web_calendar/static/src/js/fullcalendar.js
+6 -3
View File
@@ -385,7 +385,7 @@ openerp.web_calendar = function(instance) {
if (this.color_map[key]) {
return this.color_map[key];
}
var index = ((_.keys(this.color_map).length + 4) % 24) + 1;
var index = (((_.keys(this.color_map).length + 1) * 5) % 24) + 1;
this.color_map[key] = index;
return index;
},
@@ -504,6 +504,8 @@ openerp.web_calendar = function(instance) {
}
the_title = the_title.replace(/&/g,'&amp;').replace(/</g,'&lt;'); //.replace(/>/g,'&gt;');
the_title_avatar = '';
if (typeof this.attendee_people !== "undefined") {
var MAX_ATTENDEES = 3;
var attendee_showed = 0;
@@ -514,7 +516,7 @@ openerp.web_calendar = function(instance) {
attendees.push(the_attendee_people);
attendee_showed += 1;
if (attendee_showed<= MAX_ATTENDEES) {
the_title += '<img title="' + self.all_attendees[the_attendee_people] + '" class="attendee_head" width="20px" height="20px" src="/web/binary/image?model=res.partner&field=image_small&id=' + the_attendee_people + '"></img>';
the_title_avatar += '<img title="' + self.all_attendees[the_attendee_people] + '" class="attendee_head" width="20px" height="20px" src="/web/binary/image?model=res.partner&field=image_small&id=' + the_attendee_people + '"></img>';
}
else {
attendee_other += self.all_attendees[the_attendee_people] +", ";
@@ -522,8 +524,9 @@ openerp.web_calendar = function(instance) {
}
);
if (attendee_other.length>2) {
the_title += '<span class="attendee_head" title="' + attendee_other.slice(0, -2) + '">+</span>';
the_title_avatar += '<span class="attendee_head" title="' + attendee_other.slice(0, -2) + '">+</span>';
}
the_title = the_title_avatar + the_title;
}
}