whitespace and minor restructuring

This commit is contained in:
Mario Vavti 2015-03-05 19:08:32 +01:00
parent 688ef34d98
commit ce229d73f8
2 changed files with 82 additions and 87 deletions

View File

@ -1,65 +1,47 @@
<div class="panel"> {{include file="field_select.tpl" field=$schema}}
<div class="section-subtitle-wrapper" role="tab" id="custom-settings-title"> {{if $expert}}
<h3> {{include file="field_colorinput.tpl" field=$nav_bg}}
<a data-toggle="collapse" data-parent="#settings" href="#custom-settings-content" aria-expanded="true" aria-controls="custom-settings-content"> {{include file="field_colorinput.tpl" field=$nav_gradient_top}}
Custom Theme Settings {{include file="field_colorinput.tpl" field=$nav_gradient_bottom}}
</a> {{include file="field_colorinput.tpl" field=$nav_active_gradient_top}}
</h3> {{include file="field_colorinput.tpl" field=$nav_active_gradient_bottom}}
</div> {{include file="field_colorinput.tpl" field=$nav_bd}}
<div id="custom-settings-content" class="panel-collapse collapse" role="tabpanel" aria-labelledby="custom-settings"> {{include file="field_colorinput.tpl" field=$nav_icon_colour}}
<div class="section-content-tools-wrapper"> {{include file="field_colorinput.tpl" field=$nav_active_icon_colour}}
{{include file="field_select.tpl" field=$schema}} {{include file="field_input.tpl" field=$nav_min_opacity}}
{{include file="field_colorinput.tpl" field=$bgcolour}}
{{if $expert}} {{include file="field_colorinput.tpl" field=$background_image}}
{{include file="field_colorinput.tpl" field=$nav_bg}} {{include file="field_colorinput.tpl" field=$item_colour}}
{{include file="field_colorinput.tpl" field=$nav_gradient_top}} {{include file="field_colorinput.tpl" field=$comment_item_colour}}
{{include file="field_colorinput.tpl" field=$nav_gradient_bottom}} {{include file="field_colorinput.tpl" field=$comment_border_colour}}
{{include file="field_colorinput.tpl" field=$nav_active_gradient_top}} {{include file="field_input.tpl" field=$comment_indent}}
{{include file="field_colorinput.tpl" field=$nav_active_gradient_bottom}} {{/if}}
{{include file="field_colorinput.tpl" field=$nav_bd}} {{include file="field_input.tpl" field=$body_font_size}}
{{include file="field_colorinput.tpl" field=$nav_icon_colour}} {{if $expert}}
{{include file="field_colorinput.tpl" field=$nav_active_icon_colour}} {{include file="field_input.tpl" field=$font_size}}
{{include file="field_input.tpl" field=$nav_min_opacity}} {{include file="field_colorinput.tpl" field=$font_colour}}
{{include file="field_colorinput.tpl" field=$bgcolour}} {{include file="field_colorinput.tpl" field=$link_colour}}
{{include file="field_colorinput.tpl" field=$background_image}} {{include file="field_colorinput.tpl" field=$banner_colour}}
{{include file="field_colorinput.tpl" field=$item_colour}} {{include file="field_colorinput.tpl" field=$toolicon_colour}}
{{include file="field_colorinput.tpl" field=$comment_item_colour}} {{include file="field_colorinput.tpl" field=$toolicon_activecolour}}
{{include file="field_colorinput.tpl" field=$comment_border_colour}} {{include file="field_input.tpl" field=$radius}}
{{include file="field_input.tpl" field=$comment_indent}} {{include file="field_input.tpl" field=$shadow}}
{{/if}} {{include file="field_input.tpl" field=$top_photo}}
{{include file="field_input.tpl" field=$reply_photo}}
{{include file="field_input.tpl" field=$body_font_size}} {{include file="field_input.tpl" field=$converse_width}}
{{include file="field_checkbox.tpl" field=$converse_center}}
{{if $expert}} {{/if}}
{{include file="field_input.tpl" field=$font_size}} {{include file="field_checkbox.tpl" field=$narrow_navbar}}
{{include file="field_colorinput.tpl" field=$font_colour}} {{if $expert}}
{{include file="field_colorinput.tpl" field=$link_colour}} <script>
{{include file="field_colorinput.tpl" field=$banner_colour}} $(function(){
{{include file="field_colorinput.tpl" field=$toolicon_colour}} $('#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'});
{{include file="field_colorinput.tpl" field=$toolicon_activecolour}} $('#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();
{{include file="field_input.tpl" field=$radius}} $('#id_redbasic_toolicon_colour,#id_redbasic_toolicon_activecolour,#id_redbasic_font_colour').colorpicker();
{{include file="field_input.tpl" field=$shadow}} $('#id_redbasic_item_colour,#id_redbasic_comment_item_colour,#id_redbasic_comment_border_colour').colorpicker({format: 'rgba'});
{{include file="field_input.tpl" field=$top_photo}} });
{{include file="field_input.tpl" field=$reply_photo}} </script>
{{include file="field_input.tpl" field=$converse_width}} {{/if}}
{{include file="field_checkbox.tpl" field=$converse_center}} <div class="settings-submit-wrapper" >
{{/if}} <button type="submit" name="redbasic-settings-submit" class="btn btn-primary">{{$submit}}</button>
{{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>
</div> </div>

View File

@ -17,12 +17,12 @@
</div> </div>
<div id="theme-settings-content" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="theme-settings"> <div id="theme-settings-content" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="theme-settings">
<div class="section-content-tools-wrapper"> <div class="section-content-tools-wrapper">
{{if $theme}} {{if $theme}}
{{include file="field_themeselect.tpl" field=$theme}} {{include file="field_themeselect.tpl" field=$theme}}
{{/if}} {{/if}}
{{if $mobile_theme}} {{if $mobile_theme}}
{{include file="field_themeselect.tpl" field=$mobile_theme}} {{include file="field_themeselect.tpl" field=$mobile_theme}}
{{/if}} {{/if}}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
</div> </div>
@ -30,9 +30,22 @@
</div> </div>
</div> </div>
{{/if}} {{/if}}
{{if $theme_config}} <div class="panel">
{{$theme_config}} <div class="section-subtitle-wrapper" role="tab" id="custom-settings-title">
{{/if}} <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="panel">
<div class="section-subtitle-wrapper" role="tab" id="content-settings-title"> <div class="section-subtitle-wrapper" role="tab" id="content-settings-title">
<h3> <h3>
@ -41,22 +54,22 @@
</a> </a>
</h3> </h3>
</div> </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"> <div class="section-content-wrapper">
{{include file="field_input.tpl" field=$ajaxint}} {{include file="field_input.tpl" field=$ajaxint}}
{{include file="field_input.tpl" field=$itemspage}} {{include file="field_input.tpl" field=$itemspage}}
{{include file="field_input.tpl" field=$channel_divmore_height}} {{include file="field_input.tpl" field=$channel_divmore_height}}
{{include file="field_input.tpl" field=$network_divmore_height}} {{include file="field_input.tpl" field=$network_divmore_height}}
{{include file="field_checkbox.tpl" field=$nosmile}} {{include file="field_checkbox.tpl" field=$nosmile}}
{{include file="field_checkbox.tpl" field=$title_tosource}} {{include file="field_checkbox.tpl" field=$title_tosource}}
{{include file="field_checkbox.tpl" field=$channel_list_mode}} {{include file="field_checkbox.tpl" field=$channel_list_mode}}
{{include file="field_checkbox.tpl" field=$network_list_mode}} {{include file="field_checkbox.tpl" field=$network_list_mode}}
{{include file="field_checkbox.tpl" field=$user_scalable}} {{include file="field_checkbox.tpl" field=$user_scalable}}
{{if $expert}} {{if $expert}}
<div class="form-group"> <div class="form-group">
<a class="btn btn-default "href="pdledit">{{$layout_editor}}</a> <a class="btn btn-default "href="pdledit">{{$layout_editor}}</a>
</div> </div>
{{/if}} {{/if}}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
</div> </div>