From 7e6febe2a6609457eca1f1caf650375534780048 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Wed, 24 Feb 2016 15:19:28 -0800
Subject: add 'requires' field to plugin info to list other dependent
 plugins/addons and disable if dependencies are not installed/enabled

---
 view/tpl/admin_plugins_details.tpl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl
index 721bd3573..5d9e233f9 100755
--- a/view/tpl/admin_plugins_details.tpl
+++ b/view/tpl/admin_plugins_details.tpl
@@ -24,6 +24,9 @@
 	{{if $info.minphpversion}}
 	<p class="versionlimit">{{$str_minphpversion}}{{$info.minphpversion}}</p>
 	{{/if}}
+	{{if $info.requires}}
+	<p class="versionlimit">{{$str_requires}}{{$info.requires}}</p>
+	{{/if}}
 
 
 	{{foreach $info.maintainer as $a}}
-- 
cgit v1.2.3


From c95d7c69eb3135f137390323a09eb105776ce29c Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Wed, 24 Feb 2016 18:54:52 -0800
Subject: issue #216 - calendar sharing

---
 view/tpl/event_cal.tpl     | 14 ++++++++++++++
 view/tpl/event_head.tpl    | 13 ++++++++++---
 view/tpl/events_cal-js.tpl | 17 +++++++++++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100755 view/tpl/event_cal.tpl
 create mode 100755 view/tpl/events_cal-js.tpl

(limited to 'view/tpl')

diff --git a/view/tpl/event_cal.tpl b/view/tpl/event_cal.tpl
new file mode 100755
index 000000000..61458b263
--- /dev/null
+++ b/view/tpl/event_cal.tpl
@@ -0,0 +1,14 @@
+{{foreach $events as $event}}
+	<div class="event-wrapper">
+		<div class="event">
+			<div class="event-owner">
+				{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}">{{$event.item.author.xchan_name}}</a>{{/if}}
+			</div>
+			{{$event.html}}
+			<div class="event-buttons">
+				{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link"><i class="icon-external-link btn btn-default" ></i></a>{{/if}}
+			</div>
+			<div class="clear"></div>
+		</div>
+	</div>
+{{/foreach}}
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("-")
diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl
new file mode 100755
index 000000000..b3c7ff03b
--- /dev/null
+++ b/view/tpl/events_cal-js.tpl
@@ -0,0 +1,17 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<div class="btn-group">
+				<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button>
+				<button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>
+				<button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="icon-forward"></i></button>
+			</div>
+		</div>
+		<h2 id="title"></h2>
+		<div class="clear"></div>
+	</div>
+	<div class="clear"></div>
+	<div class="section-content-wrapper-np">
+		<div id="events-calendar"></div>
+	</div>
+</div>
-- 
cgit v1.2.3