aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-10-26 19:32:12 -0700
committerfriendica <info@friendica.com>2014-10-26 19:32:12 -0700
commit655c3e1b4784f4bc37af1e1db0d7bcf313e71e66 (patch)
tree83b8d1029a9c0b0191120f6b5bf5e71b65b493a9 /view/tpl
parentd2af45d2066565a5eab31b5105b874ee98f10364 (diff)
downloadvolse-hubzilla-655c3e1b4784f4bc37af1e1db0d7bcf313e71e66.tar.gz
volse-hubzilla-655c3e1b4784f4bc37af1e1db0d7bcf313e71e66.tar.bz2
volse-hubzilla-655c3e1b4784f4bc37af1e1db0d7bcf313e71e66.zip
put privacy role selector in settings page. Change visibility of various permissions items accordingly.
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/settings.tpl46
1 files changed, 22 insertions, 24 deletions
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" >