Use table view as 'agenda list' view; fix typo in settings property
This commit is contained in:
parent
79439a8934
commit
49d25ac536
2 changed files with 9 additions and 9 deletions
|
@ -729,8 +729,10 @@ function rcube_calendar(settings)
|
|||
|
||||
fc.fullCalendar('option', 'smartSections', false);
|
||||
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)
|
||||
fc.fullCalendar('addEventSource', this.calendars[sid]);
|
||||
}
|
||||
console.log(this.default_view);
|
||||
if (this.default_view)
|
||||
fc.fullCalendar('changeView', this.default_view);
|
||||
|
||||
|
@ -821,7 +822,7 @@ function rcube_calendar(settings)
|
|||
header: {
|
||||
left: 'prev,next today',
|
||||
center: 'title',
|
||||
right: 'agendaDay,agendaWeek,month,list,table'
|
||||
right: 'agendaDay,agendaWeek,month,table'
|
||||
},
|
||||
aspectRatio: 1,
|
||||
ignoreTimezone: false, // will translate event dates to the client's timezone
|
||||
|
@ -845,8 +846,8 @@ function rcube_calendar(settings)
|
|||
month: 'ddd', // Mon
|
||||
week: 'ddd ' + settings['date_short'], // Mon 9/7
|
||||
day: 'dddd ' + settings['date_short'], // Monday 9/7
|
||||
list: settings['date_agena'],
|
||||
table: settings['date_agena']
|
||||
list: settings['date_agenda'],
|
||||
table: settings['date_agenda']
|
||||
},
|
||||
titleFormat: {
|
||||
month: 'MMMM yyyy',
|
||||
|
@ -863,8 +864,7 @@ function rcube_calendar(settings)
|
|||
day: rcmail.gettext('day', 'calendar'),
|
||||
week: rcmail.gettext('week', 'calendar'),
|
||||
month: rcmail.gettext('month', 'calendar'),
|
||||
list: rcmail.gettext('agenda', 'calendar'),
|
||||
table: rcmail.gettext('table', 'calendar')
|
||||
table: rcmail.gettext('agenda', 'calendar')
|
||||
},
|
||||
selectable: true,
|
||||
selectHelper: true,
|
||||
|
|
|
@ -179,7 +179,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");
|
||||
$select->add($this->gettext('agenda'), "table");
|
||||
$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")),
|
||||
|
@ -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_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_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['timeslots'] = (int)$this->rc->config->get('calendar_timeslots', 2);
|
||||
$settings['first_day'] = (int)$this->rc->config->get('calendar_first_day', 1);
|
||||
|
|
Loading…
Add table
Reference in a new issue