merge branch perms_ng into dev

1 files changed, 27 insertions, 41 deletions

diff --git a/view/tpl/permcats.tpl b/view/tpl/permcats.tpl
index 5b2d811d7..279903048 100644
--- a/view/tpl/permcats.tpl
+++ b/view/tpl/permcats.tpl
@@ -4,49 +4,37 @@
 		<div class="clear"></div>
 	</div>
 	<div class="section-content-tools-wrapper">
-		<div class="section-content-info-wrapper">
-			{{$desc}}
-		</div>
-
 		<form action="permcats" id="settings-permcats-form" method="post" autocomplete="off" >
-			<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-			{{include file="field_input.tpl" field=$name}}
+			<input type="hidden" name="form_security_token" value="{{$form_security_token}}">
+			<input type="hidden" name="return_path" value="{{$return_path}}">
 
-			<div class="settings-submit-wrapper mb-3">
-				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-			</div>
-	</div>
+			{{if $is_system_role}}
+			<input type="hidden" name="is_system_role" value="1">
+			<input type="hidden" name="name" value="{{$is_system_role}}">
+			{{/if}}
 
-	<div class="panel" id="permission-settings">
-		<div class="section-subtitle-wrapper" role="tab" id="perms-tool">
-			<h3>
-				<a data-bs-toggle="collapse" data-bs-parent="#permission-settings" href="#perms-tool-collapse" aria-expanded="true" aria-controls="perms-tool-collapse">
-				{{$permlbl}}
-				</a>
-			</h3>
-		</div>
-		<div id="perms-tool-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="perms-tool">
-			<div class="section-content-tools-wrapper">
-				<div class="section-content-warning-wrapper">
-				{{$permnote}}
-				</div>
+			{{include file="field_input.tpl" field=$name}}
+			{{include file="field_checkbox.tpl" field=$default_role}}
 
-				<table id="perms-tool-table" class=mb-3>
-					<tr>
-						<td></td><td colspan="2" class="abook-me">{{$me}}</td>
-					</tr>
-						{{foreach $perms as $prm}}
-						{{include file="field_acheckbox.tpl" field=$prm}}
-						{{/foreach}}
-				</table>
+			{{$group_select}}
 
-				<div class="settings-submit-wrapper" >
-					<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
-				</div>
+			<div class="section-subtitle-wrapper" id="perms-tool">
+				<h3>
+					{{$permlbl}}
+				</h3>
 			</div>
-		</div>
-		{{if $permcats}}
-		<div class="section-content-wrapper-np">
+			<div class="section-content-warning-wrapper">
+			{{$permnote}}
+			</div>
+			<table id="" class="table table-hover">
+				{{foreach $perms as $prm}}
+				{{include file="field_acheckbox.tpl" field=$prm}}
+				{{/foreach}}
+			</table>
+			<div class="settings-submit-wrapper" >
+				<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+			</div>
+			{{**if $permcats}}
 			<table id="permcat-index">
 			{{foreach $permcats as $k => $v}}
 			<tr class="permcat-row-{{$k}}">
@@ -55,10 +43,8 @@
 			</tr>
 			{{/foreach}}
 			</table>
-		</div>
-		{{/if}}
+			{{/if**}}
 
+		</form>
 	</div>
-	</form>
-
 </div>