aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-17 11:58:14 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-17 11:58:14 +0200
commit9749bbcedcb0aa20330790ca7af838d00de45f05 (patch)
tree86164228720f1ede29504408e4f2bf3079049556 /view/tpl
parent0324bc5cf0fe6a758070cdc74897836758187b30 (diff)
parentaa5ac9dc3fb81bdc8aa17567eed42e845c408d00 (diff)
downloadvolse-hubzilla-9749bbcedcb0aa20330790ca7af838d00de45f05.tar.gz
volse-hubzilla-9749bbcedcb0aa20330790ca7af838d00de45f05.tar.bz2
volse-hubzilla-9749bbcedcb0aa20330790ca7af838d00de45f05.zip
Merge branch 'dev' into sabre32
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'],