diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index 8fb9bd5b0..d884803b3 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -155,6 +155,7 @@
 "What to Print" = "What to Print";
 "Options" = "Options";
 "Tasks with no due date" = "Tasks with no due date";
+"Display working hours only" = "Display working hours only";
 "Completed tasks" = "Completed Tasks";
 
 /* Appointments */
@@ -313,6 +314,7 @@
 
 "Repeat" = "Repeat";
 "Daily" = "Daily";
+"Multi-Columns" = "Multi-Columns";
 "Weekly" = "Weekly";
 "Monthly" = "Monthly";
 "Yearly" = "Yearly";
diff --git a/UI/Scheduler/UIxCalViewPrint.m b/UI/Scheduler/UIxCalViewPrint.m
index af94b9792..72357161e 100644
--- a/UI/Scheduler/UIxCalViewPrint.m
+++ b/UI/Scheduler/UIxCalViewPrint.m
@@ -32,21 +32,22 @@ static NSArray *layoutItems = nil;
 {
   if (!layoutItems)
   {
-    layoutItems = [NSArray arrayWithObjects: @"LIST", @"Daily", @"Weekly", nil];
+    layoutItems = [NSArray arrayWithObjects: @"LIST", @"Daily", @"Multi-Columns", @"Weekly", nil];
     [layoutItems retain];
   }
 
 }
+
 - (id) init
 {
   item = nil;
-  return [super init];
+  
+  return self;
 }
 
 - (void) dealloc
 {
   [item release];
-  [super dealloc];
 }
 
 /****************************************************************/
diff --git a/UI/Templates/SchedulerUI/UIxCalViewPrint.wox b/UI/Templates/SchedulerUI/UIxCalViewPrint.wox
index cbee832c1..9dd381879 100644
--- a/UI/Templates/SchedulerUI/UIxCalViewPrint.wox
+++ b/UI/Templates/SchedulerUI/UIxCalViewPrint.wox
@@ -81,6 +81,16 @@
     <!-- Options -->
     <span class="caption"><var:string label:value="Options" /></span>
     <table class="frame">
+      <tr>
+        <td>
+          <label>
+            <input type="checkbox" name="printWorkingHours" id="printHours" checked="true" onChange="onPrintWorkingHoursCheck(this);" />
+            <var:string label:value="Display working hours only" /></label></td></tr>
+      <tr>
+        <td>
+          <label>
+            <hr /></label></td></tr>
+      
       <tr>
         <td>
           <label>
diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index c4cd4d8f7..5079bd7ad 100644
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -1294,13 +1294,14 @@ DIV#daysView DIV.event.lasts96
 DIV.event > DIV.eventInside
 { position: absolute;
   overflow: hidden;
-  padding: 1px;
   top: 0px;
   bottom: 0px;
-  left: 2px;
-  right: 1px;
   -webkit-border-radius: 2px;
   border-radius: 2px; }
