diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-25 06:05:12 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-25 06:05:12 +0100 |
| commit | 21f2df399d3e21b6322ece16717efe88bcc21621 (patch) | |
| tree | 1f6bcf44e803c1ef723b546eb4fcd83dc5f82e87 /view/tpl/event_head.tpl | |
| parent | ddeab48f9b314eed067c31086945acee33964d37 (diff) | |
| parent | 43521bb10b71752b5b3fd953056966ba30df50b6 (diff) | |
| download | volse-hubzilla-21f2df399d3e21b6322ece16717efe88bcc21621.tar.gz volse-hubzilla-21f2df399d3e21b6322ece16717efe88bcc21621.tar.bz2 volse-hubzilla-21f2df399d3e21b6322ece16717efe88bcc21621.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl/event_head.tpl')
| -rwxr-xr-x | view/tpl/event_head.tpl | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index dc98d14b3..5083c5835 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -6,7 +6,7 @@ <script> function showEvent(eventid) { $.get( - '{{$baseurl}}/events/?id='+eventid, + '{{$baseurl}}{{$module_url}}/?id='+eventid, function(data){ $.colorbox({ scrolling: false, html: data, onComplete: function() { $.colorbox.resize(); }}); } @@ -36,7 +36,7 @@ $(document).ready(function() { $('#events-calendar').fullCalendar({ - events: '{{$baseurl}}/events/json', + events: '{{$baseurl}}{{$module_url}}/json', header: false, lang: '{{$lang}}', firstDay: {{$first_day}}, @@ -109,10 +109,17 @@ }); // center on date + // @fixme does not work for cal/$nick module_url var args=location.href.replace(baseurl,"").split("/"); + {{if $modparams == 2}} + if (args.length>=5) { + $("#events-calendar").fullCalendar('gotoDate',args[3] , args[4]-1); + } + {{else}} if (args.length>=4) { $("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1); - } + } + {{/if}} // show event popup var hash = location.hash.split("-") |