aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-03-05 19:08:32 +0100
committerMario Vavti <mario@mariovavti.com>2015-03-05 19:08:32 +0100
commitce229d73f86f90ed102145694780abb54de51345 (patch)
tree55ad8d08550d8dd7acaf71d639abb27d2ab970bb
parent688ef34d98dbfafb5418f15eabd8bc41e9a5b581 (diff)
downloadvolse-hubzilla-ce229d73f86f90ed102145694780abb54de51345.tar.gz
volse-hubzilla-ce229d73f86f90ed102145694780abb54de51345.tar.bz2
volse-hubzilla-ce229d73f86f90ed102145694780abb54de51345.zip
whitespace and minor restructuring
-rw-r--r--view/theme/redbasic/tpl/theme_settings.tpl110
-rwxr-xr-xview/tpl/settings_display.tpl59
2 files changed, 82 insertions, 87 deletions
diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl
index 972620a43..dc33e232a 100644
--- a/view/theme/redbasic/tpl/theme_settings.tpl
+++ b/view/theme/redbasic/tpl/theme_settings.tpl
@@ -1,65 +1,47 @@
-<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" role="tabpanel" aria-labelledby="custom-settings">
- <div class="section-content-tools-wrapper">
- {{include file="field_select.tpl" field=$schema}}
-
- {{if $expert}}
- {{include file="field_colorinput.tpl" field=$nav_bg}}
- {{include file="field_colorinput.tpl" field=$nav_gradient_top}}
- {{include file="field_colorinput.tpl" field=$nav_gradient_bottom}}
- {{include file="field_colorinput.tpl" field=$nav_active_gradient_top}}
- {{include file="field_colorinput.tpl" field=$nav_active_gradient_bottom}}
- {{include file="field_colorinput.tpl" field=$nav_bd}}
- {{include file="field_colorinput.tpl" field=$nav_icon_colour}}
- {{include file="field_colorinput.tpl" field=$nav_active_icon_colour}}
- {{include file="field_input.tpl" field=$nav_min_opacity}}
- {{include file="field_colorinput.tpl" field=$bgcolour}}
- {{include file="field_colorinput.tpl" field=$background_image}}
- {{include file="field_colorinput.tpl" field=$item_colour}}
- {{include file="field_colorinput.tpl" field=$comment_item_colour}}
- {{include file="field_colorinput.tpl" field=$comment_border_colour}}
- {{include file="field_input.tpl" field=$comment_indent}}
- {{/if}}
-
- {{include file="field_input.tpl" field=$body_font_size}}
-
- {{if $expert}}
- {{include file="field_input.tpl" field=$font_size}}
- {{include file="field_colorinput.tpl" field=$font_colour}}
- {{include file="field_colorinput.tpl" field=$link_colour}}
- {{include file="field_colorinput.tpl" field=$banner_colour}}
- {{include file="field_colorinput.tpl" field=$toolicon_colour}}
- {{include file="field_colorinput.tpl" field=$toolicon_activecolour}}
- {{include file="field_input.tpl" field=$radius}}
- {{include file="field_input.tpl" field=$shadow}}
- {{include file="field_input.tpl" field=$top_photo}}
- {{include file="field_input.tpl" field=$reply_photo}}
- {{include file="field_input.tpl" field=$converse_width}}
- {{include file="field_checkbox.tpl" field=$converse_center}}
- {{/if}}
-
- {{include file="field_checkbox.tpl" field=$narrow_navbar}}
-
- {{if $expert}}
- <script>
- $(function(){
- $('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker({format: 'rgba'});
- $('#id_redbasic_nav_bd,#id_redbasic_nav_icon_colour ,#id_redbasic_nav_active_icon_colour,#id_redbasic_banner_colour,#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker();
- $('#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker();
- $('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour').colorpicker({format: 'rgba'});
- });
- </script>
- {{/if}}
- <div class="settings-submit-wrapper" >
- <button type="submit" name="redbasic-settings-submit" class="btn btn-primary">{{$submit}}</button>
- </div>
- </div>
- </div>
+{{include file="field_select.tpl" field=$schema}}
+{{if $expert}}
+ {{include file="field_colorinput.tpl" field=$nav_bg}}
+ {{include file="field_colorinput.tpl" field=$nav_gradient_top}}
+ {{include file="field_colorinput.tpl" field=$nav_gradient_bottom}}
+ {{include file="field_colorinput.tpl" field=$nav_active_gradient_top}}
+ {{include file="field_colorinput.tpl" field=$nav_active_gradient_bottom}}
+ {{include file="field_colorinput.tpl" field=$nav_bd}}
+ {{include file="field_colorinput.tpl" field=$nav_icon_colour}}
+ {{include file="field_colorinput.tpl" field=$nav_active_icon_colour}}
+ {{include file="field_input.tpl" field=$nav_min_opacity}}
+ {{include file="field_colorinput.tpl" field=$bgcolour}}
+ {{include file="field_colorinput.tpl" field=$background_image}}
+ {{include file="field_colorinput.tpl" field=$item_colour}}
+ {{include file="field_colorinput.tpl" field=$comment_item_colour}}
+ {{include file="field_colorinput.tpl" field=$comment_border_colour}}
+ {{include file="field_input.tpl" field=$comment_indent}}
+{{/if}}
+{{include file="field_input.tpl" field=$body_font_size}}
+{{if $expert}}
+ {{include file="field_input.tpl" field=$font_size}}
+ {{include file="field_colorinput.tpl" field=$font_colour}}
+ {{include file="field_colorinput.tpl" field=$link_colour}}
+ {{include file="field_colorinput.tpl" field=$banner_colour}}
+ {{include file="field_colorinput.tpl" field=$toolicon_colour}}
+ {{include file="field_colorinput.tpl" field=$toolicon_activecolour}}
+ {{include file="field_input.tpl" field=$radius}}
+ {{include file="field_input.tpl" field=$shadow}}
+ {{include file="field_input.tpl" field=$top_photo}}
+ {{include file="field_input.tpl" field=$reply_photo}}
+ {{include file="field_input.tpl" field=$converse_width}}
+ {{include file="field_checkbox.tpl" field=$converse_center}}
+{{/if}}
+{{include file="field_checkbox.tpl" field=$narrow_navbar}}
+{{if $expert}}
+<script>
+ $(function(){
+ $('#id_redbasic_nav_bg,#id_redbasic_nav_gradient_top,#id_redbasic_nav_gradient_bottom,#id_redbasic_nav_active_gradient_top,#id_redbasic_nav_active_gradient_bottom').colorpicker({format: 'rgba'});
+ $('#id_redbasic_nav_bd,#id_redbasic_nav_icon_colour ,#id_redbasic_nav_active_icon_colour,#id_redbasic_banner_colour,#id_redbasic_link_colour,#id_redbasic_background_colour').colorpicker();
+ $('#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker();
+ $('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour').colorpicker({format: 'rgba'});
+ });
+</script>
+{{/if}}
+<div class="settings-submit-wrapper" >
+ <button type="submit" name="redbasic-settings-submit" class="btn btn-primary">{{$submit}}</button>
</div>
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>