put privacy role selector in settings page. Change visibility of various permissions items accordingly.

3 files changed, 38 insertions, 28 deletions

diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css
index 651167b47..d0c970989 100644
--- a/view/css/mod_settings.css
+++ b/view/css/mod_settings.css
@@ -12,6 +12,10 @@ ul#settings-privacy-macros {
 	margin-top: 15px;
 }
 
+#settings-default-perms {
+	margin-top: 15px;
+}
+
 #settings-perm-advanced {
 	margin-top: 15px;
 }
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 77c9d0ced..87c8c3a2b 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -3,10 +3,18 @@ var ispublic = aStr['everybody'] ;
 
 $(document).ready(function() {
 
-			  $("a#settings-default-perms-menu").colorbox({ 
-				  'inline' : true, 
-				  'transition' : 'elastic' 
-			});
+	$("a#settings-default-perms-menu").colorbox({ 
+		'inline' : true, 
+		'transition' : 'elastic' 
+	});
+
+	$("#privacy-role-select").change(function() {
+		var role = $("#privacy-role-select").val();
+		if(role == 'custom')
+			$('#advanced-perm').show();
+		else
+			$('#advanced-perm').hide();
+	});
 
 	$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
 		var selstr;
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 07a37f773..4c1b8eb8f 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -22,37 +22,44 @@
 
 <h3 class="settings-heading">{{$h_prv}}</h3>
 
-{{include file="field_checkbox.tpl" field=$hide_presence}}
-
-<button type="button" class="btn btn-xs btn-default" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button>
+<div class="field custom">
+<label for="privacy-role-select">{{$role_lbl}}</label>
+{{$role_select}}
+</div>
 
+<div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};">
+{{include file="field_checkbox.tpl" field=$hide_presence}}
 
+<button type="button" class="btn btn-default" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button>
 
 <div class="collapse well" id="settings-permissions-wrapper">
-{{if !$expert}}
-	<div class="alert alert-info">{{$hint}}</div>
-{{/if}}
 
 {{foreach $permiss_arr as $permit}}
-	{{if $expert}}
-		{{include file="field_select.tpl" field=$permit}}
-	{{else}}
-		{{include file="field_select_disabled.tpl" field=$permit}}
-	{{/if}}
+	{{include file="field_select.tpl" field=$permit}}
 {{/foreach}}
-
-{{if $expert}}
 	<div class="settings-submit-wrapper" >
 	<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 	</div>
-{{/if}}
+</div>
 
+<div id="settings-default-perms" class="settings-default-perms" >
+	<button class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
+	{{$aclselect}}
+	<div id="settings-default-perms-menu-end"></div>
 </div>
-<div class="settings-common-perms">
+<br/>
+<div id="settings-default-perms-end"></div>
 
+{{$group_select}}
 
 {{$profile_in_dir}}
 
+</div>
+
+<div class="settings-common-perms">
+
+
+
 {{$suggestme}}
 
 {{include file="field_yesno.tpl" field=$blocktags}}
@@ -62,15 +69,6 @@
 
 </div>
 
-<div id="settings-default-perms" class="settings-default-perms" >
-	<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
-	{{$aclselect}}
-	<div id="settings-default-perms-menu-end"></div>
-</div>
-<br/>
-<div id="settings-default-perms-end"></div>
-
-{{$group_select}}
 
 
 <div class="settings-submit-wrapper" >