diff --git a/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb b/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
index ad90903a2..2b8b2b02f 100644
--- a/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
+++ b/vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb
@@ -114,19 +114,28 @@ var calendarAPI = function(){
var getEvents = function(month,year){
$.getJSON("cals/getEvents",{"type":"monthview","month":month,"year":year},function(events){
var $eventrow = $("
");
- var currow = 1;
- var curpos = 1;
+ var nos = new Array();
+ nos.push(0);
$.each(events,function(i,evnt){
var daydom = $("#calendar_month td[date="+evnt.start_date+"]");
var curparent = daydom.parent().parent().parent();
var thisrow = curparent.attr("row");
var pos = daydom.attr("position");
- if(thisrow != currow){
- $eventrow = null;
- $eventrow = $("
");
- }else if(pos == curpos){
- $eventrow = null;
- $eventrow = $("
");
+ var thisno = daydom.attr("no");
+
+ var index = "new";
+ for(x in nos){
+ if(thisno < nos[x]){
+ $eventrow = null;
+ $eventrow = $("
");
+ index = x;
+ break;
+ }
+ }
+ if(index!="new"){
+ nos[index] = (thisno + evnt.total_days) - 1;
+ }else{
+ nos.push((thisno + evnt.total_days) - 1);
}
if(pos == 1){
$eventrow.html(''+evnt.title+' | ');
@@ -136,8 +145,7 @@ var calendarAPI = function(){
}
$eventrow.append(''+evnt.title+' | ');
}
- currow = thisrow;
- curpos = pos;
+
curparent.append($eventrow);
})
})
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb
index 07221d482..a3111ec18 100644
--- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb
+++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb
@@ -41,11 +41,11 @@
<% x = 0 %>
<% while x < 7 %>
<% if day_count_for_title < @pre_disabled_days %>
- <%= @dateset[day_count_for_title] %> |
+ <%= @dateset[day_count_for_title] %> |
<% elsif day_count_for_title >= @post_disabled_days %>
- <%= @dateset[day_count_for_title] %> |
+ <%= @dateset[day_count_for_title] %> |
<% else %>
- <%= @dateset[day_count_for_title] %> |
+ <%= @dateset[day_count_for_title] %> |
<% end %>
<% day_count_for_title += 1 %>
<% x += 1 %>