From e2b79c34bc0c1dc5f48295c1cca7261e8cb648fb Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 14 Jan 2016 13:50:47 +0100
Subject: some work on connections

---
 view/tpl/connection_template.tpl | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

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

diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 35e97f3e9..aca6aa991 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -1,10 +1,15 @@
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" >
-	<div class="contact-entry-photo-wrapper" >
-		<a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><img class="contact-block-img {{if $contact.classes}}{{$contact.classes}}{{/if}}" src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a>
+<div id="contact-entry-wrapper-{{$contact.id}}">
+	<div class="section-subtitle-wrapper">
+		<div class="pull-right">
+			<a href="#" class="btn btn-danger btn-xs" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="icon-trash"></i> {{$contact.delete}}</a>
+			<a href="{{$contact.link}}" class="btn btn-success btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i> {{$contact.edit}}</a>
+		</div>
+		<h3><a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a></h3>
+	</div>
+	<div class="section-content-tools-wrapper">
+		<div class="contact-entry-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>
-	<div class="contact-entry-photo-end" ></div>
-	<a href="{{$contact.url}}" title="{{$contact.img_hover}}" ><div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >{{$contact.name}}</div></a>
-	<div class="contact-entry-name-end" ></div>
-	<div class="contact-entry-edit btn btn-default"><a href="{{$contact.link}}"><i class="icon-pencil connection-edit-icons"></i> {{$contact.edit}}</a></div>
-	<div class="contact-entry-end" ></div>
 </div>
+
-- 
cgit v1.2.3


From 588d022fbb8490f0531b7e44a6af0b596409dc38 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 14 Jan 2016 23:23:12 +0100
Subject: provide some info about our contacts - status (archived, hidden,
 etc.), public forum (like in directory) and show since when we are connected

---
 view/tpl/connection_template.tpl | 17 +++++++++++++++--
 1 file changed, 15 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 aca6aa991..9813b83e2 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -4,12 +4,25 @@
 			<a href="#" class="btn btn-danger btn-xs" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="icon-trash"></i> {{$contact.delete}}</a>
 			<a href="{{$contact.link}}" class="btn btn-success btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i> {{$contact.edit}}</a>
 		</div>
-		<h3><a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a></h3>
+		<h3>{{if $contact.public_forum}}<i class="icon-comments-alt"></i>&nbsp;{{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a></h3>
 	</div>
 	<div class="section-content-tools-wrapper">
-		<div class="contact-entry-photo-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}}
+		</div>
+
 	</div>
 </div>
 
-- 
cgit v1.2.3


From 63ee0daac51b8c04123479f2ac91e1762492896f Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 15 Jan 2016 10:42:44 +0100
Subject: provide more contact infos and update some protocol type definitions

---
 view/tpl/connection_template.tpl | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 9813b83e2..a0bdf33aa 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -21,6 +21,16 @@
 				<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}}
+			</div>
+			{{/if}}
 		</div>
 
 	</div>
-- 
cgit v1.2.3


From f4e1b2123aed39e3f863ee327b27cb0e7f17520c Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 15 Jan 2016 11:28:05 +0100
Subject: add an approve button to /connections and get rid of the modal popup
 in /connedit. for quick approval (default collection and perms etc.) we now
 can use the approve button in /connections else click the edit button and
 make changes and approval from /connedit. hope thats any better...

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

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

diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index a0bdf33aa..2629e5cf4 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -1,8 +1,15 @@
 <div id="contact-entry-wrapper-{{$contact.id}}">
 	<div class="section-subtitle-wrapper">
 		<div class="pull-right">
+			{{if $contact.approve}}
+			<form action="connedit/{{$contact.id}}" method="post" >
+			<button type="submit" class="btn btn-success btn-xs" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="icon-ok"></i> {{$contact.approve}}</button>
+			{{/if}}
 			<a href="#" class="btn btn-danger btn-xs" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="icon-trash"></i> {{$contact.delete}}</a>
