From dabd8d3282c1e1f4a4d3622637c7952e1e295cb5 Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Thu, 26 Jun 2014 10:05:48 -0400
Subject: [PATCH] Fix list view printing with multiColumns view

---
 UI/WebServerResources/UIxCalViewPrint.js | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/UI/WebServerResources/UIxCalViewPrint.js b/UI/WebServerResources/UIxCalViewPrint.js
index 4bbcfad4a..f385d7991 100644
--- a/UI/WebServerResources/UIxCalViewPrint.js
+++ b/UI/WebServerResources/UIxCalViewPrint.js
@@ -240,10 +240,21 @@ function refreshTasksListCallback(http) {
 function _drawEventsCells(eventsBlocks) {
   var events = _("Events");
   $("rightFrameEvents").insert("<h3>"+events+"</h3>");
-  for(var i=0; i < eventsBlocks[0].length; i++)
-  {
-    var event = _parseEvent(eventsBlocks[0][i]);
-    $("rightFrameEvents").insert(event);
+  if (currentPreview == "multicolumndayview") {
+    for(var i=0; i < eventsBlocks.length; i++) // calendars
+    {
+      for (var j = 0; j < eventsBlocks[i][0].length; j++) {
+        var event = _parseEvent(eventsBlocks[i][0][j]);
+        $("rightFrameEvents").insert(event);
+      }
+    }
+  }
+  else {
+    for(var i=0; i < eventsBlocks[0].length; i++)
+    {
+      var event = _parseEvent(eventsBlocks[0][i]);
+      $("rightFrameEvents").insert(event);
+    }
   }
 }
 
@@ -491,7 +502,9 @@ function appendStyleElement(folderPath, color) {
     var fgColor = getContrastingTextColor(color);
     var styleElement = document.styleSheets[3];
     
-    styleElement.addRule(".calendarFolder" + folderPath, "background-color: " + color + " !important;" + " color: " + fgColor + " !important;", 1);
+    styleElement.insertRule(".calendarFolder" + folderPath +
+                            "{background-color: " + color + " !important;" +
+                            " color: " + fgColor + " !important;}", styleElement.cssRules.length);
   }
 }