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/abook_edit.tpl | 114 ++++++++++++++++++++++++------------------------
 1 file changed, 57 insertions(+), 57 deletions(-)

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

diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 6ff7bffcd..5520a7a45 100644
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -1,9 +1,9 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		{{if $notself}}
-		<div class="pull-right">
+		<div class="float-end">
 			<div class="btn-group">
-				<button id="connection-dropdown" class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+				<button id="connection-dropdown" class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 					<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
 				</button>
 				<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel">
@@ -25,7 +25,7 @@
 			<div class="btn-group">
 				<a href="connedit/{{$abook_prev}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_prev}} disabled{{/if}}" ><i class="fa fa-backward"></i></a>
 				<div class="btn-group" >
-					<button class="btn btn-outline-secondary btn-sm{{if $is_pending}} disabled{{/if}}" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars"></i></button>
+					<button class="btn btn-outline-secondary btn-sm{{if $is_pending}} disabled{{/if}}" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars"></i></button>
 					<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel">
 						{{foreach $sections as $s}}
 						<a class="dropdown-item" href="{{$s.url}}" title="{{$s.title}}">{{$s.label}}</a>
@@ -52,7 +52,7 @@
 		{{/foreach}}
 		<div class="section-content-info-wrapper">
 			<div>
-				{{$addr_text}} <strong>'{{if $addr}}{{$addr}}{{else}}{{$primeurl}}{{/if}}'</strong>			
+				{{$addr_text}} <strong>'{{if $addr}}{{$addr}}{{else}}{{$primeurl}}{{/if}}'</strong>
 			</div>
 			{{if $locstr}}
 			<div>
@@ -85,7 +85,7 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="pending-tool">
 					<h3>
-						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#pending-tool-collapse" aria-expanded="true" aria-controls="pending-tool-collapse">
+						<a data-bs-toggle="collapse" data-parent="#contact-edit-tools" href="#pending-tool-collapse" aria-expanded="true" aria-controls="pending-tool-collapse">
 							{{$pending_label}}
 						</a>
 					</h3>
@@ -101,21 +101,21 @@
 			</div>
 			{{/if}}
 			{{if ! $is_pending}}
-			<div id="template-form-vcard-org" class="form-group form-vcard-org">
-				<div class="form-group form-vcard-org">
+			<div id="template-form-vcard-org" class="mb-3 form-vcard-org">
+				<div class="mb-3 form-vcard-org">
 					<input type="text" name="org" value="" placeholder="{{$org_label}}">
 					<i data-remove="vcard-org" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
 				</div>
 			</div>
 
-			<div id="template-form-vcard-title" class="form-group form-vcard-title">
-				<div class="form-group form-vcard-title">
+			<div id="template-form-vcard-title" class="mb-3 form-vcard-title">
+				<div class="mb-3 form-vcard-title">
 					<input type="text" name="title" value="" placeholder="{{$title_label}}">
 					<i data-remove="vcard-title" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
 				</div>
 			</div>
 
-			<div id="template-form-vcard-tel" class="form-group form-vcard-tel">
+			<div id="template-form-vcard-tel" class="mb-3 form-vcard-tel">
 				<select name="tel_type[]">
 					<option value="CELL">{{$mobile}}</option>
 					<option value="HOME">{{$home}}</option>
@@ -126,7 +126,7 @@
 				<i data-remove="vcard-tel" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
 			</div>
 
-			<div id="template-form-vcard-email" class="form-group form-vcard-email">
+			<div id="template-form-vcard-email" class="mb-3 form-vcard-email">
 				<select name="email_type[]">
 					<option value="HOME">{{$home}}</option>
 					<option value="WORK">{{$work}}</option>
@@ -136,7 +136,7 @@
 				<i data-remove="vcard-email" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
 			</div>
 
-			<div id="template-form-vcard-impp" class="form-group form-vcard-impp">
+			<div id="template-form-vcard-impp" class="mb-3 form-vcard-impp">
 				<select name="impp_type[]">
 					<option value="HOME">{{$home}}</option>
 					<option value="WORK">{{$work}}</option>
@@ -146,7 +146,7 @@
 				<i data-remove="vcard-impp" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
 			</div>
 
-			<div id="template-form-vcard-url" class="form-group form-vcard-url">
+			<div id="template-form-vcard-url" class="mb-3 form-vcard-url">
 				<select name="url_type[]">
 					<option value="HOME">{{$home}}</option>
 					<option value="WORK">{{$work}}</option>
@@ -156,8 +156,8 @@
 				<i data-remove="vcard-url" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
 			</div>
 
