2 commits - plugins/calendar

Thomas Brüderli bruederli at kolabsys.com
Thu Oct 4 12:53:12 CEST 2012


 plugins/calendar/calendar.php                  |    1 +
 plugins/calendar/print.js                      |    2 +-
 plugins/calendar/skins/classic/print.css       |    3 ++-
 plugins/calendar/skins/larry/calendar.css      |    2 +-
 plugins/calendar/skins/larry/images/toggle.gif |binary
 plugins/calendar/skins/larry/print.css         |    3 ++-
 6 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit a22f1764d8ae17a6913bf6618d207de029e6b333
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Oct 4 12:52:56 2012 +0200

    Fix calendar printing after refactoring and skin update

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index b676fb0..f51af3c 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 b90c068..67b6a93 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 3c9bd71..f332d62 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 034a724..7356b3a 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 3c9bd71..f332d62 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;
 }
 


commit ea5a2fae4c69760f94ae185bc7f7189bdf66609f
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Oct 4 12:37:43 2012 +0200

    Copy missing image from classic skin

diff --git a/plugins/calendar/skins/larry/images/toggle.gif b/plugins/calendar/skins/larry/images/toggle.gif
new file mode 100644
index 0000000..d3be86f
Binary files /dev/null and b/plugins/calendar/skins/larry/images/toggle.gif differ





More information about the commits mailing list