diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php index b676fb06..f51af3cc 100644 --- a/plugins/calendar/calendar.php +++ b/plugins/calendar/calendar.php @@ -1476,6 +1476,7 @@ class calendar extends rcube_plugin // Add JS files to the page header $this->include_script('print.js'); + $this->include_script('lib/js/fullcalendar.js'); $this->register_handler('plugin.calendar_css', array($this->ui, 'calendar_css')); $this->register_handler('plugin.calendar_list', array($this->ui, 'calendar_list')); diff --git a/plugins/calendar/print.js b/plugins/calendar/print.js index b90c0685..67b6a93a 100644 --- a/plugins/calendar/print.js +++ b/plugins/calendar/print.js @@ -32,7 +32,7 @@ window.rcmail && rcmail.addEventListener('init', function(evt) { var rc_loading; var showdesc = true; - var settings = rcmail.env.calendar_settings; + var settings = $.extend(rcmail.env.calendar_settings, rcmail.env.libcal_settings); // create list of event sources AKA calendars var src, event_sources = []; diff --git a/plugins/calendar/skins/classic/print.css b/plugins/calendar/skins/classic/print.css index 3c9bd716..f332d629 100644 --- a/plugins/calendar/skins/classic/print.css +++ b/plugins/calendar/skins/classic/print.css @@ -67,7 +67,8 @@ body, td, th, div, p, h3, select, input, textarea { font-weight: bold; } -#calendarlist input { +#calendarlist input, +#calendarlist .handle { display: none; } diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css index 034a724a..7356b3af 100644 --- a/plugins/calendar/skins/larry/calendar.css +++ b/plugins/calendar/skins/larry/calendar.css @@ -1011,7 +1011,7 @@ a.dropdown-link:after { -moz-box-shadow: 0 0 2px #999; } -.fc-content { +.calendarmain .fc-content { position: absolute !important; top: 40px; left: 0; diff --git a/plugins/calendar/skins/larry/print.css b/plugins/calendar/skins/larry/print.css index 3c9bd716..f332d629 100644 --- a/plugins/calendar/skins/larry/print.css +++ b/plugins/calendar/skins/larry/print.css @@ -67,7 +67,8 @@ body, td, th, div, p, h3, select, input, textarea { font-weight: bold; } -#calendarlist input { +#calendarlist input, +#calendarlist .handle { display: none; }