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/profile_edit.tpl | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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

diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 95346b3a8..3f5814c4a 100644
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -50,7 +50,7 @@
 					<div class="section-subtitle-wrapper" role="tab" id="personal">
 						<h3>
 							<a data-bs-toggle="collapse" data-bs-target="#personal-collapse" href="#" aria-expanded="true" aria-controls="personal-collapse">
-								{{$personal}}
+								{{$basic}}
 							</a>
 						</h3>
 					</div>
@@ -84,7 +84,17 @@
 							{{$dob}}
 							{{/if}}
 
+							{{$profile_in_dir}}
+
+							{{$suggestme}}
+
+							{{if $show_presence}}
+							{{include file="field_checkbox.tpl" field=$show_presence}}
+							{{/if}}
+
+							{{if $hide_friends}}
 							{{include file="field_checkbox.tpl" field=$hide_friends}}
+							{{/if}}
 
 							<div class="mb-3" >
 							<button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
-- 
cgit v1.2.3