-			<div id="template-form-vcard-adr" class="form-group form-vcard-adr">
-				<div class="form-group">
+			<div id="template-form-vcard-adr" class="mb-3 form-vcard-adr">
+				<div class="mb-3">
 					<select name="adr_type[]">
 						<option value="HOME">{{$home}}</option>
 						<option value="WORK">{{$work}}</option>
@@ -166,30 +166,30 @@
 					<label>{{$adr_label}}</label>
 					<i data-remove="vcard-adr" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
 				</div>
-				<div class="form-group">
+				<div class="mb-3">
 					<input type="text" name="" value="" placeholder="{{$po_box}}">
 				</div>
-				<div class="form-group">
+				<div class="mb-3">
 					<input type="text" name="" value="" placeholder="{{$extra}}">
 				</div>
-				<div class="form-group">
+				<div class="mb-3">
 					<input type="text" name="" value="" placeholder="{{$street}}">
 				</div>
-				<div class="form-group">
+				<div class="mb-3">
 					<input type="text" name="" value="" placeholder="{{$locality}}">
 				</div>
-				<div class="form-group">
+				<div class="mb-3">
 					<input type="text" name="" value="" placeholder="{{$region}}">
 				</div>
-				<div class="form-group">
+				<div class="mb-3">
 					<input type="text" name="" value="" placeholder="{{$zip_code}}">
 				</div>
-				<div class="form-group">
+				<div class="mb-3">
 					<input type="text" name="" value="" placeholder="{{$country}}">
 				</div>
 			</div>
 
-			<div id="template-form-vcard-note" class="form-group form-vcard-note">
+			<div id="template-form-vcard-note" class="mb-3 form-vcard-note">
 				<label>{{$note_label}}</label>
 				<i data-remove="vcard-note" data-id="" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
 				<textarea name="note" class="form-control"></textarea>
@@ -197,8 +197,8 @@
 
 			<div class="section-content-wrapper-np">
 				<div id="vcard-cancel-{{$vcard.id}}" class="vcard-cancel vcard-cancel-btn" data-id="{{$vcard.id}}" data-action="cancel"><i class="fa fa-close"></i></div>
-				<div id="vcard-add-field-{{$vcard.id}}" class="dropdown pull-right vcard-add-field">
-					<button data-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
+				<div id="vcard-add-field-{{$vcard.id}}" class="dropdown float-end vcard-add-field">
+					<button data-bs-toggle="dropdown" type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle"><i class="fa fa-plus"></i> {{$add_field}}</button>
 					<ul class="dropdown-menu">
 						<li class="add-vcard-org"{{if $vcard.org}} style="display: none"{{/if}}><a href="#" data-add="vcard-org" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$org_label}}</a></li>
 						<li class="add-vcard-title"{{if $vcard.title}} style="display: none"{{/if}}><a href="#" data-add="vcard-title" data-id="{{$vcard.id}}" class="add-field" onclick="return false;">{{$title_label}}</a></li>
@@ -222,10 +222,10 @@
 			</div>
 			<div id="vcard-info-{{$vcard.id}}" class="vcard-info section-content-wrapper">
 
-				<div class="vcard-org form-group">
+				<div class="vcard-org mb-3">
 					<div class="form-vcard-org-wrapper">
 						{{if $vcard.org}}
-						<div class="form-group form-vcard-org">
+						<div class="mb-3 form-vcard-org">
 							<input type="text" name="org" value="{{$vcard.org}}" size="{{$vcard.org|count_characters:true}}" placeholder="{{$org_label}}">
 							<i data-remove="vcard-org" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
 						</div>
@@ -233,10 +233,10 @@
 					</div>
 				</div>
 
-				<div class="vcard-title form-group">
+				<div class="vcard-title mb-3">
 					<div class="form-vcard-title-wrapper">
 						{{if $vcard.title}}
-						<div class="form-group form-vcard-title">
+						<div class="mb-3 form-vcard-title">
 							<input type="text" name="title" value="{{$vcard.title}}" size="{{$vcard.title|count_characters:true}}" placeholder="{{$title_label}}">
 							<i data-remove="vcard-title" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
 						</div>
@@ -245,11 +245,11 @@
 				</div>
 
 
-				<div class="vcard-tel form-group">
+				<div class="vcard-tel mb-3">
 					<div class="form-vcard-tel-wrapper">
 						{{if $vcard.tels}}
 						{{foreach $vcard.tels as $tel}}
-						<div class="form-group form-vcard-tel">
+						<div class="mb-3 form-vcard-tel">
 							<select name="tel_type[]">
 								<option value=""{{if $tel.type.0 != 'CELL' && $tel.type.0 != 'HOME' && $tel.type.0 != 'WORK' && $tel.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$tel.type.1}}</option>
 								<option value="CELL"{{if $tel.type.0 == 'CELL'}} selected="selected"{{/if}}>{{$mobile}}</option>
