Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix event-refetching and visual appearance of agenda view

Browse source
This commit is contained in:
Thomas Bruederli 2011-06-10 09:29:34 -06:00
parent 2ff0adf9e8
commit 3a6c468911
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/calendar/calendar.php
View file

@ -177,6 +177,7 @@ class calendar extends rcube_plugin
$select->add($this->gettext('day'), "agendaDay");
$select->add($this->gettext('week'), "agendaWeek");
$select->add($this->gettext('month'), "month");
$select->add($this->gettext('agenda'), "list");
$p['blocks']['view']['options']['default_view'] = array(
'title' => html::label($field_id, Q($this->gettext('default_view'))),
'content' => $select->show($this->rc->config->get('calendar_default_view', "agendaWeek")),

10
plugins/calendar/lib/js/fullcalendar.js
View file

@ -87,7 +87,7 @@ var defaults = {
thisWeek: 'This week',
nextWeek: 'Next week',
thisMonth: 'This month',
nextMonth: 'Next Month',
nextMonth: 'Next month',
future: 'Future events'
},
@ -915,12 +915,12 @@ function EventManager(options, _sources) {
function fetchEvents(start, end, src) {
rangeStart = start;
rangeEnd = end;
cache = typeof src != 'undefined' ? $.grep(cache, function(e) { return !isSourcesEqual(e.source, source); }) : [];
cache = typeof src != 'undefined' ? $.grep(cache, function(e) { return !isSourcesEqual(e.source, src); }) : [];
var fetchID = ++currentFetchID;
var len = sources.length;
pendingSourceCnt = typeof src == 'undefined' ? len : 1;
for (var i=0; i<len; i++) {
if (typeof src == 'undefined' || src == sources[i])
if (typeof src == 'undefined' || isSourcesEqual(sources[i], src))
fetchEventSource(sources[i], fetchID);
}
}
@ -5415,6 +5415,8 @@ function ListEventRenderer() {
lazySegBind(segContainer, seg, bindSeg);
}
markFirstLast(getListContainer());
}
function bindSeg(event, eventElement, seg) {
@ -5510,7 +5512,7 @@ function ListView(element, calendar) {
}
function setHeight(height, dateChanged) {
body.css('height', height+'px').css('overflow', 'auto');
body.css('height', (height-1)+'px').css('overflow', 'auto');
}
function setWidth(width) {

13
plugins/calendar/skins/default/fullcalendar.css
View file

@ -620,18 +620,25 @@ table.fc-border-separate {
------------------------------------------------------------------------*/
.fc-view-list {
border-top: 1px solid #ccc;
border: 1px solid #ccc;
width: 99%;
}
.fc-view-list .fc-list-header {
border-top-width: 0;
border-bottom-width: 0;
border-width: 0;
border-bottom-width: 1px;
padding: 2px;
text-align: center;
}
.fc-list-section {
padding: 4px 2px;
border-width: 0;
border-bottom-width: 1px;
}
.fc-view-list .fc-last {
border-bottom-width: 0;
}
.fc-list-section .fc-event {