+  
+DIV.eventInside {
+  width:100%;
+}
 
 DIV.eventInside SPAN.location
 { font-size: smaller; }
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index be7ced9b5..898c33f7d 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -37,10 +37,22 @@ var eventsToCopy = [];
 
 // This should probably go in the generic.js
 function printView() {
+  var flag = false;
+  var calendarsList = $("calendarList").children;
+  for (var i = 0; i < calendarsList.length; i++) {
+    if (calendarsList[i].down("input").checked) {
+      flag = true;
+      break;
+    }
+  }
+  if (flag)
+    window.open("printView","","width=660,height=470");
+
+  else
+    showAlertDialog("Please select at least one calendar");
   
-  window.open("printView","","width=660,height=470");
   
-  return false; /* stop following the link */
+  return false;
 }
 
 function newEvent(type, day, hour, duration) {
@@ -3479,57 +3491,61 @@ function onWindowResize(event) {
 }
 
 function drawNowLine() {
-    var d = new Date();
-    var hours = d.getHours();
-    var minutes = d.getMinutes();
-
-    if (currentView == "dayview") {
-        var today = new Date();
-        var m = parseInt(today.getMonth()) + 1;
-        var d = today.getDate();
-        if (m < 10)
-            m = "0" + m;
-        if (d < 10)
-            d = "0" + d;
-        var day = today.getFullYear() + "" + m + "" + d;
-        var targets = $$("DIV#daysView DIV.days DIV.day[day=" + day
-                         + "] DIV.hourCells");
-    }
-    else if (currentView == "multicolumndayview") {
-      var targets = $$("DIV#daysView DIV.hourCells");
-    }
-    else if (currentView == "weekview")
-        var targets = $$("DIV#daysView DIV.days DIV.dayOfToday DIV.hourCells");
-
-    if (targets[0]) {
-    	if (currentView == "multicolumndayview") {
-    	  var nbCalendars = targets.length;
-    	  for(var i = 0; i < nbCalendars; i++){
-    	    var target = targets[i].getElementsByClassName("clickableHourCell")[hours];
-
-            if (target) {
-              var div = targets[i].getElementsByClassName("nowLineDisplay")[0];
-              if (!div)
-                div = new Element("div", {'class': 'nowLineDisplay'});
-
-                div.style.top = parseInt((minutes * target.offsetHeight / 60) - 1) + "px";
-                target.insertBefore(div, target.firstChild);
-        	}
-    	  }
-    	}
-    	else {
-    	  var target = targets[0].getElementsByClassName("clickableHourCell")[hours];
-          if (target) {
-            var div = targets[0].getElementsByClassName("nowLineDisplay")[0];
-            if (!div)
-              div = new Element("div", {'class': 'nowLineDisplay'});
-
-              div.style.top = parseInt((minutes * target.offsetHeight / 60) - 1) + "px";
-              target.insertBefore(div, target.firstChild);
-    	  }
+  var d = new Date();
+  var hours = d.getHours();
+  var minutes = d.getMinutes();
+  
+  if (currentView == "dayview") {
+    var today = new Date();
+    var m = parseInt(today.getMonth()) + 1;
+    var d = today.getDate();
+    if (m < 10)
+      m = "0" + m;
+    if (d < 10)
+      d = "0" + d;
+    var day = today.getFullYear() + "" + m + "" + d;
+    var targets = $$("DIV#daysView DIV.days DIV.day[day=" + day
+                     + "] DIV.hourCells");
+  }
+  else if (currentView == "multicolumndayview") {
+    var targets = $$("DIV#daysView DIV.hourCells");
+  }
+  else if (currentView == "weekview")
+    var targets = $$("DIV#daysView DIV.days DIV.dayOfToday DIV.hourCells");
+  
+  else {
+    var targets = [];
+  }
+  
+  if (targets[0] != undefined) {
+    if (currentView == "multicolumndayview") {
+      var nbCalendars = targets.length;
+      for(var i = 0; i < nbCalendars; i++){
+        var target = targets[i].getElementsByClassName("clickableHourCell")[hours];
+        
+        if (target) {
+          var div = targets[i].getElementsByClassName("nowLineDisplay")[0];
+          if (!div)
+            div = new Element("div", {'class': 'nowLineDisplay'});
+          
+          div.style.top = parseInt((minutes * target.offsetHeight / 60) - 1) + "px";
+          target.insertBefore(div, target.firstChild);
         }
-    	setTimeout("drawNowLine ();", 60000); // 1 min.
+      }
     }
+    else {
+      var target = targets[0].getElementsByClassName("clickableHourCell")[hours];
+      if (target) {
+        var div = targets[0].getElementsByClassName("nowLineDisplay")[0];
+        if (!div)
+          div = new Element("div", {'class': 'nowLineDisplay'});
+        
+        div.style.top = parseInt((minutes * target.offsetHeight / 60) - 1) + "px";
+        target.insertBefore(div, target.firstChild);
+      }
+    }
+    setTimeout("drawNowLine ();", 60000); // 1 min.
+  }
 }
 
 function onListCollapse(event, element) {
diff --git a/UI/WebServerResources/UIxCalViewPrint.css b/UI/WebServerResources/UIxCalViewPrint.css
index ce51b67f6..5df6856f7 100644
--- a/UI/WebServerResources/UIxCalViewPrint.css
+++ b/UI/WebServerResources/UIxCalViewPrint.css
@@ -128,10 +128,20 @@ DIV#rightSide {
 DIV#calendarHeader {
   position:relative;
   top:0;
-  height:70px;
+  height:38px;
   right: 0px;
 }
 
+DIV#calendarHeader DIV.calendarLabels
+{ top: 1px;
+  height: 20px; 
+  border-left: 1px solid #ccc;
+  text-align: center;
+  font-style:italic;
+  font-size:150%;
+}
+
+DIV#calendarHeader DIV.calendarLabels,
 DIV#calendarHeader DIV.dayLabels,
 DIV#calendarHeader DIV.days {
   position:relative;
@@ -139,9 +149,12 @@ DIV#calendarHeader DIV.days {
   margin-left:50px;
 }
 
+DIV#calendarHeader DIV.dayLabels
+{ top: 1px; }
+
 DIV#calendarHeader DIV.days {
   top: 0;
-  height: 33px;
+  height: 1px;
   left: 0;
   right: 0;
 }
@@ -170,9 +183,13 @@ DIV#daysView DIV.hour {
 
 DIV.event {
   z-index:1;
-  border:solid black 1px;
-  background-color:white;
+  background-color: white;
   border-radius:5px;
+  border:1px solid black;
+
+}
+DIV.eventInside {
+  width:100%;
 }
 
 DIV#daysView DIV.event.starts0
@@ -596,10 +613,15 @@ LABEL {
     position:static;
     top:5px;
     left:5px;
+
   }
 
   DIV#rightFrame {
     border:none;
     overflow:visible;
   }
