From 0578ceabaad4b0b3a4b17bd66d2c96f9b97fb049 Mon Sep 17 00:00:00 2001
From: jke-openerp <jke@openerp.com>
Date: Fri, 13 Dec 2013 17:30:05 +0100
Subject: [PATCH] [Typo] Set the avatar of calendar event, before text to
 always have the picture at top 0px (float right on the first line)

bzr revid: jke@openerp.com-20131213163005-439v2vy300b362m1
---
 addons/web_calendar/static/src/css/web_fullcalendar.css  | 4 ++++
 addons/web_calendar/static/src/css/web_fullcalendar.sass | 4 ++++
 addons/web_calendar/static/src/js/fullcalendar.js        | 9 ++++++---
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/addons/web_calendar/static/src/css/web_fullcalendar.css b/addons/web_calendar/static/src/css/web_fullcalendar.css
index b6a1f89df49..c721df12e68 100644
--- a/addons/web_calendar/static/src/css/web_fullcalendar.css
+++ b/addons/web_calendar/static/src/css/web_fullcalendar.css
@@ -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;
diff --git a/addons/web_calendar/static/src/css/web_fullcalendar.sass b/addons/web_calendar/static/src/css/web_fullcalendar.sass
index 0e52d1a1c68..920814b4f2b 100644
--- a/addons/web_calendar/static/src/css/web_fullcalendar.sass
+++ b/addons/web_calendar/static/src/css/web_fullcalendar.sass
@@ -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
diff --git a/addons/web_calendar/static/src/js/fullcalendar.js b/addons/web_calendar/static/src/js/fullcalendar.js
index 7717223bffc..2d003c6c1e1 100644
--- a/addons/web_calendar/static/src/js/fullcalendar.js
+++ b/addons/web_calendar/static/src/js/fullcalendar.js
@@ -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;
                 }                
             }