diff options
| author | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
|---|---|---|
| committer | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
| commit | b5fad9feefd0f261807222d8a4c42ead6253a65c (patch) | |
| tree | 399cd4a1b79f61530924ea59670af0bdd6cee5be /view/tpl/settings.tpl | |
| parent | 89aea081825ec7b11b00833a9bec2c74900bfcb6 (diff) | |
| parent | b29a968be8df52cd7c9b6d5bebb618534788337c (diff) | |
| download | volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.gz volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.bz2 volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.zip | |
Fix merge conflict
Diffstat (limited to 'view/tpl/settings.tpl')
| -rwxr-xr-x | view/tpl/settings.tpl | 69 |
1 files changed, 45 insertions, 24 deletions
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 07a37f773..7fa52677b 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" > @@ -102,6 +100,27 @@ {{include file="field_intcheckbox.tpl" field=$notify8}} </div> +<div id="settings-vnotify-desc">{{$lbl_vnot}}</div> + +<div class="group"> +{{include file="field_intcheckbox.tpl" field=$vnotify1}} +{{include file="field_intcheckbox.tpl" field=$vnotify2}} +{{include file="field_intcheckbox.tpl" field=$vnotify3}} +{{include file="field_intcheckbox.tpl" field=$vnotify4}} +{{include file="field_intcheckbox.tpl" field=$vnotify5}} +{{include file="field_intcheckbox.tpl" field=$vnotify6}} +{{include file="field_intcheckbox.tpl" field=$vnotify10}} +{{include file="field_intcheckbox.tpl" field=$vnotify7}} +{{include file="field_intcheckbox.tpl" field=$vnotify8}} +{{include file="field_intcheckbox.tpl" field=$vnotify9}} + +{{*include file="field_intcheckbox.tpl" field=$vnotify11*}} +</div> + +{{include file="field_input.tpl" field=$evdays}} + + + </div> <div class="settings-submit-wrapper" > @@ -112,6 +131,8 @@ {{if $menus}} <h3 class="settings-heading">{{$lbl_misc}}</h3> + + <div id="settings-menu-desc">{{$menu_desc}}</div> <div class="settings-channel-menu-div"> <select name="channel_menu" class="settings-channel-menu-sel"> |