1 files changed, 28 insertions, 6 deletions
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 4c1b8eb8f..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}}
@@ -100,6 +97,29 @@
 {{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}}
+{{include file="field_intcheckbox.tpl" field=$always_show_in_notices}}
+
+{{*include file="field_intcheckbox.tpl" field=$vnotify11*}}
+</div>
+
+{{include file="field_input.tpl" field=$evdays}}
+
+
+
 </div>
 
 <div class="settings-submit-wrapper" >
@@ -110,6 +130,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">