From f3b4308cb59bf4b21ff186f8479c82239446d139 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Mon, 7 Jun 2021 12:56:27 +0200
Subject: upgrade to bootstrap 5.0.1 and first batch of fixes

---
 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 86a230c7f..e7ab559cb 100644
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -1,6 +1,6 @@
 <div id="contact-entry-wrapper-{{$contact.id}}">
 	<div class="section-subtitle-wrapper clearfix">
-		<div class="pull-right">
+		<div class="float-end">
 			{{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>
-- 
cgit v1.2.3


From 2968bf8241d2969c4d51f1651fc3f8c7688b2fca Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Wed, 15 Dec 2021 12:17:19 +0000
Subject: merge branch perms_ng into dev

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

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

diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl
index e7ab559cb..5c1542111 100644
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -1,23 +1,12 @@
 <div id="contact-entry-wrapper-{{$contact.id}}">
 	<div class="section-subtitle-wrapper clearfix">
 		<div class="float-end">
-			{{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}}
-			{{if $contact.connect}}
-				<a href="{{$contact.follow}}" class="btn btn-success btn-sm" title="{{$contact.connect_hover}}"><i class="fa fa-plus"></i> {{$contact.connect}}</a>
-			{{/if}}
-			<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}}
+			<span id="contact-role-{{$contact.id}}" class="badge rounded-pill bg-warning text-dark me-1" title="{{$role_label}}">{{$contact.role}}</span>
+			<button type="button" class="btn btn-outline-secondary btn-sm contact-edit" title="{{$contact.edit_hover}}" data-id="{{$contact.id}}">
+				<i class="fa fa-pencil"></i> {{$contact.edit}}
+			</button>
 		</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>
+		<h3>{{if $contact.public_forum}}<i class="fa fa-comments-o" title="{{$group_label}}"></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" >
-- 
cgit v1.2.3


From abe3039926dd388108e620148868880cb1da3fa3 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Wed, 12 Jan 2022 21:08:29 +0000
Subject: ux improvements

---
 view/tpl/connection_template.tpl | 9 +++++++--
 1 file changed, 7 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 5c1542111..090899cd6 100644
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -1,6 +1,11 @@
 <div id="contact-entry-wrapper-{{$contact.id}}">
 	<div class="section-subtitle-wrapper clearfix">
 		<div class="float-end">
+			{{if $contact.status}}
+			{{foreach $contact.states as $state}}
+			<span class="badge rounded-pill bg-danger text-white me-1" title="">{{$state}}</span>
+			{{/foreach}}
+			{{/if}}
 			<span id="contact-role-{{$contact.id}}" class="badge rounded-pill bg-warning text-dark me-1" title="{{$role_label}}">{{$contact.role}}</span>
 			<button type="button" class="btn btn-outline-secondary btn-sm contact-edit" title="{{$contact.edit_hover}}" data-id="{{$contact.id}}">
 				<i class="fa fa-pencil"></i> {{$contact.edit}}
@@ -16,11 +21,11 @@
 			{{include "connstatus.tpl" perminfo=$contact.perminfo}}
 		</div>
 		<div class="contact-info">
-			{{if $contact.status}}
+			{{** if $contact.status}}
 			<div class="contact-info-element">
 				<span class="contact-info-label">{{$contact.status_label}}:</span> {{$contact.status}}
 			</div>
