Branch 'roundcubemail-plugins-kolab-format2-horde5' - 2 commits - plugins/calendar plugins/libcalendaring
Thomas Brüderli
bruederli at kolabsys.com
Mon Jun 24 11:45:29 CEST 2013
plugins/calendar/skins/larry/calendar.css | 4 +---
plugins/libcalendaring/libcalendaring.php | 17 ++++++++++-------
2 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit e0288c68c28012a79a06880a7190625b4421a82f
Author: Thomas Bruederli <thomas at roundcube.net>
Date: Mon Jun 24 11:45:24 2013 +0200
Small adjustments in calendar view (Larry skin)
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index 1b0bb09..90e145e 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -285,8 +285,6 @@ pre {
}
body.calendarmain #quicksearchbar {
- top: -7px;
- right: 2px;
z-index: 200;
}
@@ -1183,7 +1181,7 @@ a.dropdown-link:after {
.calendarmain .fc-header-right {
padding-right: 252px;
- padding-top: 2px;
+ padding-top: 4px;
}
.fc-header-title {
commit 07e1b2596044e230dedefe8dae4983ddac11ba74
Author: Aleksander Machniak <machniak at kolabsys.com>
Date: Sat May 11 09:09:13 2013 +0200
No need to set_env in ajax request (limits size of ajax response)
diff --git a/plugins/libcalendaring/libcalendaring.php b/plugins/libcalendaring/libcalendaring.php
index 423a271..d842dc5 100644
--- a/plugins/libcalendaring/libcalendaring.php
+++ b/plugins/libcalendaring/libcalendaring.php
@@ -84,14 +84,17 @@ class libcalendaring extends rcube_plugin
$this->add_texts('localization/', false);
// include client scripts and styles
- $this->include_script('libcalendaring.js');
- $this->rc->output->set_env('libcal_settings', $this->load_settings());
-
- $this->include_stylesheet($this->local_skin_path() . '/libcal.css');
+ if ($this->rc->output) {
+ if ($this->rc->output->type == 'html') {
+ $this->rc->output->set_env('libcal_settings', $this->load_settings());
+ $this->include_script('libcalendaring.js');
+ $this->include_stylesheet($this->local_skin_path() . '/libcal.css');
+ }
- // add hook to display alarms
- $this->add_hook('refresh', array($this, 'refresh'));
- $this->register_action('plugin.alarms', array($this, 'alarms_action'));
+ // add hook to display alarms
+ $this->add_hook('refresh', array($this, 'refresh'));
+ $this->register_action('plugin.alarms', array($this, 'alarms_action'));
+ }
}
More information about the commits
mailing list