From 8c9ef56a71f4ebbc1ed4c1aafabb672617fccf4f Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 3 Feb 2019 15:33:59 -0500
Subject: [PATCH] Normalize field_*.tpl formatting
---
view/templates/field_input.tpl | 4 ++--
view/templates/field_select.tpl | 9 +++----
view/templates/field_select_raw.tpl | 11 ++++-----
view/templates/field_textarea.tpl | 11 ++++-----
view/templates/field_themeselect.tpl | 22 ++++++++++-------
view/templates/field_yesno.tpl | 12 +++++-----
view/theme/frio/templates/field_input.tpl | 12 +++++-----
view/theme/frio/templates/field_select.tpl | 12 ++++++----
.../theme/frio/templates/field_select_raw.tpl | 14 +++++------
view/theme/frio/templates/field_textarea.tpl | 6 ++---
.../frio/templates/field_themeselect.tpl | 24 ++++++++++++-------
11 files changed, 75 insertions(+), 62 deletions(-)
diff --git a/view/templates/field_input.tpl b/view/templates/field_input.tpl
index b66f5f7027..399cf0c431 100644
--- 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 2016a0bb7e..c174078e21 100644
--- 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 1f4630e995..534ec34fc0 100644
--- 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 2ee145b0c4..eadcbe56c7 100644
--- 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 6242cc6711..922797eb2d 100644
--- 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 182efcf18d..64f0816647 100644
--- 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 78c3b0b1ea..1a92393a80 100644
--- 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 2a609ed71d..25cfd652cd 100644
--- 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 bbd8368f26..7cae7144be 100644
--- 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 baf2e84487..769a8357ae 100644
--- 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 78c179436b..f71b19131a 100644
--- 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>