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')

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/abook_edit.tpl          | 19 -------------------
 view/tpl/connection_template.tpl |  9 ++++++++-
 2 files changed, 8 insertions(+), 20 deletions(-)

(limited to 'view')

diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 255ed9cfa..4fa810cb4 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -73,25 +73,6 @@
 					</div>
 				</div>
 			</div>
-			<div class="modal" id="abook-pending-modal" tabindex="-1" role="dialog">
-				<div class="modal-dialog" role="document">
-					<div class="modal-content">
-						<div class="modal-header">
-							<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-							<h4 class="modal-title" id="myModalLabel">{{$pending_modal_title}}</h4>
-						</div>
-						<div class="modal-body">
-							<strong>{{$name}}</strong> {{$pending_modal_body}}
-						</div>
-						<div class="modal-footer">
-							<button class="btn btn-sm btn-danger pull-left" title="{{$buttons.delete.title}}" onclick="window.location.href='{{$buttons.delete.url}}'; return false;">{{$buttons.delete.label}}</button>
-							<button type="button" class="btn btn-default" data-dismiss="modal">{{$pending_modal_dismiss}}</button>
-							<button type="submit" class="btn btn-primary" name="pending" value="1">{{$pending_modal_approve}}</button>
-						</div>
-					</div>
-				</div>
-			</div>
-			<script>$('#abook-pending-modal').modal('show');</script>
 			{{/if}}
 
 			{{if $affinity }}
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')

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 2498df68c716ec6ed80b5547c721ca9741a85572 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 15 Jan 2016 13:20:45 +0100
Subject: change button order for consistency

---
 view/tpl/direntry.tpl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'view')

diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index ecc38beb9..57e6e1555 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -1,16 +1,17 @@
 <div class="directory-item{{if $entry.safe}} safe{{/if}}" id="directory-item-{{$entry.hash}}" >
 	<div class="section-subtitle-wrapper">
 		<div class="pull-right">
-			{{if $entry.viewrate}}
-				{{if $entry.canrate}}<button class="btn btn-default btn-xs" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="icon-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" >&nbsp;*</span></button>{{/if}}
-				{{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-default btn-xs">{{$entry.total_ratings}}</a>{{/if}}
-			{{/if}}
 			{{if $entry.ignlink}}
 			<a class="directory-ignore btn btn-warning btn-xs" href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a>
 			{{/if}}
 			{{if $entry.connect}}
 			<a class="btn btn-success btn-xs" href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a>
 			{{/if}}
+			{{if $entry.viewrate}}
+				{{if $entry.total_ratings}}<a href="ratings/{{$entry.hash}}" id="dir-rating-{{$entry.hash}}" class="btn btn-default btn-xs">{{$entry.total_ratings}}</a>{{/if}}
+				{{if $entry.canrate}}<button class="btn btn-default btn-xs" onclick="doRatings('{{$entry.hash}}'); return false;" ><i class="icon-pencil"></i><span id="edited-{{$entry.hash}}" class="required" id="edited-{{$entry.hash}}" style="display: none;" >&nbsp;*</span></button>{{/if}}
+
+			{{/if}}
 		</div>
 		<h3>{{if $entry.public_forum}}<i class="icon-comments-alt" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i>&nbsp;{{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}}&nbsp;<i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3>
 	</div>
-- 
cgit v1.2.3