From 6e64f9af54c6af4fd93afb4d7d7a1594bfb55913 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 1 Mar 2015 15:22:23 +0100
Subject: first pile of work on settings

---
 view/tpl/settings.tpl | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'view/tpl/settings.tpl')

diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 894f0fe83..b41bf87b9 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,5 +1,8 @@
-<div class="generic-content-wrapper-styled">
-<h1>{{$ptitle}}</h1>
+<div class="generic-content-wrapper">
+<div class="section-title-wrapper">
+<h2>{{$ptitle}}</h2>
+</div>
+<div class="section-content-wrapper">
 
 {{$nickname_block}}
 
@@ -78,10 +81,12 @@
 <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>
@@ -150,3 +155,4 @@
 </div>
 
 </div>
+</div>
-- 
cgit v1.2.3


From ea6e86fecc901c0e64b74a1e6fc87499df93af1d Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 1 Mar 2015 21:45:49 +0100
Subject: more settings work

---
 view/tpl/settings.tpl | 314 +++++++++++++++++++++++++-------------------------
 1 file changed, 160 insertions(+), 154 deletions(-)

(limited to 'view/tpl/settings.tpl')

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>
-- 
cgit v1.2.3


From e8e6231a4e079bff7a9d0bdd9e4c1dfa5808402b Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sun, 1 Mar 2015 21:51:44 +0100
Subject: settings: missing /form and whitespace

---
 view/tpl/settings.tpl | 262 +++++++++++++++++++++++++-------------------------
 1 file changed, 129 insertions(+), 133 deletions(-)

(limited to 'view/tpl/settings.tpl')

diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 20f2618a0..3d13dc5de 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -4,161 +4,157 @@
 		<h2>{{$ptitle}}</h2>
 		<div class="clear"></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 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>
-		<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 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 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">
+							<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}}" />
+								{{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>
 
-						<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 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 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}}
+			<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*}}
+								{{*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>
-						{{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}} />
+			{{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>
-		{{/if}}
-	</div>
+	</form>
 </div>
-- 
cgit v1.2.3


From 6b467974a33a054d96b69c8c3b85b2807ffd5f29 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 2 Mar 2015 20:51:32 +0100
Subject: some more work on settings

---
 view/tpl/settings.tpl | 62 +++++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

(limited to 'view/tpl/settings.tpl')

diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 3d13dc5de..02937e4b2 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -24,7 +24,7 @@
 						{{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}} />
+							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 						</div>
 					</div>
 				</div>
@@ -40,28 +40,34 @@
 				<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 class="form-group">
+								<button type="button" class="btn btn-default" data-toggle="modal" data-target="#apsModal">{{$lbl_p2macro}}</button>
 							</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 class="modal" id="apsModal">
+								<div class="modal-dialog">
+									<div class="modal-content">
+										<div class="modal-header">
+											<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+											<h4 class="modal-title">{{$lbl_p2macro}}</h4>
+										</div>
+										<div class="modal-body">
+										{{foreach $permiss_arr as $permit}}
+											{{include file="field_select.tpl" field=$permit}}
+										{{/foreach}}
+										</div>
+										<div class="modal-footer">
+											<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+										</div>
+									</div><!-- /.modal-content -->
+								</div><!-- /.modal-dialog -->
+							</div><!-- /.modal -->
+							<div id="settings-default-perms" class="form-group" >
+								<button type="button" class="btn btn-default" data-toggle="modal" data-target="#aclModal"><i id="jot-perms-icon"></i>&nbsp;{{$permissions}}</button>
+								{{$aclselect}}
 							</div>
-							<div id="settings-default-perms-end"></div>
 							{{$group_select}}
+							{{include file="field_checkbox.tpl" field=$hide_presence}}
 							{{$profile_in_dir}}
 						</div>
 						<div class="settings-common-perms">
@@ -70,7 +76,7 @@
 							{{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}} />
+							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 						</div>
 					</div>
 				</div>
@@ -86,14 +92,14 @@
 				<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>
+							<h3>{{$activity_options}}</h3>
 							<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>
+							<h3>{{$lbl_not}}</h3>
 							<div class="group">
 								{{include file="field_intcheckbox.tpl" field=$notify1}}
 								{{include file="field_intcheckbox.tpl" field=$notify2}}
@@ -104,7 +110,7 @@
 								{{include file="field_intcheckbox.tpl" field=$notify7}}
 								{{include file="field_intcheckbox.tpl" field=$notify8}}
 							</div>
-							<div id="settings-vnotify-desc">{{$lbl_vnot}}</div>
+							<h3>{{$lbl_vnot}}</h3>
 							<div class="group">
 								{{include file="field_intcheckbox.tpl" field=$vnotify1}}
 								{{include file="field_intcheckbox.tpl" field=$vnotify2}}
@@ -118,13 +124,11 @@
 								{{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*}}
+								{{include file="field_input.tpl" field=$evdays}}
 							</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}} />
+							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 						</div>
 					</div>
 				</div>
@@ -143,9 +147,9 @@
 						<div class="form-group">
 							<label for="channel_menu">{{$menu_desc}}</label>
 							<select name="channel_menu" class="form-control">
-								{{foreach $menus as $menu }}
+							{{foreach $menus as $menu }}
 								<option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option>
-								{{/foreach}}
+							{{/foreach}}
 							</select>
 						</div>
 						<div class="settings-submit-wrapper" >
-- 
cgit v1.2.3


From 74c1b6168938872303b3ff61e9bea1c9c86a29c5 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 3 Mar 2015 09:18:04 +0100
Subject: make remove channel button work again

---
 view/tpl/settings.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/settings.tpl')

diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 02937e4b2..6ad23b007 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,6 +1,6 @@
 <div class="generic-content-wrapper">
 	<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>
+		<a title="{{$permanent}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
 		<h2>{{$ptitle}}</h2>
 		<div class="clear"></div>
 	</div>
-- 
cgit v1.2.3


From eceafd5777c2b2c15d5db93e0a11bbeb328142e2 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 4 Mar 2015 10:26:25 +0100
Subject: fix wording

---
 view/tpl/settings.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/settings.tpl')

diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 6ad23b007..eb497bbb5 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -1,6 +1,6 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
-		<a title="{{$permanent}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
+		<a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i>&nbsp;{{$removeme}}</a>
 		<h2>{{$ptitle}}</h2>
 		<div class="clear"></div>
 	</div>
-- 
cgit v1.2.3