Make events export track the current calendar. Turn it and 'new event' into buttons

2 files changed, 13 insertions, 3 deletions

diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 6f1d2f22c..bcb1e07f6 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -24,10 +24,11 @@
 			eventClick: function(calEvent, jsEvent, view) {
 				showEvent(calEvent.id);
 			},
-			
+
 			eventRender: function(event, element, view) {
 				//console.log(view.name);
 				if (event.item['author']['xchan_name']==null) return;
+
 				switch(view.name){
 					case "month":
 					element.find(".fc-event-title").html(
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index ad41e983a..9812291bf 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -2,8 +2,17 @@
 <div class="generic-content-wrapper-styled">
 <h2>{{$title}}</h2>
 
-<div id="export-event-link"><a href="{{$export.0}}" >{{$export.1}}</a></div>
-<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>
+
+<div id="export-event-link"><button class="btn btn-default btn-sm" onclick="exportDate(); return false;" >{{$export.1}}</button></div>
+<div id="new-event-link"><button class="btn btn-default btn-sm" onclick="window.location.href='{{$new_event.0}}'; return false;" >{{$new_event.1}}</button></div>
+
+<script>
+function exportDate() {
+    var moment = $('#events-calendar').fullCalendar('getDate');
+	var sT = 'events/' + moment.getFullYear() + '/' + (moment.getMonth() + 1) + '/export';
+    window.location.href=sT;
+}
+</script>
 
 <div id="events-calendar"></div>
 </div>