aboutsummaryrefslogtreecommitdiffstats
path: root/view
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
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')
-rw-r--r--view/js/mod_cal.js2
-rw-r--r--view/js/mod_events.js2
-rwxr-xr-xview/tpl/event_head.tpl7
3 files changed, 8 insertions, 3 deletions
diff --git a/view/js/mod_cal.js b/view/js/mod_cal.js
index 0bf97fcf7..5867f676e 100644
--- a/view/js/mod_cal.js
+++ b/view/js/mod_cal.js
@@ -17,6 +17,6 @@ function on_fullscreen() {
function on_inline() {
var view = $('#events-calendar').fullCalendar('getView');
if(view.type === 'month') {
- $('#events-calendar').fullCalendar('option', 'height', 'auto');
+ $('#events-calendar').fullCalendar('option', 'height', '');
}
}
diff --git a/view/js/mod_events.js b/view/js/mod_events.js
index e67890b47..66cf81ddd 100644
--- a/view/js/mod_events.js
+++ b/view/js/mod_events.js
@@ -28,6 +28,6 @@ function on_fullscreen() {
function on_inline() {
var view = $('#events-calendar').fullCalendar('getView');
if(view.type === 'month') {
- $('#events-calendar').fullCalendar('option', 'height', 'auto');
+ $('#events-calendar').fullCalendar('option', 'height', '');
}
}
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'],