aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-06-17 15:02:07 -0700
committerredmatrix <git@macgirvin.com>2016-06-17 15:02:07 -0700
commitd0f0a999091a275b74d23aa67478fa0b21fb9d52 (patch)
tree3c6430cca5d3890e5e338a235cf03f608d800298
parent2793086c0d65c24e172f7260129968eb80705018 (diff)
parentaa5ac9dc3fb81bdc8aa17567eed42e845c408d00 (diff)
downloadvolse-hubzilla-d0f0a999091a275b74d23aa67478fa0b21fb9d52.tar.gz
volse-hubzilla-d0f0a999091a275b74d23aa67478fa0b21fb9d52.tar.bz2
volse-hubzilla-d0f0a999091a275b74d23aa67478fa0b21fb9d52.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
-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'],