more settings work

3 files changed, 191 insertions, 160 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index f049e10dc..8c4b8eb81 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1912,17 +1912,30 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 	margin-bottom: 3px;
 }
 
-.section-title-wrapper h2 {
+.section-title-wrapper h2,
+.section-subtitle-wrapper h3 {
 	margin-top: 0px;
 	margin-bottom: 0px;
 }
 
+.section-subtitle-wrapper {
+	padding: 7px 10px;
+	background-color: $item_colour;
+	margin-bottom: 3px;
+}
+
 .section-content-tools-wrapper {
 	padding: 7px 10px;
 	background-color: $comment_item_colour;
-	margin-bottom: 3px;
+	margin-bottom: 3px
 }
 
+.section-content-info-wrapper {
+	padding: 21px 10px;
+	color: #31708f;
+	background-color: #d9edf7;
+	margin-bottom: 3px;
+}
 .section-content-wrapper {
 	padding: 7px 10px;
 	background-color: $comment_item_colour;
@@ -1950,6 +1963,18 @@ nav ul li .notify-unseen
 
 /* bootstrap overrides */
 
+.panel {
+  background-color: transparent;
+  border: 0px solid transparent;
+  border-radius: 0px;
+  -webkit-box-shadow: 0 0px 0px rgba(0, 0, 0, .0);
+          box-shadow: 0 0px 0px rgba(0, 0, 0, .0);
+}
+
+.panel-group .panel + .panel {
+	margin-top: 0px;
+}
+
 blockquote {
 	font-size: $font_size;
 	font-style: italic;
@@ -2251,7 +2276,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
 
 /* Turn checkboxes into switches */
 .field.checkbox > div {
-    position: relative; width: 50px;
+    position: relative; width: 60px;
     -webkit-user-select:none; -moz-user-select:none; -ms-user-select: none;
     display:inline-block;
 }
@@ -2296,7 +2321,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
     display: block; width: 15px; margin:4px;
     background: #A1A1A1;
     border-radius: 10px;
-    position: absolute; top: 0; bottom: 0; right: 26px;
+    position: absolute; top: 0; bottom: 0; right: 36px;
     -moz-transition: all 0.3s ease-in 0s; -webkit-transition: all 0.3s ease-in 0s;
     -o-transition: all 0.3s ease-in 0s; transition: all 0.3s ease-in 0s;
 }
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index b41bf87b9..20f2618a0 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,158 +1,164 @@
 <div class="generic-content-wrapper">
-<div class="section-title-wrapper">
-<h2>{{$ptitle}}</h2>
-</div>
-<div class="section-content-wrapper">
-
-{{$nickname_block}}
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-<input type='hidden' name='form_security_token' value='{{$form_security_token}}' />
-
-<h3 class="settings-heading">{{$h_basic}}</h3>
-
-{{include file="field_input.tpl" field=$username}}
-{{include file="field_select_grouped.tpl" field=$timezone}}
-{{include file="field_input.tpl" field=$defloc}}
-{{include file="field_checkbox.tpl" field=$allowloc}}
-
-{{include file="field_checkbox.tpl" field=$adult}}
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} />
-</div>
-
-
-<h3 class="settings-heading">{{$h_prv}}</h3>
-
-{{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}}
-
-<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">
-
-{{foreach $permiss_arr as $permit}}
-	{{include file="field_select.tpl" field=$permit}}
-{{/foreach}}
-	<div class="settings-submit-wrapper" >
-	<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+	<div class="section-title-wrapper">
+		<button title="{{$permanent}}" class="btn btn-danger btn-xs pull-right" type="submit" formaction="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</button>
+		<h2>{{$ptitle}}</h2>
+		<div class="clear"></div>
 	</div>
-</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>
-<br/>
-<div id="settings-default-perms-end"></div>
-
-{{$group_select}}
-
-{{$profile_in_dir}}
-
-</div>
-
-<div class="settings-common-perms">
-
-
-
-{{$suggestme}}
-
-{{include file="field_checkbox.tpl" field=$blocktags}}
-
-
-{{include file="field_input.tpl" field=$expire}}
-
-</div>
-
-
 
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} />
-</div>
-
-
-
-<h3 class="settings-heading">{{$h_not}}</h3>
-<div id="settings-notifications">
-
-<div id="settings-activity-desc">{{$activity_options}}</div>
-<div class="group">
-{{*not yet implemented *}}
-{{*include file="field_checkbox.tpl" field=$post_joingroup*}}
-{{include file="field_checkbox.tpl" field=$post_newfriend}}
-{{include file="field_checkbox.tpl" field=$post_profilechange}}
-</div>
-
-
-<div id="settings-notify-desc">{{$lbl_not}}</div>
-
-<div class="group">
-{{include file="field_intcheckbox.tpl" field=$notify1}}
-{{include file="field_intcheckbox.tpl" field=$notify2}}
-{{include file="field_intcheckbox.tpl" field=$notify3}}
-{{include file="field_intcheckbox.tpl" field=$notify4}}
-{{include file="field_intcheckbox.tpl" field=$notify5}}
-{{include file="field_intcheckbox.tpl" field=$notify6}}
-{{include file="field_intcheckbox.tpl" field=$notify7}}
-{{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" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} />
-</div>
-
-
-{{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">
-{{foreach $menus as $menu }}
-<option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option>
-{{/foreach}}
-</select>
-</div>
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} />
-</div>
-<div id="settings-channel-menu-end"></div>
-{{/if}}
-<div id="settings-remove-account-link">
-<button title="{{$permanent}}" class="btn btn-danger" type="submit" formaction="removeme">{{$removeme}}</button>
-</div>
-
-</div>
+	{{$nickname_block}}
+
+	<form action="settings" id="settings-form" method="post" autocomplete="off" >
+		<input type='hidden' name='form_security_token' value='{{$form_security_token}}' />
+
+
+
+	<div class="panel-group" id="settings" role="tablist" aria-multiselectable="true">
+		<div class="panel">
+			<div class="section-subtitle-wrapper" role="tab" id="basic-settings">
+				<h3>
+					<a data-toggle="collapse" data-parent="#settings" href="#basic-settings-collapse" aria-expanded="true" aria-controls="basic-settings-collapse">
+						{{$h_basic}}
+					</a>
+				</h3>
+			</div>
+			<div id="basic-settings-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="basic-settings">
+				<div class="section-content-tools-wrapper">
+					{{include file="field_input.tpl" field=$username}}
+					{{include file="field_select_grouped.tpl" field=$timezone}}
+					{{include file="field_input.tpl" field=$defloc}}
+					{{include file="field_checkbox.tpl" field=$allowloc}}
+					{{include file="field_checkbox.tpl" field=$adult}}
+					<div class="settings-submit-wrapper" >
+						<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} />
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="panel">
+			<div class="section-subtitle-wrapper" role="tab" id="privacy-settings">
+				<h3>
+					<a data-toggle="collapse" data-parent="#settings" href="#privacy-settings-collapse" aria-expanded="true" aria-controls="privacy-settings-collapse">
+						{{$h_prv}}
+					</a>
+				</h3>
+			</div>
+			<div id="privacy-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="privacy-settings">
+				<div class="section-content-tools-wrapper">
+					{{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}}
+						<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">
+
+							{{foreach $permiss_arr as $permit}}
+								{{include file="field_select.tpl" field=$permit}}
+							{{/foreach}}
+							<div class="settings-submit-wrapper" >
+								<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
+							</div>
+						</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 id="settings-default-perms-end"></div>
+						{{$group_select}}
+						{{$profile_in_dir}}
+					</div>
+					<div class="settings-common-perms">
+						{{$suggestme}}
+						{{include file="field_checkbox.tpl" field=$blocktags}}
+						{{include file="field_input.tpl" field=$expire}}
+					</div>
+					<div class="settings-submit-wrapper" >
+						<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} />
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="panel">
+			<div class="section-subtitle-wrapper" role="tab" id="notification-settings">
+				<h3>
+					<a data-toggle="collapse" data-parent="#settings" href="#notification-settings-collapse" aria-expanded="true" aria-controls="notification-settings-collapse">
+						{{$h_not}}
+					</a>
+				</h3>
+			</div>
+			<div id="notification-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="notification-settings">
+				<div class="section-content-tools-wrapper">
+					<div id="settings-notifications">
+						<div id="settings-activity-desc">{{$activity_options}}</div>
+						<div class="group">
+							{{*not yet implemented *}}
+							{{*include file="field_checkbox.tpl" field=$post_joingroup*}}
+							{{include file="field_checkbox.tpl" field=$post_newfriend}}
+							{{include file="field_checkbox.tpl" field=$post_profilechange}}
+						</div>
+						<div id="settings-notify-desc">{{$lbl_not}}</div>
+						<div class="group">
+							{{include file="field_intcheckbox.tpl" field=$notify1}}
+							{{include file="field_intcheckbox.tpl" field=$notify2}}
+							{{include file="field_intcheckbox.tpl" field=$notify3}}
+							{{include file="field_intcheckbox.tpl" field=$notify4}}
+							{{include file="field_intcheckbox.tpl" field=$notify5}}
+							{{include file="field_intcheckbox.tpl" field=$notify6}}
+							{{include file="field_intcheckbox.tpl" field=$notify7}}
+							{{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" >
+						<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} />
+					</div>
+				</div>
+			</div>
+		</div>
+		{{if $menus}}
+		<div class="panel">
+			<div class="section-subtitle-wrapper" role="tab" id="miscellaneous-settings">
+				<h3>
+					<a data-toggle="collapse" data-parent="#settings" href="#miscellaneous-settings-collapse" aria-expanded="true" aria-controls="miscellaneous-settings-collapse">
+						{{$lbl_misc}}
+					</a>
+				</h3>
+			</div>
+			<div id="miscellaneous-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous-settings">
+				<div class="section-content-wrapper">
+					<div class="form-group">
+						<label for="channel_menu">{{$menu_desc}}</label>
+						<select name="channel_menu" class="form-control">
+							{{foreach $menus as $menu }}
+							<option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option>
+							{{/foreach}}
+						</select>
+					</div>
+					<div class="settings-submit-wrapper" >
+						<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} />
+					</div>
+				</div>
+			</div>
+		</div>
+		{{/if}}
+	</div>
 </div>
diff --git a/view/tpl/settings_nick_set.tpl b/view/tpl/settings_nick_set.tpl
index 5d9f17e9e..2460952fe 100755
--- a/view/tpl/settings_nick_set.tpl
+++ b/view/tpl/settings_nick_set.tpl
@@ -1,4 +1,4 @@
-<div id="settings-nick-wrapper" >
-<div id="settings-nickname-desc" class="alert alert-info" role="alert">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}}</div>
+<div id="settings-nick-wrapper" class="section-content-info-wrapper">
+<div id="settings-nickname-desc">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}}</div>
 </div>
 <div id="settings-nick-end" ></div>