From ce229d73f86f90ed102145694780abb54de51345 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 5 Mar 2015 19:08:32 +0100
Subject: whitespace and minor restructuring

---
 view/tpl/settings_display.tpl | 59 ++++++++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 23 deletions(-)

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

diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl
index d27ea15e0..6532b4ec1 100755
--- a/view/tpl/settings_display.tpl
+++ b/view/tpl/settings_display.tpl
@@ -17,12 +17,12 @@
 				</div>
 				<div id="theme-settings-content" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="theme-settings">
 					<div class="section-content-tools-wrapper">
-							{{if $theme}}
-								{{include file="field_themeselect.tpl" field=$theme}}
-							{{/if}}
-							{{if $mobile_theme}}
-								{{include file="field_themeselect.tpl" field=$mobile_theme}}
-							{{/if}}
+						{{if $theme}}
+							{{include file="field_themeselect.tpl" field=$theme}}
+						{{/if}}
+						{{if $mobile_theme}}
+							{{include file="field_themeselect.tpl" field=$mobile_theme}}
+						{{/if}}
 						<div class="settings-submit-wrapper" >
 							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 						</div>
@@ -30,9 +30,22 @@
 				</div>
 			</div>
 			{{/if}}
-			{{if $theme_config}}
-				{{$theme_config}}
-			{{/if}}
+			<div class="panel">
+				<div class="section-subtitle-wrapper" role="tab" id="custom-settings-title">
+					<h3>
+						<a data-toggle="collapse" data-parent="#settings" href="#custom-settings-content" aria-expanded="true" aria-controls="custom-settings-content">
+							Custom Theme Settings
+						</a>
+					</h3>
+				</div>
+				<div id="custom-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme}} in{{/if}}" role="tabpanel" aria-labelledby="custom-settings">
+					<div class="section-content-tools-wrapper">
+						{{if $theme_config}}
+							{{$theme_config}}
+						{{/if}}
+					</div>
+				</div>
+			</div>
 			<div class="panel">
 				<div class="section-subtitle-wrapper" role="tab" id="content-settings-title">
 					<h3>
@@ -41,22 +54,22 @@
 						</a>
 					</h3>
 				</div>
-				<div id="content-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="content-settings">
+				<div id="content-settings-content" class="panel-collapse collapse{{if !$theme && !$mobile_theme && !$theme_config}} in{{/if}}" role="tabpanel" aria-labelledby="content-settings">
 					<div class="section-content-wrapper">
-							{{include file="field_input.tpl" field=$ajaxint}}
-							{{include file="field_input.tpl" field=$itemspage}}
-							{{include file="field_input.tpl" field=$channel_divmore_height}}
-							{{include file="field_input.tpl" field=$network_divmore_height}}
-							{{include file="field_checkbox.tpl" field=$nosmile}}
-							{{include file="field_checkbox.tpl" field=$title_tosource}}
-							{{include file="field_checkbox.tpl" field=$channel_list_mode}}
-							{{include file="field_checkbox.tpl" field=$network_list_mode}}
-							{{include file="field_checkbox.tpl" field=$user_scalable}}
-							{{if $expert}}
-							<div class="form-group">
+						{{include file="field_input.tpl" field=$ajaxint}}
+						{{include file="field_input.tpl" field=$itemspage}}
+						{{include file="field_input.tpl" field=$channel_divmore_height}}
+						{{include file="field_input.tpl" field=$network_divmore_height}}
+						{{include file="field_checkbox.tpl" field=$nosmile}}
+						{{include file="field_checkbox.tpl" field=$title_tosource}}
+						{{include file="field_checkbox.tpl" field=$channel_list_mode}}
+						{{include file="field_checkbox.tpl" field=$network_list_mode}}
+						{{include file="field_checkbox.tpl" field=$user_scalable}}
+						{{if $expert}}
+						<div class="form-group">
 							<a class="btn btn-default "href="pdledit">{{$layout_editor}}</a>
-							</div>
-							{{/if}}
+						</div>
+						{{/if}}
 						<div class="settings-submit-wrapper" >
 							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 						</div>
-- 
cgit v1.2.3