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/connections.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index fedcff1e3..0dc7f536b 100644
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
@@ -1,10 +1,10 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper clearfix">
-		<div class="dropdown pull-right">
+		<div class="dropdown float-end">
 			<button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form'); $('#contacts-search').focus();">
 				<i class="fa fa-search"></i>&nbsp;{{$label}}
 			</button>
-			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
+			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
 				<i class="fa fa-filter"></i>
 			</button>
 			<div class="dropdown-menu dropdown-menu-right">
@@ -17,7 +17,7 @@
 	</div>
 	<div id="contacts-search-form" class="section-content-tools-wrapper">
 		<form action="{{$cmd}}" method="get" id="mimimi" name="contacts-search-form">
-			<div class="input-group form-group">
+			<div class="input-group mb-3">
 				<input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" />
 				<div class="input-group-append">
 					<button id="contacts-search-submit" class="btn btn-sm btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button>
-- 
cgit v1.2.3


From 693736df7c4de1b00f746f9f671f287fc757aa3e Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Thu, 29 Jul 2021 09:03:22 +0000
Subject: dropdown-menu-right -> dropdown-menu-end

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

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

diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index 0dc7f536b..86f353d82 100644
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
@@ -7,7 +7,7 @@
 			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
 				<i class="fa fa-filter"></i>
 			</button>
-			<div class="dropdown-menu dropdown-menu-right">
+			<div class="dropdown-menu dropdown-menu-end">
 				{{foreach $tabs as $menu}}
 				<a class="dropdown-item {{$menu.sel}}" href="{{$menu.url}}">{{$menu.label}}</a>
 				{{/foreach}}
-- 
cgit v1.2.3


From c3bbc35e84bc8517064a55e362aeefb905d910b4 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Tue, 17 Aug 2021 18:07:30 +0000
Subject: more bs5 fixes

---
 view/tpl/connections.tpl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index 86f353d82..f6ee1b1db 100644
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
@@ -19,9 +19,7 @@
 		<form action="{{$cmd}}" method="get" id="mimimi" name="contacts-search-form">
 			<div class="input-group mb-3">
 				<input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" />
-				<div class="input-group-append">
-					<button id="contacts-search-submit" class="btn btn-sm btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button>
-				</div>
+				<button id="contacts-search-submit" class="btn btn-sm btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button>
 			</div>
 		</form>
 	</div>
-- 
cgit v1.2.3


From 14733f8482f309a246a6dc8187da7327d59e6321 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Sat, 9 Oct 2021 08:58:11 +0000
Subject: more bs5 fixes

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

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

diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index f6ee1b1db..1719a6522 100644
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
@@ -19,7 +19,7 @@
 		<form action="{{$cmd}}" method="get" id="mimimi" name="contacts-search-form">
 			<div class="input-group mb-3">
 				<input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" />
-				<button id="contacts-search-submit" class="btn btn-sm btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button>
+				<button id="contacts-search-submit" class="btn btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button>
 			</div>
 		</form>
 	</div>
-- 
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/connections.tpl | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

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

diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index 1719a6522..5fec38a84 100644
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
@@ -1,7 +1,10 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper clearfix">
 		<div class="dropdown float-end">
-			<button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form'); $('#contacts-search').focus();">
+			<button type="button" class="btn btn-success btn-sm" onclick="openClose('contacts-follow-form'); closeMenu('contacts-search-form'); $('#contacts-follow').focus();">
+				<i class="fa fa-plus"></i>&nbsp;Add
+			</button>
+			<button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form'); closeMenu('contacts-follow-form'); $('#contacts-search').focus();">
 				<i class="fa fa-search"></i>&nbsp;{{$label}}
 			</button>
 			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
@@ -16,10 +19,23 @@
 		{{if $finding}}<h2>{{$finding}}</h2>{{else}}<h2>{{$header}}{{if $total}} ({{$total}}){{/if}}</h2>{{/if}}
 	</div>
 	<div id="contacts-search-form" class="section-content-tools-wrapper">
-		<form action="{{$cmd}}" method="get" id="mimimi" name="contacts-search-form">
+		<form action="{{$cmd}}" method="get" name="contacts-search-form">
 			<div class="input-group mb-3">
 				<input type="text" name="search" id="contacts-search" class="form-control" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" />
-				<button id="contacts-search-submit" class="btn btn-outline-secondary" type="submit"><i class="fa fa-fw fa-search"></i></button>
+				<button id="contacts-search-submit" class="btn btn-primary" type="submit"><i class="fa fa-fw fa-search"></i></button>
+			</div>
+		</form>
+	</div>
+	<div id="contacts-follow-form" class="section-content-tools-wrapper">
+		{{if $abook_usage_message}}
+		<div class="section-conten-info-wrapper">
+			{{$abook_usage_message}}
+		</div>
+		{{/if}}
+		<form action="follow" method="post">
+			<div class="input-group mb-3">
+				<input class="form-control" id="contacts-follow" type="text" name="url" title="Examples: bob@example.com, https://example.com/barbara" placeholder="Enter channel address">
+				<button class="btn btn-success" type="submit" name="submit" value="Connect" title="Connect"><i class="fa fa-fw fa-plus"></i></button>
 			</div>
 		</form>
 	</div>
@@ -34,3 +50,5 @@
 <div id="page-spinner" class="spinner-wrapper">
 	<div class="spinner m"></div>
 </div>
+{{include file="contact_edit_modal.tpl"}}
+
-- 
cgit v1.2.3