@@ -266,11 +266,11 @@
 				</div>
 
 
-				<div class="vcard-email form-group">
+				<div class="vcard-email mb-3">
 					<div class="form-vcard-email-wrapper">
 						{{if $vcard.emails}}
 						{{foreach $vcard.emails as $email}}
-						<div class="form-group form-vcard-email">
+						<div class="mb-3 form-vcard-email">
 							<select name="email_type[]">
 								<option value=""{{if $email.type.0 != 'HOME' && $email.type.0 != 'WORK' && $email.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$email.type.1}}</option>
 								<option value="HOME"{{if $email.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
@@ -285,11 +285,11 @@
 					</div>
 				</div>
 
-				<div class="vcard-impp form-group">
+				<div class="vcard-impp mb-3">
 					<div class="form-vcard-impp-wrapper">
 						{{if $vcard.impps}}
 						{{foreach $vcard.impps as $impp}}
-						<div class="form-group form-vcard-impp">
+						<div class="mb-3 form-vcard-impp">
 							<select name="impp_type[]">
 								<option value=""{{if $impp.type.0 != 'HOME' && $impp.type.0 != 'WORK' && $impp.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$impp.type.1}}</option>
 								<option value="HOME"{{if $impp.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
@@ -304,11 +304,11 @@
 					</div>
 				</div>
 
-				<div class="vcard-url form-group">
+				<div class="vcard-url mb-3">
 					<div class="form-vcard-url-wrapper">
 						{{if $vcard.urls}}
 						{{foreach $vcard.urls as $url}}
-						<div class="form-group form-vcard-url">
+						<div class="mb-3 form-vcard-url">
 							<select name="url_type[]">
 								<option value=""{{if $url.type.0 != 'HOME' && $url.type.0 != 'WORK' && $url.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$url.type.1}}</option>
 								<option value="HOME"{{if $url.type.0 == 'HOME'}} selected="selected"{{/if}}>{{$home}}</option>
@@ -323,12 +323,12 @@
 					</div>
 				</div>
 
-				<div class="vcard-adr form-group">
+				<div class="vcard-adr mb-3">
 					<div class="form-vcard-adr-wrapper">
 						{{if $vcard.adrs}}
 						{{foreach $vcard.adrs as $adr}}
-						<div class="form-group form-vcard-adr">
-							<div class="form-group">
+						<div class="mb-3 form-vcard-adr">
+							<div class="mb-3">
 								<label>{{$adr_label}}</label>
 								<select name="adr_type[]">
 									<option value=""{{if $adr.type.0 != 'HOME' && $adr.type.0 != 'WORK' && $adr.type.0 != 'OTHER'}} selected="selected"{{/if}}>{{$adr.type.1}}</option>
@@ -338,25 +338,25 @@
 								</select>
 								<i data-remove="vcard-adr" data-id="{{$vcard.id}}" class="fa fa-trash-o remove-field drop-icons fakelink"></i>
 							</div>
-							<div class="form-group">
+							<div class="mb-3">
 								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.0}}" size="{{$adr.address.0|count_characters:true}}" placeholder="{{$po_box}}">
 							</div>
-							<div class="form-group">
+							<div class="mb-3">
 								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.1}}" size="{{$adr.address.1|count_characters:true}}" placeholder="{{$extra}}">
 							</div>
-							<div class="form-group">
+							<div class="mb-3">
 								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.2}}" size="{{$adr.address.2|count_characters:true}}" placeholder="{{$street}}">
 							</div>
-							<div class="form-group">
+							<div class="mb-3">
 								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.3}}" size="{{$adr.address.3|count_characters:true}}" placeholder="{{$locality}}">
 							</div>
-							<div class="form-group">
+							<div class="mb-3">
 								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.4}}" size="{{$adr.address.4|count_characters:true}}" placeholder="{{$region}}">
 							</div>
-							<div class="form-group">
+							<div class="mb-3">
 								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.5}}" size="{{$adr.address.5|count_characters:true}}" placeholder="{{$zip_code}}">
 							</div>
-							<div class="form-group">
+							<div class="mb-3">
 								<input type="text" name="adr[{{$adr@index}}][]" value="{{$adr.address.6}}" size="{{$adr.address.6|count_characters:true}}" placeholder="{{$country}}">
 							</div>
 						</div>
@@ -365,7 +365,7 @@
 					</div>
 				</div>
 
-				<div class="vcard-note form-group form-vcard-note">
+				<div class="vcard-note mb-3 form-vcard-note">
 					<div class="form-vcard-note-wrapper">
 						{{if $vcard.note}}
 						<label>{{$note_label}}</label>
