aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-06-17 06:36:09 -0400
committerAndrew Manning <tamanning@zoho.com>2016-06-17 06:36:09 -0400
commit80d3a831f377820ef7b816129ad333a756a4a704 (patch)
tree21830d7f863a29f4c01b4b1be2e43f66767d1f4a /view/tpl
parent961539258be90f5b7c989299db0e8c551d0d6c72 (diff)
parentaa5ac9dc3fb81bdc8aa17567eed42e845c408d00 (diff)
downloadvolse-hubzilla-80d3a831f377820ef7b816129ad333a756a4a704.tar.gz
volse-hubzilla-80d3a831f377820ef7b816129ad333a756a4a704.tar.bz2
volse-hubzilla-80d3a831f377820ef7b816129ad333a756a4a704.zip
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/event_head.tpl7
1 files changed, 6 insertions, 1 deletions
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 5083c5835..762bdcbb8 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -30,6 +30,12 @@
function changeView(action, viewName) {
$('#events-calendar').fullCalendar(action, viewName);
var view = $('#events-calendar').fullCalendar('getView');
+ if(view.type === 'agendaDay' || view.type === 'agendaWeek') {
+ $('#events-calendar').fullCalendar('option', 'height', 'auto');
+ }
+ else {
+ $('#events-calendar').fullCalendar('option', 'height', '');
+ }
$('#title').text(view.title);
}
@@ -42,7 +48,6 @@
firstDay: {{$first_day}},
eventLimit: 3,
- height: 'auto',
monthNames: aStr['monthNames'],
monthNamesShort: aStr['monthNamesShort'],