Normalize field_*.tpl formatting

diff --git a/view/templates/field_input.tpl b/view/templates/field_input.tpl
index b66f5f7027f9fac65f34280e2afa26e0fcb46639..399cf0c4316ea57384eb57cb11467ef7d1d1f575 100644 (file)
--- a/view/templates/field_input.tpl
+++ b/view/templates/field_input.tpl
@@ -2,7 +2,7 @@
        <div class='field input' id='wrapper_{{$field.0}}'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
                <input{{if $field.6 eq 'email'}} type='email'{{elseif $field.6 eq 'url'}} type='url'{{else}} type="text"{{/if}} name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2 nofilter}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5 nofilter}}{{/if}} aria-describedby='{{$field.0}}_tip'>
-               {{if $field.3}}
+       {{if $field.3}}
                <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3 nofilter}}</span>
-               {{/if}}
+       {{/if}}
        </div>

diff --git a/view/templates/field_select.tpl b/view/templates/field_select.tpl
index 2016a0bb7e81a4c538bae6fc599204a41ebe2ad4..c174078e21aa11339d9cf903d1f89edd07a41e46 100644 (file)
--- a/view/templates/field_select.tpl
+++ b/view/templates/field_select.tpl
@@ -1,11 +1,12 @@
 
-       
        <div class='field select'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
                <select name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>
-                       {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+       {{foreach $field.4 as $opt=>$val}}
+                       <option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>
+       {{/foreach}}
                </select>
-               {{if $field.3}}
+       {{if $field.3}}
                <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
-               {{/if}}
+       {{/if}}
        </div>

diff --git a/view/templates/field_select_raw.tpl b/view/templates/field_select_raw.tpl
index 1f4630e995eb0825b4becbd340a5b1c08c1df76e..534ec34fc0b7ad889b982fe8834f02898ae0530c 100644 (file)
--- a/view/templates/field_select_raw.tpl
+++ b/view/templates/field_select_raw.tpl
@@ -1,11 +1,10 @@
 
-       
-       <div class='field select'>
-               <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <select name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>
+       <div class="field select">
+               <label for="id_{{$field.0}}">{{$field.1}}</label>
+               <select name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip">
                        {{$field.4 nofilter}}
                </select>
-               {{if $field.3}}
+       {{if $field.3}}
                <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
-               {{/if}}
+       {{/if}}
        </div>

diff --git a/view/templates/field_textarea.tpl b/view/templates/field_textarea.tpl
index 2ee145b0c4d6185a13596503767d98a2eb812f67..eadcbe56c7d6ab806327eff4989e82ba4ff7e352 100644 (file)
--- a/view/templates/field_textarea.tpl
+++ b/view/templates/field_textarea.tpl
@@ -1,9 +1,8 @@
 
-       
-       <div class='field textarea'>
-               <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <textarea name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>{{$field.2 nofilter}}</textarea>
-               {{if $field.3}}
+       <div class="field textarea">
+               <label for="id_{{$field.0}}">{{$field.1}}</label>
+               <textarea name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip">{{$field.2}}</textarea>
+       {{if $field.3}}
                <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
-               {{/if}}
+       {{/if}}
        </div>

diff --git a/view/templates/field_themeselect.tpl b/view/templates/field_themeselect.tpl
index 6242cc67119162f99ca3e515735342d0ce67cbce..922797eb2d3badaf58838886d1088a5ed0cf75e9 100644 (file)
--- a/view/templates/field_themeselect.tpl
+++ b/view/templates/field_themeselect.tpl
@@ -1,12 +1,18 @@
 
-       {{if $field.5}}<script>$(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script>{{/if}}
-       <div class='field select'>
-               <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5}}onchange="previewTheme(this);"{{/if}} aria-describedby='{{$field.0}}_tip'>
-                       {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+{{if $field.5}}
+       <script>$(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script>
+{{/if}}
+       <div class="field select">
+               <label for="id_{{$field.0}}">{{$field.1}}</label>
+               <select name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.5}}onchange="previewTheme(this);"{{/if}} aria-describedby="{{$field.0}}_tip">
+       {{foreach $field.4 as $opt=>$val}}
+                       <option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>
+       {{/foreach}}
                </select>
