- Onyl print events from active calendars (#4603)
- Fix colors of events in month view - Show calendar color legend as floating list, no hierarchy
This commit is contained in:
parent
f78af8b09f
commit
ba84648fa7
3 changed files with 23 additions and 4 deletions
|
@ -43,6 +43,9 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
|
||||||
var src, event_sources = [];
|
var src, event_sources = [];
|
||||||
var add_url = (rcmail.env.search ? '&q='+escape(rcmail.env.search) : '');
|
var add_url = (rcmail.env.search ? '&q='+escape(rcmail.env.search) : '');
|
||||||
for (var id in rcmail.env.calendars) {
|
for (var id in rcmail.env.calendars) {
|
||||||
|
if (!rcmail.env.calendars[id].active)
|
||||||
|
continue;
|
||||||
|
|
||||||
source = $.extend({
|
source = $.extend({
|
||||||
url: "./?_task=calendar&_action=load_events&source=" + escape(id) + add_url,
|
url: "./?_task=calendar&_action=load_events&source=" + escape(id) + add_url,
|
||||||
className: 'fc-event-cal-'+id,
|
className: 'fc-event-cal-'+id,
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*** Printing styles for Calendar plugin ***/
|
/*** Printing styles for Calendar plugin ***/
|
||||||
|
|
||||||
body {
|
body {
|
||||||
margin: 0;
|
margin: 0 0 1em 0;
|
||||||
color: #000;
|
color: #000;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
}
|
}
|
||||||
|
@ -54,18 +54,30 @@ body, td, th, div, p, h3, select, input, textarea {
|
||||||
}
|
}
|
||||||
|
|
||||||
#calendarlist {
|
#calendarlist {
|
||||||
list-style-type: square;
|
list-style: none;
|
||||||
margin: 2em 0;
|
margin: 2em 0;
|
||||||
padding-left: 1em;
|
padding-left: 1em;
|
||||||
}
|
}
|
||||||
|
|
||||||
#calendarlist li {
|
#calendarlist ul {
|
||||||
|
float: left;
|
||||||
|
list-style: none;
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
padding-right: 3em;
|
}
|
||||||
|
|
||||||
|
#calendarlist li {
|
||||||
|
float: left;
|
||||||
|
padding-left: 0;
|
||||||
|
padding-right: 0;
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#calendarlist li div {
|
||||||
|
float: left;
|
||||||
|
padding-right: 3em;
|
||||||
|
}
|
||||||
|
|
||||||
#calendarlist input,
|
#calendarlist input,
|
||||||
#calendarlist .handle {
|
#calendarlist .handle {
|
||||||
display: none;
|
display: none;
|
||||||
|
@ -207,6 +219,9 @@ body, td, th, div, p, h3, select, input, textarea {
|
||||||
font-style: italic;
|
font-style: italic;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.fc-view-month .fc-event-hori .fc-event-inner {
|
||||||
|
background: #fff !important;
|
||||||
|
}
|
||||||
|
|
||||||
.fc-view-table col.fc-event-location {
|
.fc-view-table col.fc-event-location {
|
||||||
width: 20%;
|
width: 20%;
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
|
|
||||||
<div class="calwidth">
|
<div class="calwidth">
|
||||||
<roundcube:object name="plugin.calendar_list" activeonly="true" id="calendarlist" />
|
<roundcube:object name="plugin.calendar_list" activeonly="true" id="calendarlist" />
|
||||||
|
<br style="clear:both">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<roundcube:object name="plugin.calendar_css" printmode="true" />
|
<roundcube:object name="plugin.calendar_css" printmode="true" />
|
||||||
|
|
Loading…
Add table
Reference in a new issue