diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-03 15:58:20 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-03 15:58:20 -0700 |
| commit | 57226b2e1378c2769709a2b2407249cc4e3b14f4 (patch) | |
| tree | fbb6a4713b6ae9c5cb13ab47ffdb1d03a586c820 /view/tpl/event_head.tpl | |
| parent | 17e161006a9ddbfbea3e0b6d5f7776ad7b8101e2 (diff) | |
| parent | f46eecc1e7585e64069bb18918a2db057a16c480 (diff) | |
| download | volse-hubzilla-57226b2e1378c2769709a2b2407249cc4e3b14f4.tar.gz volse-hubzilla-57226b2e1378c2769709a2b2407249cc4e3b14f4.tar.bz2 volse-hubzilla-57226b2e1378c2769709a2b2407249cc4e3b14f4.zip | |
Merge branch 'dev' into perms
Diffstat (limited to 'view/tpl/event_head.tpl')
| -rwxr-xr-x | view/tpl/event_head.tpl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 762bdcbb8..fee4f17a3 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -30,12 +30,18 @@ function changeView(action, viewName) { $('#events-calendar').fullCalendar(action, viewName); var view = $('#events-calendar').fullCalendar('getView'); - if(view.type === 'agendaDay' || view.type === 'agendaWeek') { + + if(view.type !== 'month' && !$('main').hasClass('fullscreen')) { $('#events-calendar').fullCalendar('option', 'height', 'auto'); } else { $('#events-calendar').fullCalendar('option', 'height', ''); } + + if($('main').hasClass('fullscreen')) { + $('#events-calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper + } + $('#title').text(view.title); } |