-               {{if $field.3}}
+       {{if $field.3}}
                <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
-               {{/if}}
-               {{if $field.5}}<div id="theme-preview"></div>{{/if}}
+       {{/if}}
+       {{if $field.5}}
+               <div id="theme-preview"></div>
+       {{/if}}
        </div>

diff --git a/view/templates/field_yesno.tpl b/view/templates/field_yesno.tpl
index 182efcf18d35b9a01ef01ff50bd8b23bd5d9c4b5..64f0816647ddd890a937ab03432c847d06b44b96 100644 (file)
--- a/view/templates/field_yesno.tpl
+++ b/view/templates/field_yesno.tpl
@@ -1,12 +1,12 @@
 
-       <div class='field yesno'>
-               <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <div class='onoff' id="id_{{$field.0}}_onoff">
-                       <input  type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2 nofilter}}" aria-describedby='{{$field.0}}_tip'>
-                       <a href="#" class='off'>
+       <div class="field yesno">
+               <label for="id_{{$field.0}}">{{$field.1}}</label>
+               <div class="onoff" id="id_{{$field.0}}_onoff">
+                       <input  type="hidden" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2 nofilter}}" aria-describedby="{{$field.0}}_tip">
+                       <a href="#" class="off">
                                {{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
                        </a>
-                       <a href="#" class='on'>
+                       <a href="#" class="on">
                                {{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
                        </a>
                </div>

diff --git a/view/theme/frio/templates/field_input.tpl b/view/theme/frio/templates/field_input.tpl
index 78c3b0b1eae03503d52d65fb9b24bf6bfa6e03e9..1a92393a8032ee55d57913f63cabdb196c1a75db 100644 (file)
--- a/view/theme/frio/templates/field_input.tpl
+++ b/view/theme/frio/templates/field_input.tpl
@@ -1,11 +1,11 @@
 
-<div id="id_{{$field.0}}_wrapper" class="form-group field input">
+       <div id="id_{{$field.0}}_wrapper" class="form-group field input">
        {{if !isset($label) || $label != false }}
-       <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
+               <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
        {{/if}}
-       <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}"{{if $field.6 eq "email"}} type="email"{{elseif $field.6 eq "url"}} type="url"{{else}} type="text"{{/if}} value="{{$field.2 nofilter}}"{{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5 nofilter}}{{/if}} aria-describedby="{{$field.0}}_tip">
+               <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}"{{if $field.6 eq "email"}} type="email"{{elseif $field.6 eq "url"}} type="url"{{else}} type="text"{{/if}} value="{{$field.2 nofilter}}"{{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5 nofilter}}{{/if}} aria-describedby="{{$field.0}}_tip">
        {{if $field.3}}
-       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
+               <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
        {{/if}}
-       <div class="clear"></div>
-</div>
+               <div class="clear"></div>
+       </div>

diff --git a/view/theme/frio/templates/field_select.tpl b/view/theme/frio/templates/field_select.tpl
index 2a609ed71dadbca0fd1b8707f811f842abe0ffe7..25cfd652cd22970aa223e35c2237586c001df919 100644 (file)
--- a/view/theme/frio/templates/field_select.tpl
+++ b/view/theme/frio/templates/field_select.tpl
@@ -1,10 +1,12 @@
 
-<div class="form-group field select">
+       <div class="form-group field select">
                <label for="id_{{$field.0}}">{{$field.1}}</label>
                <select name="{{$field.0}}" id="id_{{$field.0}}" class="form-control" aria-describedby="{{$field.0}}_tip">
-                       {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+       {{foreach $field.4 as $opt=>$val}}
+                       <option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>
+       {{/foreach}}
                </select>
-               {{if $field.3}}
+       {{if $field.3}}
                <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
-               {{/if}}
-</div>
+       {{/if}}
+       </div>

diff --git a/view/theme/frio/templates/field_select_raw.tpl b/view/theme/frio/templates/field_select_raw.tpl
index bbd8368f261ed7e64ed83c24b349b8e3cfcbecf3..7cae7144bef0f30df626d0089cd086de15853a4d 100644 (file)
--- a/view/theme/frio/templates/field_select_raw.tpl
+++ b/view/theme/frio/templates/field_select_raw.tpl
@@ -1,10 +1,10 @@
 
-<div class="form-group field select">
-       <label for="id_{{$field.0}}">{{$field.1}}</label>
-       <select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip">
-               {{$field.4 nofilter}}
-       </select>
+       <div class="form-group field select">
+               <label for="id_{{$field.0}}">{{$field.1}}</label>
+               <select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip">
+                       {{$field.4 nofilter}}
+               </select>
        {{if $field.3}}
-       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
+               <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
        {{/if}}
-</div>
+       </div>

diff --git a/view/theme/frio/templates/field_textarea.tpl b/view/theme/frio/templates/field_textarea.tpl
index baf2e844870f04fbd48445cc9766e17380083cd5..769a8357aefd5d4d32dfeb55918c1c9c384d0cf2 100644 (file)
--- a/view/theme/frio/templates/field_textarea.tpl
+++ b/view/theme/frio/templates/field_textarea.tpl
@@ -1,9 +1,9 @@
 
        <div class="form-group field textarea">
                <label for="id_{{$field.0}}">{{$field.1}}</label>
-               <textarea class="form-control text-autosize" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.4}}{{$field.4}}{{/if}} aria-describedby="{{$field.0}}_tip">{{$field.2}}</textarea>
-               {{if $field.3}}
+               <textarea class="form-control text-autosize" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.4}}{{$field.4 nofilter}}{{/if}} aria-describedby="{{$field.0}}_tip">{{$field.2}}</textarea>
+       {{if $field.3}}
                <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
