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.

diff --git a/view/theme/frio/templates/field_checkbox.tpl b/view/theme/frio/templates/field_checkbox.tpl
index 787a82ebdcd14f7d3bbf7c3cb7973070b76148cf..1fde3634abebe8433a1f36f3fa08720026052dd7 100644 (file)
--- 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 886d647e9cf1cdae1e0fa0f2c7eac2beaed4677a..704db346d265e66fba1f6a2f9ab1fd548da90d8d 100644 (file)
--- 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 20f529278d2228ab62d5bf80a3fe5a54dc8e8c56..158073a64e88bcc5a217fb5eb3e77f683fc7bcd4 100644 (file)
--- 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 721a6535fbb6f501fbcc2d9d73bab8ad6aa5109a..c5f8ac86d2e5a00833c88ff8d0de40f22c80850a 100644 (file)
--- 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 bbd7535e54fef0cb3badbe5eb01748a67af20457..62a7d72e83387ac70466414fdb34f860707ecb23 100644 (file)
--- 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 8863d14c4d794cc5621c14499a878a0ab984039d..f898c87faf0001b5a81035afafd2db179492559c 100644 (file)
--- 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 8081f9cf110f2a374b2b3d73c1ca478925429dec..66f8c9e80927c1dedc91b4c510594011b24ab306 100644 (file)
--- 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 31defaf33c31470deb4a9cf83d1ab3cc0a4d6350..7bef420a18aea32fbdb187d8eef47cf4d43f3f0b 100644 (file)
--- 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 42c145e3a89ee3b701ff38fe3dccb2c8c97ac6a7..725e1c96aff8926a77f43c7c02f27d34761964ef 100644 (file)
--- 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 9c03151214da869a42ff5e96b2ac637470777b93..594b91002efa5e246f783772ec538c106f9c6ed6 100644 (file)
--- 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 d4f4768603b3992f04795185902db0d5f3cfbb82..52b63079c1a2db07f09285fbc16181d25847be19 100644 (file)
--- 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 8ef56babb78c3b061367e11e9a9564f87b60b7b2..1aea484de786fe3a9cb530789692689270e0044e 100644 (file)
--- 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 3b2cb780c89193a0d21b9fdfaa63736d685f516b..fc1f7243af55cb5576d3a88c64c2567630bb877c 100644 (file)
--- 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 85096c70e3b44835fe5ae79aa8aea23b0c7e86cd..47649fe676b6cc28695da3b2f08e0f1a45a7c11f 100644 (file)
--- 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>