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

Use table view as 'agenda list' view; fix typo in settings property

Browse source
This commit is contained in:
Thomas Bruederli 2011-06-13 19:23:35 -06:00
parent 79439a8934
commit 49d25ac536
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plugins/calendar/calendar.js
View file

@ -729,8 +729,10 @@ function rcube_calendar(settings)
fc.fullCalendar('option', 'smartSections', false); fc.fullCalendar('option', 'smartSections', false);
fc.fullCalendar('addEventSource', this.search_source); fc.fullCalendar('addEventSource', this.search_source);
fc.fullCalendar('changeView', 'list'); fc.fullCalendar('changeView', 'table');
} }
else // empty search input equals reset
this.reset_quicksearch();
} }
}; };
@ -747,7 +749,6 @@ function rcube_calendar(settings)
if (this.calendars[sid] && this.calendars[sid].active) if (this.calendars[sid] && this.calendars[sid].active)
fc.fullCalendar('addEventSource', this.calendars[sid]); fc.fullCalendar('addEventSource', this.calendars[sid]);
} }
console.log(this.default_view);
if (this.default_view) if (this.default_view)
fc.fullCalendar('changeView', this.default_view); fc.fullCalendar('changeView', this.default_view);
@ -821,7 +822,7 @@ function rcube_calendar(settings)
header: { header: {
left: 'prev,next today', left: 'prev,next today',
center: 'title', center: 'title',
right: 'agendaDay,agendaWeek,month,list,table' right: 'agendaDay,agendaWeek,month,table'
}, },
aspectRatio: 1, aspectRatio: 1,
ignoreTimezone: false, // will translate event dates to the client's timezone ignoreTimezone: false, // will translate event dates to the client's timezone
@ -845,8 +846,8 @@ function rcube_calendar(settings)
month: 'ddd', // Mon month: 'ddd', // Mon
week: 'ddd ' + settings['date_short'], // Mon 9/7 week: 'ddd ' + settings['date_short'], // Mon 9/7
day: 'dddd ' + settings['date_short'], // Monday 9/7 day: 'dddd ' + settings['date_short'], // Monday 9/7
list: settings['date_agena'], list: settings['date_agenda'],
table: settings['date_agena'] table: settings['date_agenda']
}, },
titleFormat: { titleFormat: {
month: 'MMMM yyyy', month: 'MMMM yyyy',
@ -863,8 +864,7 @@ function rcube_calendar(settings)
day: rcmail.gettext('day', 'calendar'), day: rcmail.gettext('day', 'calendar'),
week: rcmail.gettext('week', 'calendar'), week: rcmail.gettext('week', 'calendar'),
month: rcmail.gettext('month', 'calendar'), month: rcmail.gettext('month', 'calendar'),
list: rcmail.gettext('agenda', 'calendar'), table: rcmail.gettext('agenda', 'calendar')
table: rcmail.gettext('table', 'calendar')
}, },
selectable: true, selectable: true,
selectHelper: true, selectHelper: true,

4
plugins/calendar/calendar.php
View file

@ -179,7 +179,7 @@ class calendar extends rcube_plugin
$select->add($this->gettext('day'), "agendaDay"); $select->add($this->gettext('day'), "agendaDay");
$select->add($this->gettext('week'), "agendaWeek"); $select->add($this->gettext('week'), "agendaWeek");
$select->add($this->gettext('month'), "month"); $select->add($this->gettext('month'), "month");
$select->add($this->gettext('agenda'), "list"); $select->add($this->gettext('agenda'), "table");
$p['blocks']['view']['options']['default_view'] = array( $p['blocks']['view']['options']['default_view'] = array(
'title' => html::label($field_id, Q($this->gettext('default_view'))), 'title' => html::label($field_id, Q($this->gettext('default_view'))),
'content' => $select->show($this->rc->config->get('calendar_default_view', "agendaWeek")), 'content' => $select->show($this->rc->config->get('calendar_default_view', "agendaWeek")),
@ -510,7 +510,7 @@ class calendar extends rcube_plugin
$settings['date_format'] = (string)$this->rc->config->get('calendar_date_format', "yyyy/MM/dd"); $settings['date_format'] = (string)$this->rc->config->get('calendar_date_format', "yyyy/MM/dd");
$settings['date_short'] = (string)$this->rc->config->get('calendar_date_short', "M/d"); $settings['date_short'] = (string)$this->rc->config->get('calendar_date_short', "M/d");
$settings['date_long'] = (string)$this->rc->config->get('calendar_date_long', "M d yyyy"); $settings['date_long'] = (string)$this->rc->config->get('calendar_date_long', "M d yyyy");
$settings['date_agena'] = (string)$this->rc->config->get('calendar_date_agenda', "ddd M d"); $settings['date_agenda'] = (string)$this->rc->config->get('calendar_date_agenda', "ddd M d");
$settings['time_format'] = (string)$this->rc->config->get('calendar_time_format', "HH:mm"); $settings['time_format'] = (string)$this->rc->config->get('calendar_time_format', "HH:mm");
$settings['timeslots'] = (int)$this->rc->config->get('calendar_timeslots', 2); $settings['timeslots'] = (int)$this->rc->config->get('calendar_timeslots', 2);
$settings['first_day'] = (int)$this->rc->config->get('calendar_first_day', 1); $settings['first_day'] = (int)$this->rc->config->get('calendar_first_day', 1);