From b155e93ab134759f3d31a509d197916a5af84adb Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Mon, 27 Jun 2016 19:04:00 -0700
Subject: add letsencrypt x3 intermediate cert and new cert file, improve UX of
 new registrations

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

(limited to 'view/tpl')

diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index 4a827ca16..c84934626 100755
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -54,5 +54,8 @@
 			<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button>
 			<div id="register-submit-end" class="register-field-end"></div>
 		</form>
+			<br />
+			<div class="descriptive-text">{{$verify_note}}</div>
+
 	</div>
 </div>
-- 
cgit v1.2.3


From 7b2d54dffac5a5ee3c0ff79aee964ac0869b3142 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 28 Jun 2016 13:44:32 +0200
Subject: fix month view in fullscreen mode

---
 view/tpl/event_head.tpl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 762bdcbb8..4397c5c9d 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -34,7 +34,13 @@
 			$('#events-calendar').fullCalendar('option', 'height', 'auto');
 		}
 		else {
-			$('#events-calendar').fullCalendar('option', 'height', '');
+			if($('main').hasClass('fullscreen')) {
+				$('#calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
+
+			}
+			else {
+				$('#calendar').fullCalendar('option', 'height', '');
+			}
 		}
 		$('#title').text(view.title);
 	}
-- 
cgit v1.2.3


From df4ff26845ea2868998c6a05397dc8e3aa07ba98 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Wed, 29 Jun 2016 17:53:59 -0700
Subject: only request geolocation permission if we're creating a post.

---
 view/tpl/jot-header.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index f3dd8cafe..9953875ef 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -7,6 +7,7 @@ var pretext = '{{$pretext}}';
 function initEditor(cb){
 	if (editor==false){
 		$("#profile-jot-text-loading").spin('small').show();
+		{{$geotag}}
 		if(plaintext == 'none') {
 			$("#profile-jot-text-loading").spin(false).hide();
 			$("#profile-jot-text").css({ 'height': 200, 'color': '#000', 'line-height': 'inherit' });
@@ -362,7 +363,6 @@ function enableOnUser(){
 		$('#profile-nolocation-wrapper').attr('disabled', true);
 	}
 
-	{{$geotag}}
 
     var initializeEmbedPhotoDialog = function () {
         $('.embed-photo-selected-photo').each(function (index) {
-- 
cgit v1.2.3


From bfe84a9ff753d4d9834ea24ad65edfef3561458c Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Wed, 29 Jun 2016 22:46:47 -0700
Subject: templatise the Dreport page and add a redeliver option for when
 things stuff up badly.

---
 view/tpl/dreport.tpl | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 view/tpl/dreport.tpl

(limited to 'view/tpl')

diff --git a/view/tpl/dreport.tpl b/view/tpl/dreport.tpl
new file mode 100644
index 000000000..7d5524a6a
--- /dev/null
+++ b/view/tpl/dreport.tpl
@@ -0,0 +1,21 @@
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		{{if $table == 'item'}}
+		<a href="dreport/push/{{$mid}}"><button class="btn btn-default btn-xs pull-right">{{$push}}</button></a>
+		{{/if}}
+		<h2>{{$title}}</h2>
+	</div>
+
+	<div>
+	<table>
+	{{if $entries}}
+	{{foreach $entries as $e}}
+	<tr>
+		<td width="40%">{{$e.name}}</td>
+		<td width="20%">{{$e.result}}</td>
+		<td width="20%">{{$e.time}}</td>
+	</tr>
+	{{/foreach}}
+	{{/if}}
+	</table>
+</div>
-- 
cgit v1.2.3