aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-28 13:45:00 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-28 13:45:00 +0200
commitfeaad50b6c10cd19cffb63609d6eeada3d185fd7 (patch)
tree1132b370e6bb12d09dbdd6ca08e0b9c8061e29e5
parente170217c335068859b8e0769a20e9d078c1789d0 (diff)
parent7b2d54dffac5a5ee3c0ff79aee964ac0869b3142 (diff)
downloadvolse-hubzilla-feaad50b6c10cd19cffb63609d6eeada3d185fd7.tar.gz
volse-hubzilla-feaad50b6c10cd19cffb63609d6eeada3d185fd7.tar.bz2
volse-hubzilla-feaad50b6c10cd19cffb63609d6eeada3d185fd7.zip
Merge branch 'dev' into sabre32
-rwxr-xr-xview/tpl/event_head.tpl8
1 files changed, 7 insertions, 1 deletions
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 762bdcbb8..4397c5c9d 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -34,7 +34,13 @@
$('#events-calendar').fullCalendar('option', 'height', 'auto');
}
else {
- $('#events-calendar').fullCalendar('option', 'height', '');
+ if($('main').hasClass('fullscreen')) {
+ $('#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
+
+ }
+ else {
+ $('#calendar').fullCalendar('option', 'height', '');
+ }
}
$('#title').text(view.title);
}