From b2298d44a4126ba0b7f0355733bb1125c656bac1 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 5 Aug 2016 14:45:06 +0200
Subject: multi acl: port /settings

---
 view/js/acl.js        | 2 --
 view/tpl/settings.tpl | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'view')

diff --git a/view/js/acl.js b/view/js/acl.js
index a1af5f4f0..2ba7ea46a 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -97,8 +97,6 @@ ACL.prototype.on_submit = function() {
 		that.form_id.append("<input class='acl-field' type='hidden' name='contact_deny[]' value='"+v+"'>");
 	});
 
-	//areYouSure jquery plugin: recheck the form here
-	$('form').trigger('checkform.areYouSure');
 };
 
 ACL.prototype.search = function() {
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 8157196ac..0ec44e9ff 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -5,7 +5,7 @@
 		<div class="clear"></div>
 	</div>
 	{{$nickname_block}}
-	<form action="settings" id="settings-form" method="post" autocomplete="off" >
+	<form action="settings" id="settings-form" method="post" autocomplete="off" class="acl-form" data-form_id="settings-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}' />
 		<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
 			<div class="panel">
@@ -72,7 +72,6 @@
 							{{/if}}
 							<div id="settings-default-perms" class="form-group" >
 								<button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon" class="fa"></i>&nbsp;{{$permissions}}</button>
-								{{$aclselect}}
 							</div>
 							{{$group_select}}
 							{{include file="field_checkbox.tpl" field=$hide_presence}}
@@ -174,4 +173,5 @@
 			</div>
 		</div>
 	</form>
+	{{$aclselect}}
 </div>
-- 
cgit v1.2.3