From fe74a3d697bbff697a05b34381f43ce8a04319f7 Mon Sep 17 00:00:00 2001
From: Andreas Neustifter <andreas.neustifter@gmail.com>
Date: Mon, 23 Apr 2018 19:15:54 +0000
Subject: [PATCH] Remove empty help spans from templates.

The empty spans from the templates mess up the layout sometimes, and are useless weight anyway.
Lets get rid of them.
---
 view/theme/frio/templates/field_checkbox.tpl    | 4 +++-
 view/theme/frio/templates/field_colorinput.tpl  | 4 +++-
 view/theme/frio/templates/field_custom.tpl      | 4 +++-
 view/theme/frio/templates/field_fileinput.tpl   | 4 +++-
 view/theme/frio/templates/field_input.tpl       | 4 +++-
 view/theme/frio/templates/field_intcheckbox.tpl | 4 +++-
 view/theme/frio/templates/field_openid.tpl      | 4 +++-
 view/theme/frio/templates/field_password.tpl    | 4 +++-
 view/theme/frio/templates/field_radio.tpl       | 4 +++-
 view/theme/frio/templates/field_select.tpl      | 6 ++++--
 view/theme/frio/templates/field_select_raw.tpl  | 6 ++++--
 view/theme/frio/templates/field_textarea.tpl    | 4 +++-
 view/theme/frio/templates/field_themeselect.tpl | 4 +++-
 view/theme/frio/templates/field_yesno.tpl       | 2 ++
 14 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/view/theme/frio/templates/field_checkbox.tpl b/view/theme/frio/templates/field_checkbox.tpl
index 787a82ebd..1fde3634a 100644
--- a/view/theme/frio/templates/field_checkbox.tpl
+++ b/view/theme/frio/templates/field_checkbox.tpl
@@ -4,6 +4,8 @@
 			<input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="1" {{if $field.2}}checked="checked"{{/if}} aria-checked="{{if $field.2}}true{{else}}false{{/if}}" aria-describedby="{{$field.0}}_tip" {{if $field.4}}{{$field.4}}{{/if}}>
 			<label for="id_{{$field.0}}">
 				{{$field.1}}
+				{{if $field.3}}
 				<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+				{{/if}}
 			</label>
-	</div>
\ No newline at end of file
+	</div>
diff --git a/view/theme/frio/templates/field_colorinput.tpl b/view/theme/frio/templates/field_colorinput.tpl
index 886d647e9..704db346d 100644
--- a/view/theme/frio/templates/field_colorinput.tpl
+++ b/view/theme/frio/templates/field_colorinput.tpl
@@ -6,6 +6,8 @@
 		{{if $field.4}}<span class="required">{{$field.4}}</span>{{/if}}
 		<span class="input-group-addon"><i></i></span>
 	</div>
-	<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
+	{{if $field.3}}
+	<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+	{{/if}}
 	<div id="end_{{$field.0}}" class="field_end"></div>
 </div>
diff --git a/view/theme/frio/templates/field_custom.tpl b/view/theme/frio/templates/field_custom.tpl
index 20f529278..158073a64 100644
--- a/view/theme/frio/templates/field_custom.tpl
+++ b/view/theme/frio/templates/field_custom.tpl
@@ -2,5 +2,7 @@
 <div class="form-group field custom">
 	<label for="{{$field.0}}">{{$field.1}}</label>
 	{{$field.2}}
-	<span class="help-block" id="{{$field.0}}_tip">{{$field.3}}</span>
+	{{if $field.3}}
+	<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+	{{/if}}
 </div>
diff --git a/view/theme/frio/templates/field_fileinput.tpl b/view/theme/frio/templates/field_fileinput.tpl
index 721a6535f..c5f8ac86d 100644
--- a/view/theme/frio/templates/field_fileinput.tpl
+++ b/view/theme/frio/templates/field_fileinput.tpl
@@ -6,6 +6,8 @@
 		{{if $field.4}}<span class="required">{{$field.4}}</span>{{/if}}
 		<span class="input-group-addon image-select"><i class="fa fa-picture-o"></i></span>
 	</div>
-	<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
+	{{if $field.3}}
+	<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+	{{/if}}
 	<div id="end_{{$field.0}}" class="field_end"></div>
 </div>
diff --git a/view/theme/frio/templates/field_input.tpl b/view/theme/frio/templates/field_input.tpl
index bbd7535e5..62a7d72e8 100644
--- a/view/theme/frio/templates/field_input.tpl
+++ b/view/theme/frio/templates/field_input.tpl
@@ -2,6 +2,8 @@
 <div id="id_{{$field.0}}_wrapper" class="form-group field input">
 	<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
 	<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|escape:'html'}}"{{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
-	<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
+	{{if $field.3}}
+	<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+	{{/if}}
 	<div class="clear"></div>
 </div>
diff --git a/view/theme/frio/templates/field_intcheckbox.tpl b/view/theme/frio/templates/field_intcheckbox.tpl
index 8863d14c4..f898c87fa 100644
--- a/view/theme/frio/templates/field_intcheckbox.tpl
+++ b/view/theme/frio/templates/field_intcheckbox.tpl
@@ -2,6 +2,8 @@
 	<div class="form-group field checkbox">
 		<input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3|escape:'html'}}" {{if $field.2}}checked="checked"{{/if}} aria-checked="{{if $field.2}}true{{else}}false{{/if}}" aria-describedby="{{$field.0}}_tip">
 		<label for="id_{{$field.0}}">{{$field.1}}</label>