@@ -387,7 +387,7 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="affinity-tool">
 					<h3>
-						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#affinity-tool-collapse" aria-expanded="true" aria-controls="affinity-tool-collapse">
+						<a data-bs-toggle="collapse" data-parent="#contact-edit-tools" href="#affinity-tool-collapse" aria-expanded="true" aria-controls="affinity-tool-collapse">
 							{{$affinity}}
 						</a>
 					</h3>
@@ -395,13 +395,13 @@
 				<div id="affinity-tool-collapse" class="panel-collapse collapse{{if $section == 'affinity'}} show{{/if}}" role="tabpanel" aria-labelledby="affinity-tool">
 					<div class="section-content-tools-wrapper">
 						{{if $slide}}
-						<div class="form-group"><strong>{{$lbl_slider}}</strong></div>
+						<div class="mb-3"><strong>{{$lbl_slider}}</strong></div>
 						{{$slide}}
 						<input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
 						{{/if}}
 
 						{{if $multiprofs}}
-						<div class="form-group">
+						<div class="mb-3">
 							<strong>{{$lbl_vis2}}</strong>
 							{{$profile_select}}
 						</div>
@@ -418,7 +418,7 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="fitert-tool">
 					<h3>
-						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#fitert-tool-collapse" aria-expanded="true" aria-controls="fitert-tool-collapse">
+						<a data-bs-toggle="collapse" data-parent="#contact-edit-tools" href="#fitert-tool-collapse" aria-expanded="true" aria-controls="fitert-tool-collapse">
 							{{$connfilter_label}}
 						</a>
 					</h3>
@@ -442,7 +442,7 @@
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="rating-tool">
 					<h3>
-						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#rating-tool-collapse" aria-expanded="true" aria-controls="rating-tool-collapse">
+						<a data-bs-toggle="collapse" data-parent="#contact-edit-tools" href="#rating-tool-collapse" aria-expanded="true" aria-controls="rating-tool-collapse">
 							{{$lbl_rating}}
 						</a>
 					</h3>
@@ -452,7 +452,7 @@
 						<div class="section-content-warning-wrapper">
 							{{$rating_info}}
 						</div>
-						<div class="form-group"><strong>{{$lbl_rating_label}}</strong></div>
+						<div class="mb-3"><strong>{{$lbl_rating_label}}</strong></div>
 						{{$rating}}
 						{{include file="field_textarea.tpl" field=$rating_text}}
 						<input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" />
@@ -471,7 +471,7 @@
 				{{if $notself}}
 				<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
 					<h3>
-						<a data-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
+						<a data-bs-toggle="collapse" data-parent="#contact-edit-tools" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
 							{{$permlbl}}
 						</a>
 					</h3>
@@ -485,11 +485,11 @@
 						</div>
 
 						{{if $permcat_enable}}
-						<a href="permcats" class="pull-right"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
+						<a href="permcats" class="float-end"><i class="fa fa-plus"></i>&nbsp;{{$permcat_new}}</a>
 						{{include file="field_select.tpl" field=$permcat}}
 						{{/if}}
 
-						<table id="perms-tool-table" class=form-group>
+						<table id="perms-tool-table" class=mb-3>
 							<tr>
 								<td></td>
 								{{if $notself}}
-- 
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/abook_edit.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 5520a7a45..380d5886c 100644
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -6,7 +6,7 @@
 				<button id="connection-dropdown" class="btn btn-outline-secondary btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 					<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
 				</button>
-				<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel">
+				<div class="dropdown-menu dropdown-menu-end" aria-labelledby="dLabel">
 					<a class="dropdown-item" href="{{$tools.view.url}}" title="{{$tools.view.title}}">{{$tools.view.label}}</a>
 					<a class="dropdown-item" href="{{$tools.recent.url}}" title="{{$tools.recent.title}}">{{$tools.recent.label}}</a>
 					{{if $tools.fetchvc}}
@@ -26,7 +26,7 @@
 				<a href="connedit/{{$abook_prev}}{{if $section}}?f=&section={{$section}}{{/if}}" class="btn btn-outline-secondary btn-sm{{if ! $abook_prev}} disabled{{/if}}" ><i class="fa fa-backward"></i></a>
 				<div class="btn-group" >
 					<button class="btn btn-outline-secondary btn-sm{{if $is_pending}} disabled{{/if}}" type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars"></i></button>
-					<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel">
+					<div class="dropdown-menu dropdown-menu-end" aria-labelledby="dLabel">
 						{{foreach $sections as $s}}
 						<a class="dropdown-item" href="{{$s.url}}" title="{{$s.title}}">{{$s.label}}</a>
 						{{/foreach}}
-- 
cgit v1.2.3