plugins/calendar

Thomas Brüderli bruederli at kolabsys.com
Thu Feb 12 13:38:29 CET 2015


 plugins/calendar/lib/calendar_ui.php   |    2 +-
 plugins/calendar/print.js              |    2 +-
 plugins/calendar/skins/larry/print.css |    6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit a6ba6981e904ce25daa7d71cdb0b9783e6febda5
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Feb 12 13:38:17 2015 +0100

    Fix calendar print view

diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index 6fcdb3c..33ff37a 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -176,7 +176,7 @@ class calendar_ui
   {
     $color = $prop['color'];
     $class = 'cal-' . asciiwords($id, true);
-    $css .= "li.$class, #eventshow .$class { color: #$color }\n";
+    $css .= "li .$class, #eventshow .$class { color: #$color }\n";
 
     if ($mode != 1) {
       if ($mode == 3) {
diff --git a/plugins/calendar/print.js b/plugins/calendar/print.js
index 731a7d2..c3c647c 100644
--- a/plugins/calendar/print.js
+++ b/plugins/calendar/print.js
@@ -125,7 +125,7 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
     },
     // event rendering
     eventRender: function(event, element, view) {
-      if (view.name != 'month') {
+      if (view.name != 'month' && view.name != 'table') {
         var cont = element.find('.fc-event-title');
         if (event.location) {
           cont.after('<div class="fc-event-location">@ ' + Q(event.location) + '</div>');
diff --git a/plugins/calendar/skins/larry/print.css b/plugins/calendar/skins/larry/print.css
index 908d760..5d190f5 100644
--- a/plugins/calendar/skins/larry/print.css
+++ b/plugins/calendar/skins/larry/print.css
@@ -60,7 +60,6 @@ body, td, th, div, p, h3, select, input, textarea {
 }
 
 #calendarlist li {
-	float: left;
 	padding-left: 0;
 	padding-right: 3em;
 	margin-left: 0;
@@ -72,6 +71,11 @@ body, td, th, div, p, h3, select, input, textarea {
 	display: none;
 }
 
+#calendarlist li.x-invitations div {
+	color: #999;
+	font-style: italic;
+}
+
 .calwidth {
 	width: 700px;
 	margin: 0 auto;




More information about the commits mailing list