-		<span class="help-block" role="tooltip" id="{{$field.0}}_tip">{{$field.4}}</span>
+		{{if $field.4}}
+		<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.4}}</span>
+		{{/if}}
 	</div>
 	<div class="clear"></div>
diff --git a/view/theme/frio/templates/field_openid.tpl b/view/theme/frio/templates/field_openid.tpl
index 8081f9cf1..66f8c9e80 100644
--- a/view/theme/frio/templates/field_openid.tpl
+++ b/view/theme/frio/templates/field_openid.tpl
@@ -2,6 +2,8 @@
 <div id="id_{{$field.0}}_wrapper" class="form-group field input openid">
 	<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}</label>
 	<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2|escape:'html'}}" aria-describedby="{{$field.0}}_tip">
-	<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
+	{{if $field.3}}
+	<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+	{{/if}}
 	<div class="clear"></div>
 </div>
diff --git a/view/theme/frio/templates/field_password.tpl b/view/theme/frio/templates/field_password.tpl
index 31defaf33..7bef420a1 100644
--- a/view/theme/frio/templates/field_password.tpl
+++ b/view/theme/frio/templates/field_password.tpl
@@ -2,6 +2,8 @@
 <div id="id_{{$field.0}}_wrapper" class="form-group field input password">
 	<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
 	<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="password" value="{{$field.2|escape:'html'}}" {{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
-	<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
+	{{if $field.3}}
+	<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+	{{/if}}
 	<div class="clear"></div>
 </div>
diff --git a/view/theme/frio/templates/field_radio.tpl b/view/theme/frio/templates/field_radio.tpl
index 42c145e3a..725e1c96a 100644
--- a/view/theme/frio/templates/field_radio.tpl
+++ b/view/theme/frio/templates/field_radio.tpl
@@ -4,7 +4,9 @@
 			<input type="radio" name="{{$field.0}}" id="id_{{$field.0}}_{{$field.2}}" value="{{$field.2}}" {{if $field.4}}checked{{/if}} aria-checked="{{if $field.4}}true{{else}}false{{/if}}" aria-describedby="{{$field.0}}_{{$field.2}}_tip">
 			<label for="id_{{$field.0}}_{{$field.2}}">
 				{{$field.1}}
+				{{if $field.3}}
 				<span class="help-block" id="{{$field.0}}_{{$field.2}}_tip" role="tooltip">{{$field.3}}</span>
+				{{/if}}
 			</label>
 		</div>
-	</div>
\ No newline at end of file
+	</div>
diff --git a/view/theme/frio/templates/field_select.tpl b/view/theme/frio/templates/field_select.tpl
index 9c0315121..594b91002 100644
--- a/view/theme/frio/templates/field_select.tpl
+++ b/view/theme/frio/templates/field_select.tpl
@@ -4,5 +4,7 @@
 		<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|escape:'html'}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
 		</select>
-		<span class="help-block" id="{{$field.0}}_tip">{{$field.3}}</span>
-</div>
\ No newline at end of file
+		{{if $field.3}}
+		<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+		{{/if}}
+</div>
diff --git a/view/theme/frio/templates/field_select_raw.tpl b/view/theme/frio/templates/field_select_raw.tpl
index d4f476860..52b63079c 100644
--- a/view/theme/frio/templates/field_select_raw.tpl
+++ b/view/theme/frio/templates/field_select_raw.tpl
@@ -4,5 +4,7 @@
 	<select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip">
 		{{$field.4}}
 	</select>
-	<span class="help-block" id="{{$field.0}}_tip">{{$field.3}}</span>
-</div>
\ No newline at end of file
+	{{if $field.3}}
+	<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+	{{/if}}
+</div>
diff --git a/view/theme/frio/templates/field_textarea.tpl b/view/theme/frio/templates/field_textarea.tpl
index 8ef56babb..1aea484de 100644
--- a/view/theme/frio/templates/field_textarea.tpl
+++ b/view/theme/frio/templates/field_textarea.tpl
@@ -2,6 +2,8 @@
 	<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>
-		<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+		{{/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 3b2cb780c..fc1f7243a 100644
--- a/view/theme/frio/templates/field_themeselect.tpl
+++ b/view/theme/frio/templates/field_themeselect.tpl
@@ -5,6 +5,8 @@
 	<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}}</span>
+	{{/if}}
 	{{if $field.5=="preview"}}<div id="theme-preview"></div>{{/if}}
-</div>
\ No newline at end of file
+</div>
diff --git a/view/theme/frio/templates/field_yesno.tpl b/view/theme/frio/templates/field_yesno.tpl
index 85096c70e..47649fe67 100644
--- a/view/theme/frio/templates/field_yesno.tpl
+++ b/view/theme/frio/templates/field_yesno.tpl
@@ -14,6 +14,8 @@
 				<span class="toggle-handle btn btn-default btn-xs"></span>
 			</div>
 		</div>
+		{{if $field.3}}
 		<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
+		{{/if}}
 	</div>
 	<div class="clear"></div>