+
+  BODY {
+    background-color:white;
+  }
 }
diff --git a/UI/WebServerResources/UIxCalViewPrint.js b/UI/WebServerResources/UIxCalViewPrint.js
index d9910fd00..4bbcfad4a 100644
--- a/UI/WebServerResources/UIxCalViewPrint.js
+++ b/UI/WebServerResources/UIxCalViewPrint.js
@@ -26,7 +26,7 @@ var firstDayOfWeek = window.opener.firstDayOfWeek;
 var printCompletedTasks=1;
 var printNoDueDateTasks=1;
 var eventsBlocks;
-var currentView;
+var currentPreview;
 var currentDay = window.parentvar("currentDay");
 var sd, ed;
 
@@ -38,7 +38,7 @@ function refreshContent() {
 }
 
 function updateDisplayView(data, newView) {
-  newView = ((newView) ? newView : currentView);
+  newView = ((newView) ? newView : currentPreview);
   var url = ApplicationBaseURL + "/" + newView;
   var day = null;
   
@@ -97,9 +97,24 @@ function previewDisplayCallback(http) {
     $("currentViewMenu").remove();
     $("listCollapse").remove();
     
-    // TODO : Month
-    _drawAllDayEvents(eventsBlocks[1], eventsBlocks[0]);
-    _drawEvents(eventsBlocks[2], eventsBlocks[0]);
+    if (currentPreview == "multicolumndayview") {
+      _drawCalendarAllDayEvents(null, null, eventsBlocks);
+    }
+    else {
+      allDayEventsList = eventsBlocks[1];
+      if (currentPreview == "monthview") {
+        //_drawMonthCalendarEvents(eventsList, eventsBlocks[0], null);
+      }
+      else {
+        _drawCalendarAllDayEvents(allDayEventsList, eventsBlocks[0], null);
+      }
+    }
+    // This ensure the diplay working hours checkbox when switching views
+    var printHoursCheckBox = $("printHours");
+    onPrintWorkingHoursCheck(printHoursCheckBox);
+    
+    // Add events color for each calendars
+    addCalendarsColor();
   }
   else
     log ("calendarDisplayCallback Ajax error ("+ http.readyState + "/" + http.status + ")");
@@ -107,17 +122,30 @@ function previewDisplayCallback(http) {
   return false;
 }
 
+function addCalendarsColor () {
+  var activeCalendarsId = [];
+  var allCalendars = window.parent$("calendarList");
+  var allColors = window.parentvar("UserSettings")['Calendar']['FolderColors'];
+  for (var i = 0; i < allCalendars.children.length; i++) {
+    if (allCalendars.children[i].down("input").checked){
+      folderName = allCalendars.children[i].getAttribute("id").substr(1);
+      color = allColors["sogo1:Calendar/" + folderName];
+      appendStyleElement(folderName, color);
+    }
+  }
+}
+
 function refreshEvents() {
   var todayDate = new Date();
   
   if (!currentDay)
     currentDay = todayDate.getDayString();
   
-  if (currentView == "dayview") {
+  if (currentPreview == "dayview" || currentPreview == "multicolumndayview") { // dayView and MultiColumns View
     sd = currentDay;
     ed = sd;
   }
-  else if (currentView == "weekview") {
+  else if (currentPreview == "weekview") { // WeekView
     var startDate;
     startDate = currentDay.asDate();
     startDate = startDate.beginOfWeek();
@@ -144,7 +172,7 @@ function refreshEvents() {
     document.refreshEventsAjaxRequest.abort();
   }
   var url = (ApplicationBaseURL + "/eventsblocks?sd=" + sd + "&ed=" + ed
-             + "&view=" + currentView);
+             + "&view=" + currentPreview);
   
   document.refreshEventsAjaxRequest
   = triggerAjaxRequest(url, refreshEventsCallback,
@@ -157,9 +185,13 @@ function refreshTasks(){
     document.tasksListAjaxRequest.abort();
   }
   
+  var taskListFilter = window.parentvar("taskListFilter");
   url = window.parentvar("ApplicationBaseURL") + "/" + "taskslist?show-completed=" + printCompletedTasks
   + "&asc=" + sorting["task-ascending"]
-  + "&sort=" + sorting["task-attribute"];
+  + "&sort=" + sorting["task-attribute"]
+  + "&filterpopup=" + taskListFilter;
+  
+  // TODO : Is that really necessary ?
   var tasksList = window.parent$("tasksList");
   var selectedIds;
   if (tasksList)
@@ -176,10 +208,12 @@ function refreshEventsCallback(http) {
     if (http.responseText.length > 0) {
       eventsBlocks = http.responseText.evalJSON(true);
       $("rightFrameEvents").innerHTML = "";
-      if ($("printLayoutList").value == "0")
+      if ($("printLayoutList").value == "0" && eventsBlocks.length > 0) {
         _drawEventsCells(eventsBlocks);
+        adjustFrames();
+      }
       else {
-        updateDisplayView(null, currentView);
+        updateDisplayView(null, currentPreview);
       }
     }
   }
@@ -193,8 +227,10 @@ function refreshTasksListCallback(http) {
     if (http.responseText.length > 0) {
       var tasksBlocks = http.responseText.evalJSON(true);
       $("rightFrameTasks").innerHTML = "";
-      var layout = $("printLayoutList").value;
-      _drawTasksCells(tasksBlocks);
+      if (tasksBlocks.length > 0) {
+        _drawTasksCells(tasksBlocks);
+        adjustFrames();
+      }
     }
   }
   else
@@ -225,44 +261,113 @@ function _drawTasksCells(tasksBlocks) {
 
 // TODO : Maybe use the drawfunction from the schedulerUI.js
 
-function _drawEvents(events, eventsData) {
+function _drawCalendarEvents(events, eventsData, columnsData) {
   var daysView = $("daysView");
   var subdivs = daysView.childNodesWithTag("div");
+  var printHoursCheckBox = $("printHours");
   for (var i = 0; i < subdivs.length; i++) {
     var subdiv = subdivs[i];
     if (subdiv.hasClassName("days")) {
       var days = subdiv.childNodesWithTag("div");
-      for (var j = 0; j < days.length; j++) {
-        var parentDiv = days[j].childNodesWithTag("div")[0];
-        for (var k = 0; k < events[j].length; k++) {
-          var eventRep = events[j][k];
-          var nbr = eventRep.nbr;
-          var eventCell = newEventDIV(eventRep, eventsData[nbr]);
-          parentDiv.appendChild(eventCell);
+      if (currentPreview == "multicolumndayview") {
+        for (var j = 0; j < days.length; j++) {
+          var parentDiv = days[j].childNodesWithTag("div")[0];
+          var calendar = columnsData[j];
+          var calendarEvents = calendar[2][0];
+          var calendarEventsData = calendar[0];
+          if (parentDiv.getElementsByClassName("event").length > 0) {
+            var oldEvents = parentDiv.getElementsByClassName("event");
+            var length = oldEvents.length - 1;
+            for (var x = length; x >= 0; x--){
+              oldEvents[x].remove();
+            }
+          }
+          for (var k = 0; k < calendarEvents.length; k++) {
+            var eventRep = calendarEvents[k];
+            var nbr = eventRep.nbr;
+            
+            if (printHoursCheckBox.checked) {
+              var offset = _computeOffset(parentDiv);
+              if ((eventRep.start - offset[0]) > 0 && (eventRep.start - offset[0]) < offset[1]) {
+                var eventCell = newEventDIV(eventRep, calendarEventsData[nbr], offset[0]);
+                parentDiv.appendChild(eventCell);
+              }
+            }
+            else {
+              var eventCell = newEventDIV(eventRep, calendarEventsData[nbr], null);
+              parentDiv.appendChild(eventCell);
+            }
+          }
+        }
+      }
+      else {
+        for (var j = 0; j < days.length; j++) {
+          var parentDiv = days[j].childNodesWithTag("div")[0];
+          if (parentDiv.getElementsByClassName("event").length > 0) {
+            var oldEvents = parentDiv.getElementsByClassName("event");
+            var length = oldEvents.length - 1;
+            for (var x = length; x >= 0; x--){
+              oldEvents[x].remove();
+            }
+          }
+          for (var k = 0; k < events[j].length; k++) {
+            var eventRep = events[j][k];
+            var nbr = eventRep.nbr;
+            if (printHoursCheckBox.checked) {
+              var offset = _computeOffset(parentDiv);
+              if ((eventRep.start - offset[0]) > 0 && (eventRep.start - offset[0]) < offset[1]) {
+                var eventCell = newEventDIV(eventRep, eventsData[nbr], offset[0]);
+                parentDiv.appendChild(eventCell);
+              }
+            }
+            else {
+              var eventCell = newEventDIV(eventRep, eventsData[nbr], null);
+              parentDiv.appendChild(eventCell);
+            }
+          }
         }
       }
     }
   }
 }
 
-function _drawAllDayEvents(events, eventsData) {
+function _drawCalendarAllDayEvents(events, eventsData, columnsData) {
   var headerView = $("calendarHeader");
   var subdivs = headerView.childNodesWithTag("div");
-  var days = subdivs[1].childNodesWithTag("div");
-  for (var i = 0; i < days.length; i++) {
-    var parentDiv = days[i];
-    for (var j = 0; j < events[i].length; j++) {
-      var eventRep = events[i][j];
-      var nbr = eventRep.nbr;
-      var eventCell = newAllDayEventDIV(eventRep, eventsData[nbr]);
-      parentDiv.appendChild(eventCell);
+  
+  if (currentPreview == "multicolumndayview"){
+    var days = subdivs[2].childNodesWithTag("div");
+    for (var i = 0; i < days.length; i++) {
+      var parentDiv = days[i];
+      var calendar = columnsData[i];
+      var calendarAllDayEvents = calendar[1][0];
+      var calendarAllDayEventsData = calendar[0];
+      for (var j = 0; j < calendarAllDayEvents.length; j++) {
+        var eventRep = calendarAllDayEvents[j];
+        var nbr = eventRep.nbr;
+        var eventCell = newAllDayEventDIV(eventRep, calendarAllDayEventsData[nbr]);
+        parentDiv.appendChild(eventCell);
+      }
     }
   }
+  else {
+    var days = subdivs[1].childNodesWithTag("div");
+    for (var i = 0; i < days.length; i++) {
+      var parentDiv = days[i];
+      for (var j = 0; j < events[i].length; j++) {
+        var eventRep = events[i][j];
+        var nbr = eventRep.nbr;
+        var eventCell = newAllDayEventDIV(eventRep, eventsData[nbr]);
+        parentDiv.appendChild(eventCell);
+      }
+    }
+  }
+  adjustPreviewHeader();
 }
 
 // todo : month
 
-function newEventDIV(eventRep, event) {
+function newEventDIV(eventRep, event, offset) {
   var eventCell = newBaseEventDIV(eventRep, event, event[4]);
   
   var pc = 100 / eventRep.siblings;
@@ -270,7 +375,12 @@ function newEventDIV(eventRep, event) {
   eventCell.style.left = left + "%";
   var right = Math.floor(100 - (eventRep.position + 1) * pc);
   eventCell.style.right = right + "%";
-  eventCell.addClassName("starts" + eventRep.start);
+  if (offset != null) {
+    eventCell.addClassName("starts" + (eventRep.start - offset));
+  }
+  else {
+    eventCell.addClassName("starts" + eventRep.start);
+  }
   eventCell.addClassName("lasts" + eventRep.length);
   
   if (event[7]) {
@@ -376,6 +486,15 @@ function newBaseEventDIV(eventRep, event, eventText) {
   return eventCell;
 }
 
+function appendStyleElement(folderPath, color) {
+  if (document.styleSheets) {
+    var fgColor = getContrastingTextColor(color);
+    var styleElement = document.styleSheets[3];
+    
+    styleElement.addRule(".calendarFolder" + folderPath, "background-color: " + color + " !important;" + " color: " + fgColor + " !important;", 1);
+  }
+}
+
 function _parseEvent(event) {
   // Localized strings :
   var start = _("Start:");
@@ -426,6 +545,29 @@ function _parseTask(task) {
   return parsedTask;
 }
 
+function _computeOffset(hoursCells) {
+  var outOfDayCells = hoursCells.getElementsByClassName("outOfDay");
+  var count = 1;
+  var offset = [];
+  var buffer;
+  var j = 1;
+  for (var i = 0; i < outOfDayCells.length; i++) {
+    hourCell1 = parseInt(outOfDayCells[i].getAttribute("hour")) + 100;
+    hourCell2 = parseInt(outOfDayCells[j].getAttribute("hour"));
+    if (hourCell1 == hourCell2) {
+      count += 1;
+    }
+    else {
+      break;
+    }
+    j ++;
+  }
+  offset.push(count * 4);
+  offset.push((hourCell2 / 100 * 4) - (count * 4));
+  
+  return offset;
+}
+
 /************************************** Preview Navigation *****************************************/
 
 function onCalendarGotoDay(node) {
@@ -481,74 +623,157 @@ function dateSelectorCallback(http) {
   return false;
 }
 
-/*********************** Input Field, Checkboxes, Radio and listMenu *********************************/
+/*********************** Input Field, listMenu, Checkboxes and Radio *********************************/
 
 function onInputTitleChange(event){
   var inputFieldTitle = $("inputFieldTitle").value;
   if (inputFieldTitle)
     document.getElementById("rightFrameTitle").innerHTML = inputFieldTitle + "<br />";
   else
-    document.getElementById("rightFrameTitle").innerHTML = inputFieldTitle;
+    document.getElementById("rightFrameTitle").remove();
+  
+  return false;
 }
 
 function onPrintLayoutListChange() {
-  var selectedLayout = $("printLayoutList").value;
   var parentView = window.parentvar("currentView");
+  var selectedLayout = $("printLayoutList").value;
+  document.getElementById("printHours").disabled = (selectedLayout == 0);
   switch(selectedLayout) {
     case "0": // List view
       window.resizeTo(700,500);
-      currentView = parentView;
-      ajustFrames();
+      currentPreview = parentView;
       break;
       
     case "1": // Day view
       window.resizeTo(1010,500);
-      currentView = "dayview";
-      ajustFrames(currentView);
+      currentPreview = "dayview";
       break;
-      
-    case "2": // Week view
+    
+    case "2": // Multi-columns view
       window.resizeTo(1010,500);
-      currentView = "weekview";
-      ajustFrames(currentView);
+      currentPreview = "multicolumndayview";
       break;
       
-      //todo : month
+    case "3": // Week view
+      window.resizeTo(1010,500);
+      currentPreview = "weekview";
+      break;
+    
+    /*case "4": // Month view
+      window.resizeTo(1010,500);
+      currentPreview = "monthview";
+      break;*/
   }
-  
   refreshContent();
+  return false;
 }
 
-function ajustFrames(view) {
-  if (view == "dayview" || view == "weekview") {
+function adjustPreviewHeader() {
+  // 1 - Check if there is any allDay Events. If not reduce the space taken
+  var selectedLayout = $("printLayoutList").value;
+  if (selectedLayout != 0) {
+    var calendarHeader = $("calendarHeader");
+    var allDayDisplay = $("calendarHeader").getElementsByClassName("days");
+    var allDayEvents = $("calendarHeader").getElementsByClassName("eventInside");
+    var eventHeight = 22;
+    var headerHeight = 38;
+    if (selectedLayout == 1) { // Since there is only one column in day view
+      height = allDayEvents.length * eventHeight;
+    }
+    else { // Applies only on week view and multi-columns view
+      var nbEventsMax = 0
+      var eventClass = $("calendarHeader").getElementsByClassName("event");
+      for (var i = 0; i < allDayDisplay[0].childNodes.length; i++) {
+        if (allDayDisplay[0].childNodes[i].firstChild != null) {
+          count = allDayDisplay[0].childNodes[i].getElementsByClassName("event").length;
+          if (count > nbEventsMax) {
+            nbEventsMax = count;
+          }
+        }
+      }
+      height = nbEventsMax * eventHeight;
+      if (selectedLayout == 2) {
+        headerHeight = 58;
+        adjustMultiColumnCalendarHeaderDIV();
+      }
+    }
+    calendarHeader.style.height = (height + headerHeight) + "px";
+    allDayDisplay[0].style.height = height + "px";
+  }
+}
+
+function adjustMultiColumnCalendarHeaderDIV() {
+  var ch = $("calendarHeader");
+  var calendarLabels = ch.getElementsByClassName("calendarLabels")[0];
+  var calendarsToDisplay = calendarLabels.getElementsByClassName("calendarsToDisplay");
+  var dayLabels = ch.getElementsByClassName("dayLabels")[0].getElementsByClassName("dayColumn")[0];
+  var days = ch.getElementsByClassName("days")[0].getElementsByClassName("dayColumn");
+  var daysView = $("daysView").getElementsByClassName("dayColumn");
+  
+  var nbCalendars = calendarsToDisplay.length;
+  
+  if (nbCalendars > 0) {
+    var width = 100/nbCalendars;
+    var left = 0;
+    var position = "absolute";
+    for(var i=0; i < nbCalendars; i++){
+    	calendarsToDisplay[i].setStyle({ width: width + '%', left: left + '%', position: position}).show();
+    	days[i].setStyle({ width: width + '%', left: left + '%'}).show();
+    	daysView[i].setStyle({ width: width + '%', left: left + '%'}).show();
+      left += width;
+    }
+    dayLabels.setStyle({ width: '100%'}).show();
+  }
+  else {
+    $("calendarHeader").remove();
+    $("daysView").remove();
+    var htmlText = "<div class='alert-box notice'><span>" + _("notice:") + "</span>"+_("Please go ahead and select calendars")+"</div>";
+    $("calendarContent").innerHTML = htmlText;
+  }
+}
+
+function adjustFrames() {
+  var view = $("printLayoutList").value;
+  if (view == 0) {
+    var eventsCheckBox = $("printEvents");
+    var tasksCheckBox = $("printTasks");
+    onEventsCheck(eventsCheckBox);
+    onTasksCheck(tasksCheckBox);
+    document.getElementById("rightFrameTasks").style.pageBreakBefore = 'auto';
+    document.getElementById("rightFrameTasks").style.pageBreakInside = 'auto';
+  }
+  else {
     document.getElementById("rightFrameEvents").style.width = '100%';
     document.getElementById("rightFrameTasks").style.width = '100%';
     document.getElementById("rightFrameTasks").style.pageBreakBefore = 'always';
     document.getElementById("rightFrameTasks").style.pageBreakInside = 'avoid';
-    
   }
-  else {
-    document.getElementById("rightFrameEvents").style.width = '49.5%';
-    document.getElementById("rightFrameTasks").style.width = '49.5%';
-    document.getElementById("rightFrameTasks").style.pageBreakBefore = 'auto';
-    document.getElementById("rightFrameTasks").style.pageBreakInside = 'auto';
-  }
-  
+  return false;
 }
 
 function onEventsCheck(checkBox) {
-  if(checkBox.checked){
-    document.getElementById("rightFrameEvents").style.display = 'block';
+  var printOptions = document.getElementById("printHours");
+  var selectedLayout = $("printLayoutList").value;
+  if (!checkBox.checked || selectedLayout == 0)
+    printOptions.disabled = true;
+  else
+    printOptions.disabled = false;
+  
+  var events = $("rightFrameEvents").childNodesWithTag("DIV");
+  if(checkBox.checked && events.length > 0){
+    $("rightFrameEvents").style.display = 'block';
     if ($("printLayoutList").value == 0){
-      document.getElementById("rightFrameTasks").style.width = '49.5%';
+      $("rightFrameTasks").style.width = '49.5%';
     }
   }
   else {
-    document.getElementById("rightFrameEvents").style.display = 'none';
+    $("rightFrameEvents").style.display = 'none';
     if ($("printLayoutList").value == 0){
-      document.getElementById("rightFrameTasks").style.width = '100%';
+      $("rightFrameTasks").style.width = '100%';
     }
   }
+  return false;
 }
 
 function onTasksCheck(checkBox) {
@@ -556,18 +781,58 @@ function onTasksCheck(checkBox) {
   for (var i = 0; i < printOptions.length; i++)
     printOptions[i].disabled = !checkBox.checked;
   
-  if(checkBox.checked) {
-    document.getElementById("rightFrameTasks").style.display = 'block';
+  var tasks = $("rightFrameTasks").childNodesWithTag("DIV");
+  if(checkBox.checked && tasks.length > 0) {
+    $("rightFrameTasks").style.display = 'block';
     if ($("printLayoutList").value == 0){
-      document.getElementById("rightFrameEvents").style.width = '49.5%';
+      $("rightFrameEvents").style.width = '49.5%';
     }
   }
   else {
-    document.getElementById("rightFrameTasks").style.display = 'none';
+    $("rightFrameTasks").style.display = 'none';
     if ($("printLayoutList").value == 0){
-      document.getElementById("rightFrameEvents").style.width = '100%';
+      $("rightFrameEvents").style.width = '100%';
     }
   }
+  return false;
+}
+
+function onPrintWorkingHoursCheck(checkBox) {
+  var isCheked = checkBox.checked;
+  var outOfDayCells = $$("DIV#daysView .outOfDay");
+  var hours = $$("DIV#daysView .hour");
+  var hoursOutOfDay = [];
+  for (var i = 0; i < outOfDayCells.length; i++) {
+    var buffer = outOfDayCells[i].getAttribute("hour").substr(0,1);
+    if (buffer != "0") {
+      buffer += outOfDayCells[i].getAttribute("hour").substr(1,1);
+    }
+    else {
+      buffer = outOfDayCells[i].getAttribute("hour").substr(1,1);
+    }
+    if(isCheked) {
+      outOfDayCells[i].hide();
+      hours[buffer].hide();
+    }
+    else {
+      outOfDayCells[i].show();
+      hours[buffer].show();
+    }
+  }
+  
+  if (currentPreview == "multicolumndayview") {
+    _drawCalendarEvents(null, null, eventsBlocks);
+  }
+  else {
+    eventsList = eventsBlocks[2];
+    if (currentPreview == "monthview") {
+      //_drawMonthCalendarEvents(eventsList, eventsBlocks[0], null);
+    }
+    else {
+      _drawCalendarEvents(eventsList, eventsBlocks[0], null);
+    }
+  }
+  return false;
 }
 
 /*function onPrintDateCheck() {
@@ -580,12 +845,12 @@ function onTasksCheck(checkBox) {
 
 function onPrintCompletedTasksCheck(checkBox) {
   printCompletedTasks = (checkBox.checked ? 1 : 0);
-  refreshTasks();
+  refreshContent();
 }
 
 function onPrintNoDueDateTasksCheck(checkBox) {
   printNoDueDateTasks = (checkBox.checked ? 1 : 0);
-  refreshTasks();
+  refreshContent();
 }
 
 /************** Date picker functions *************
@@ -633,7 +898,6 @@ function onPrintClick(event) {
 /**************************** Initialization *******************************************/
 
 function init() {
-  
   initializePrintSettings();
   //initializeWhatToPrint();
   //initializeOptions();
@@ -661,6 +925,6 @@ function initializePrintSettings() {
  }*/
 
 /*function initializeOptions() {
- }*/
+}*/
 
 document.observe("dom:loaded", init);