-			<a href="{{$contact.link}}" class="btn btn-success btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i> {{$contact.edit}}</a>
+			<a href="{{$contact.link}}" class="btn btn-default btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i></a>
+			{{if $contact.approve}}
+			</form>
+			{{/if}}
 		</div>
 		<h3>{{if $contact.public_forum}}<i class="icon-comments-alt"></i>&nbsp;{{/if}}<a href="{{$contact.url}}" title="{{$contact.img_hover}}" >{{$contact.name}}</a></h3>
 	</div>
-- 
cgit v1.2.3


From d36aa4fc89f99dc408e356347e74eead746f3e53 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 15 Jan 2016 12:08:04 +0100
Subject: provide a recent activity link in /connections

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

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

diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 2629e5cf4..143989971 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -35,7 +35,7 @@
 			{{/if}}
 			{{if $contact.network}}
 			<div class="contact-info-element">
-				<span class="contact-info-label">{{$contact.network_label}}:</span> {{$contact.network}}
+				<span class="contact-info-label">{{$contact.network_label}}:</span> {{$contact.network}} - <a href="{{$contact.recentlink}}">{{$contact.recent_label}}</a>
 			</div>
 			{{/if}}
 		</div>
-- 
cgit v1.2.3


From 9b08051703ff6695ba989f1cb968200ca59daeb1 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Tue, 26 Jan 2016 16:57:36 -0800
Subject: bring back the ability to ignore a pending connection request without
 deleting it and without always having it in your face and without jumping
 through hoops.

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

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

diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index 143989971..b2107306e 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -1,9 +1,12 @@
 <div id="contact-entry-wrapper-{{$contact.id}}">
 	<div class="section-subtitle-wrapper">
 		<div class="pull-right">
-			{{if $contact.approve}}
+			{{if $contact.approve && $contact.ignore}}
 			<form action="connedit/{{$contact.id}}" method="post" >
 			<button type="submit" class="btn btn-success btn-xs" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="icon-ok"></i> {{$contact.approve}}</button>
+
+			<a href="connedit/{{$contact.id}}/ignore" class="btn btn-danger btn-xs" title={{$contact.ignore_hover}}><i class="icon-ban-circle"></i> {{$contact.ignore}}</a>
+
 			{{/if}}
 			<a href="#" class="btn btn-danger btn-xs" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="icon-trash"></i> {{$contact.delete}}</a>
 			<a href="{{$contact.link}}" class="btn btn-default btn-xs" title="{{$contact.edit_hover}}"><i class="icon-pencil"></i></a>
-- 
cgit v1.2.3


From 722d7ff38d5bbf49a7c990d9219998c2c8a5b58f Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 27 Jan 2016 09:46:18 +0100
Subject: lower caution level from danger to warning for ignore button

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

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

diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index b2107306e..e2a14d9a2 100755
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -5,7 +5,7 @@
 			<form action="connedit/{{$contact.id}}" method="post" >
 			<button type="submit" class="btn btn-success btn-xs" name="pending" value="1" title="{{$contact.approve_hover}}"><i class="icon-ok"></i> {{$contact.approve}}</button>
 
-			<a href="connedit/{{$contact.id}}/ignore" class="btn btn-danger btn-xs" title={{$contact.ignore_hover}}><i class="icon-ban-circle"></i> {{$contact.ignore}}</a>
+			<a href="connedit/{{$contact.id}}/ignore" class="btn btn-warning btn-xs" title="{{$contact.ignore_hover}}"><i class="icon-ban-circle"></i> {{$contact.ignore}}</a>
 
 			{{/if}}
 			<a href="#" class="btn btn-danger btn-xs" title="{{$contact.delete_hover}}" onclick="dropItem('{{$contact.deletelink}}', '#contact-entry-wrapper-{{$contact.id}}'); return false;"><i class="icon-trash"></i> {{$contact.delete}}</a>
-- 
cgit v1.2.3