From e332d1074f1b663ec66d37b0f575df2e41d5535c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Mon, 1 May 2017 21:10:04 -0700
Subject: move theme specific files to theme dir

---
 view/tpl/connection_template.tpl | 48 ----------------------------------------
 1 file changed, 48 deletions(-)
 delete mode 100755 view/tpl/connection_template.tpl

(limited to 'view/tpl/connection_template.tpl')

diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
deleted file mode 100755
index 16915abda..000000000
--- a/view/tpl/connection_template.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-<div id="contact-entry-wrapper-{{$contact.id}}">
-	<div class="section-subtitle-wrapper clearfix">
-		<div class="pull-right">
-			{{if $contact.approve && $contact.ignore}}
-			<form action="connedit/{{$contact.id}}" method="post" >
-			<button type="submit" class="btn btn-success btn-sm" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="fa fa-check"></i> {{$contact.approve}}</button>
-
-			<a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-sm" title="{{$contact.ignore_hover}}"><i class="fa fa-ban"></i> {{$contact.ignore}}</a>
-
-			{{/if}}
-			<a href="#" class="btn btn-danger btn-sm" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="fa fa-trash-o"></i> {{$contact.delete}}</a>
-			<a href="{{$contact.link}}" class="btn btn-outline-secondary btn-sm" title="{{$contact.edit_hover}}"><i class="fa fa-pencil"></i></a>
-			{{if $contact.approve}}
-			</form>
-			{{/if}}
-		</div>
-		<h3>{{if $contact.public_forum}}<i class="fa fa-comments-o"></i>&nbsp;{{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a>{{if $contact.phone}}&nbsp;<a class="btn btn-outline-secondary btn-sm" href="tel:{{$contact.phone}}" title="{{$contact.call}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</h3>
-	</div>
-	<div class="section-content-tools-wrapper">
-		<div class="contact-photo-wrapper" >
-			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><img class="directory-photo-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
-		</div>
-		<div class="contact-info">
-			{{if $contact.status}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$contact.status_label}}:</span> {{$contact.status}}
-			</div>
-			{{/if}}
-			{{if $contact.connected}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$contact.connected_label}}:</span> <span class="autotime" title="{{$contact.connected}}"></span>
-			</div>
-			{{/if}}
-			{{if $contact.webbie}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$contact.webbie_label}}:</span> {{$contact.webbie}}
-			</div>
-			{{/if}}
-			{{if $contact.network}}
-			<div class="contact-info-element">
-				<span class="contact-info-label">{{$contact.network_label}}:</span> {{$contact.network}} - <a href="{{$contact.recentlink}}">{{$contact.recent_label}}</a>
-			</div>
-			{{/if}}
-		</div>
-
-	</div>
-</div>
-
-- 
cgit v1.2.3


From 80ec92ce8d9f615eeb06d92b67ad1ff840cad0cc Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 2 May 2017 12:46:50 -0700
Subject: Revert "move theme specific files to theme dir"

This reverts commit e332d1074f1b663ec66d37b0f575df2e41d5535c.
---
 view/tpl/connection_template.tpl | 48 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100755 view/tpl/connection_template.tpl

(limited to 'view/tpl/connection_template.tpl')

diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
new file mode 100755
index 000000000..16915abda
--- /dev/null
+++ b/view/tpl/connection_template.tpl
@@ -0,0 +1,48 @@
+<div id="contact-entry-wrapper-{{$contact.id}}">
+	<div class="section-subtitle-wrapper clearfix">
+		<div class="pull-right">
+			{{if $contact.approve && $contact.ignore}}
+			<form action="connedit/{{$contact.id}}" method="post" >
+			<button type="submit" class="btn btn-success btn-sm" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="fa fa-check"></i> {{$contact.approve}}</button>
+
+			<a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-sm" title="{{$contact.ignore_hover}}"><i class="fa fa-ban"></i> {{$contact.ignore}}</a>
+
+			{{/if}}
+			<a href="#" class="btn btn-danger btn-sm" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="fa fa-trash-o"></i> {{$contact.delete}}</a>
+			<a href="{{$contact.link}}" class="btn btn-outline-secondary btn-sm" title="{{$contact.edit_hover}}"><i class="fa fa-pencil"></i></a>
+			{{if $contact.approve}}
+			</form>
+			{{/if}}
+		</div>
+		<h3>{{if $contact.public_forum}}<i class="fa fa-comments-o"></i>&nbsp;{{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a>{{if $contact.phone}}&nbsp;<a class="btn btn-outline-secondary btn-sm" href="tel:{{$contact.phone}}" title="{{$contact.call}}"><i class="fa fa-phone connphone"></i></a>{{/if}}</h3>
+	</div>
+	<div class="section-content-tools-wrapper">
+		<div class="contact-photo-wrapper" >
+			<a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><img class="directory-photo-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
+		</div>
+		<div class="contact-info">
+			{{if $contact.status}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.status_label}}:</span> {{$contact.status}}
+			</div>
+			{{/if}}
+			{{if $contact.connected}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.connected_label}}:</span> <span class="autotime" title="{{$contact.connected}}"></span>
+			</div>
+			{{/if}}
+			{{if $contact.webbie}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.webbie_label}}:</span> {{$contact.webbie}}
+			</div>
+			{{/if}}
+			{{if $contact.network}}
+			<div class="contact-info-element">
+				<span class="contact-info-label">{{$contact.network_label}}:</span> {{$contact.network}} - <a href="{{$contact.recentlink}}">{{$contact.recent_label}}</a>
+			</div>
+			{{/if}}
+		</div>
+
+	</div>
+</div>
+
-- 
cgit v1.2.3


From 7f982a07781f09756d852f423bba37dc11abf2a5 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 25 Jun 2017 20:03:26 -0700
Subject: minor usability enhancements with the connections list - label the
 edit icon so it's more obvious; the intuitive action is to click the photo or
 name which isn't what we usually want. Also move the Delete button over just
 a bit more so it's harder to accidentally click on small screens with big
 thumbs.

---
 view/tpl/connection_template.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/tpl/connection_template.tpl')

diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 16915abda..8e49c9e27 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -8,8 +8,8 @@
 			<a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-sm" title="{{$contact.ignore_hover}}"><i class="fa fa-ban"></i> {{$contact.ignore}}</a>
 
 			{{/if}}
-			<a href="#" class="btn btn-danger btn-sm" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="fa fa-trash-o"></i> {{$contact.delete}}</a>
-			<a href="{{$contact.link}}" class="btn btn-outline-secondary btn-sm" title="{{$contact.edit_hover}}"><i class="fa fa-pencil"></i></a>
+			<a href="#" class="btn btn-danger btn-sm contact-delete-btn" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="fa fa-trash-o"></i> {{$contact.delete}}</a>
+			<a href="{{$contact.link}}" class="btn btn-outline-secondary btn-sm" title="{{$contact.edit_hover}}"><i class="fa fa-pencil"></i> {{$contact.edit}}</a>
 			{{if $contact.approve}}
 			</form>
 			{{/if}}
-- 
cgit v1.2.3