-               {{/if}}
+       {{/if}}
                <div class="clear"></div>
        </div>

diff --git a/view/theme/frio/templates/field_themeselect.tpl b/view/theme/frio/templates/field_themeselect.tpl
index 78c179436bac2cf6cfd408f01bac85697760a96a..f71b19131ac152e4a194030442e8f8cb0018a83b 100644 (file)
--- a/view/theme/frio/templates/field_themeselect.tpl
+++ b/view/theme/frio/templates/field_themeselect.tpl
@@ -1,12 +1,18 @@
 
-{{if $field.5=="preview"}}<script type="text/javascript">$(document).ready(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script>{{/if}}
-<div class="form-group field select">
-       <label for="id_{{$field.0}}">{{$field.1}}</label>
-       <select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.5=="preview"}}onchange="previewTheme(this);"{{/if}} aria-describedby="{{$field.0}}_tip" >
-               {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
-       </select>
+{{if $field.5=="preview"}}
+       <script type="text/javascript">$(document).ready(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script>
+{{/if}}
+       <div class="form-group field select">
+               <label for="id_{{$field.0}}">{{$field.1}}</label>
+               <select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.5=="preview"}}onchange="previewTheme(this);"{{/if}} aria-describedby="{{$field.0}}_tip" >
+       {{foreach $field.4 as $opt=>$val}}
+                       <option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>
+       {{/foreach}}
+               </select>
        {{if $field.3}}
-       <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
+               <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3 nofilter}}</span>
        {{/if}}
-       {{if $field.5=="preview"}}<div id="theme-preview"></div>{{/if}}
-</div>
+       {{if $field.5=="preview"}}
+               <div id="theme-preview"></div>
+       {{/if}}
+       </div>