From ba84648fa7031edd41d949e82e62e5fb80e482df Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Tue, 17 Feb 2015 14:04:57 +0100 Subject: [PATCH] - Onyl print events from active calendars (#4603) - Fix colors of events in month view - Show calendar color legend as floating list, no hierarchy --- plugins/calendar/print.js | 3 +++ plugins/calendar/skins/larry/print.css | 23 +++++++++++++++---- .../calendar/skins/larry/templates/print.html | 1 + 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/plugins/calendar/print.js b/plugins/calendar/print.js index c3c647ce..941d04c3 100644 --- a/plugins/calendar/print.js +++ b/plugins/calendar/print.js @@ -43,6 +43,9 @@ window.rcmail && rcmail.addEventListener('init', function(evt) { var src, event_sources = []; var add_url = (rcmail.env.search ? '&q='+escape(rcmail.env.search) : ''); for (var id in rcmail.env.calendars) { + if (!rcmail.env.calendars[id].active) + continue; + source = $.extend({ url: "./?_task=calendar&_action=load_events&source=" + escape(id) + add_url, className: 'fc-event-cal-'+id, diff --git a/plugins/calendar/skins/larry/print.css b/plugins/calendar/skins/larry/print.css index 5d190f5b..ce6e8e73 100644 --- a/plugins/calendar/skins/larry/print.css +++ b/plugins/calendar/skins/larry/print.css @@ -1,7 +1,7 @@ /*** Printing styles for Calendar plugin ***/ body { - margin: 0; + margin: 0 0 1em 0; color: #000; background: #fff; } @@ -54,18 +54,30 @@ body, td, th, div, p, h3, select, input, textarea { } #calendarlist { - list-style-type: square; + list-style: none; margin: 2em 0; padding-left: 1em; } -#calendarlist li { +#calendarlist ul { + float: left; + list-style: none; padding-left: 0; - padding-right: 3em; +} + +#calendarlist li { + float: left; + padding-left: 0; + padding-right: 0; margin-left: 0; font-weight: bold; } +#calendarlist li div { + float: left; + padding-right: 3em; +} + #calendarlist input, #calendarlist .handle { display: none; @@ -207,6 +219,9 @@ body, td, th, div, p, h3, select, input, textarea { font-style: italic; } +.fc-view-month .fc-event-hori .fc-event-inner { + background: #fff !important; +} .fc-view-table col.fc-event-location { width: 20%; diff --git a/plugins/calendar/skins/larry/templates/print.html b/plugins/calendar/skins/larry/templates/print.html index 8d7789a0..e679f729 100644 --- a/plugins/calendar/skins/larry/templates/print.html +++ b/plugins/calendar/skins/larry/templates/print.html @@ -19,6 +19,7 @@
+