diff options
| author | friendica <info@friendica.com> | 2015-01-01 21:49:01 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-01 21:49:01 -0800 |
| commit | 545e47933a0816699c68d98a7742a03260d6a54f (patch) | |
| tree | 1590e642e1eb48c76dd7c82b4bab4bb93ddf344d /view/tpl/settings.tpl | |
| parent | 0286c5a35b7f6fb0f02e50110deb78ae66a028cf (diff) | |
| parent | 9d4c4efb5176afe5284bc5c22df277510c64786b (diff) | |
| download | volse-hubzilla-545e47933a0816699c68d98a7742a03260d6a54f.tar.gz volse-hubzilla-545e47933a0816699c68d98a7742a03260d6a54f.tar.bz2 volse-hubzilla-545e47933a0816699c68d98a7742a03260d6a54f.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view/tpl/settings.tpl')
| -rwxr-xr-x | view/tpl/settings.tpl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 47d85d8e4..894f0fe83 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -9,7 +9,7 @@ <h3 class="settings-heading">{{$h_basic}}</h3> {{include file="field_input.tpl" field=$username}} -{{include file="field_custom.tpl" field=$timezone}} +{{include file="field_select_grouped.tpl" field=$timezone}} {{include file="field_input.tpl" field=$defloc}} {{include file="field_checkbox.tpl" field=$allowloc}} @@ -22,10 +22,7 @@ <h3 class="settings-heading">{{$h_prv}}</h3> -<div class="field custom"> -<label for="privacy-role-select">{{$role_lbl}}</label> -{{$role_select}} -</div> +{{include file="field_select_grouped.tpl" field=$role}} <div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};"> {{include file="field_checkbox.tpl" field=$hide_presence}} @@ -62,7 +59,7 @@ {{$suggestme}} -{{include file="field_yesno.tpl" field=$blocktags}} +{{include file="field_checkbox.tpl" field=$blocktags}} {{include file="field_input.tpl" field=$expire}} |