-			{{/if}}
+			{{/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>
-- 
cgit v1.2.3


From f4bc6ee61556a1693b2863829ec9a01c42f13f67 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Thu, 13 Jan 2022 13:07:59 +0000
Subject: ux improvements

---
 view/tpl/connection_template.tpl | 8 +++++++-
 1 file changed, 7 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 090899cd6..a7f0f8759 100644
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -8,8 +8,11 @@
 			{{/if}}
 			<span id="contact-role-{{$contact.id}}" class="badge rounded-pill bg-warning text-dark me-1" title="{{$role_label}}">{{$contact.role}}</span>
 			<button type="button" class="btn btn-outline-secondary btn-sm contact-edit" title="{{$contact.edit_hover}}" data-id="{{$contact.id}}">
-				<i class="fa fa-pencil"></i> {{$contact.edit}}
+				<i id="edit-icon-{{$contact.id}}" class="fa fa-fw fa-pencil"></i>
+				<div id="edit-rotator-{{$contact.id}}" class="spinner-wrapper" style="vertical-align: text-bottom; margin-right: 2px"><div class="spinner s"></div></div>
+				{{$contact.edit}}
 			</button>
+
 		</div>
 		<h3>{{if $contact.public_forum}}<i class="fa fa-comments-o" title="{{$group_label}}"></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>
@@ -41,6 +44,9 @@
 				<span class="contact-info-label">{{$contact.network_label}}:</span> {{$contact.network}} - <a href="{{$contact.recentlink}}" rel="nofollow noopener">{{$contact.recent_label}}</a>
 			</div>
 			{{/if}}
+			{{if $contact.connect}}
+			<a href="{{$contact.follow}}" class="btn btn-success btn-sm" title="{{$contact.connect_hover}}"><i class="fa fa-plus"></i> {{$contact.connect}}</a>
+			{{/if}}
 		</div>
 
 	</div>
-- 
cgit v1.2.3


From d98d56c3b5481e12dc53136c06b6c9c069d40d98 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Wed, 19 Jan 2022 11:24:42 +0000
Subject: provide a spinner for edit connection action in threads

---
 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 a7f0f8759..1c8b4be11 100644
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -8,8 +8,8 @@
 			{{/if}}
 			<span id="contact-role-{{$contact.id}}" class="badge rounded-pill bg-warning text-dark me-1" title="{{$role_label}}">{{$contact.role}}</span>
 			<button type="button" class="btn btn-outline-secondary btn-sm contact-edit" title="{{$contact.edit_hover}}" data-id="{{$contact.id}}">
-				<i id="edit-icon-{{$contact.id}}" class="fa fa-fw fa-pencil"></i>
-				<div id="edit-rotator-{{$contact.id}}" class="spinner-wrapper" style="vertical-align: text-bottom; margin-right: 2px"><div class="spinner s"></div></div>
+				<i id="contact-edit-icon-{{$contact.id}}" class="fa fa-fw fa-pencil"></i>
+				<div id="contact-edit-rotator-{{$contact.id}}" class="spinner-wrapper" style="vertical-align: text-bottom; margin-right: 2px"><div class="spinner s"></div></div>
 				{{$contact.edit}}
 			</button>
 
-- 
cgit v1.2.3


From c742f25801b726a0d2e32460d2d87d0ad9c05caf Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Wed, 19 Jan 2022 13:18:47 +0000
Subject: prevent duplicate ids and adjust spinner color

---
 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 1c8b4be11..ffd02f352 100644
--- a/view/tpl/connection_template.tpl
+++ b/view/tpl/connection_template.tpl
@@ -8,8 +8,8 @@
 			{{/if}}
 			<span id="contact-role-{{$contact.id}}" class="badge rounded-pill bg-warning text-dark me-1" title="{{$role_label}}">{{$contact.role}}</span>
 			<button type="button" class="btn btn-outline-secondary btn-sm contact-edit" title="{{$contact.edit_hover}}" data-id="{{$contact.id}}">
-				<i id="contact-edit-icon-{{$contact.id}}" class="fa fa-fw fa-pencil"></i>
-				<div id="contact-edit-rotator-{{$contact.id}}" class="spinner-wrapper" style="vertical-align: text-bottom; margin-right: 2px"><div class="spinner s"></div></div>
+				<i class="fa fa-fw fa-pencil contact-edit-icon-{{$contact.id}}"></i>
+				<div class="spinner-wrapper contact-edit-rotator-{{$contact.id}}" style="vertical-align: text-bottom; margin-right: 2px"><div class="spinner s"></div></div>
 				{{$contact.edit}}
 			</button>
 
-- 
cgit v1.2.3