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/templates/field_checkbox.tpl b/view/templates/field_checkbox.tpl
index b66cced8767f0c778ec01a47ccd385892d5cc615..8275d4595ded2734fe038bab7db3d7d8c3e52464 100644 (file)
--- a/view/templates/field_checkbox.tpl
+++ b/view/templates/field_checkbox.tpl
@@ -1,6 +1,8 @@
        <div class="field checkbox" id="div_id_{{$field.0}}">
-               <label for="id_{{$field.0}}">{{$field.1}}</label>
+               <label id="id_{{$field.0}}_label" for="id_{{$field.0}}">{{$field.1}}</label>
                <input type="hidden" name="{{$field.0}}" value="0">
                <input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip" value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.4}}{{$field.4}}{{/if}}>
+               {{if $field.3}}
                <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               {{/if}}
        </div>

diff --git a/view/templates/field_combobox.tpl b/view/templates/field_combobox.tpl
index 45865501662a7d1e1ba7e6a5347659eaaca0339c..876e607cdfef9958c6f48acfe2442be10bda180e 100644 (file)
--- a/view/templates/field_combobox.tpl
+++ b/view/templates/field_combobox.tpl
@@ -13,6 +13,8 @@
                        {{foreach $field.4 as $opt=>$val}}<option value="{{$val|escape:'html'}}">{{$val}}</option>{{/foreach}}
                </select>
                
-               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+               {{if $field.3}}
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               {{/if}}
        </div>
 

diff --git a/view/templates/field_custom.tpl b/view/templates/field_custom.tpl
index 0b09284023781f4525b3ef562ad360678e046816..6649b0ff94e1c334b5138c88ae801d4e00d0cc20 100644 (file)
--- a/view/templates/field_custom.tpl
+++ b/view/templates/field_custom.tpl
@@ -3,5 +3,7 @@
        <div class='field custom'>
                <label for='{{$field.0}}'>{{$field.1}}</label>
                {{$field.2}}
-               <span class='field_help'>{{$field.3}}</span>
+               {{if $field.3}}
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               {{/if}}
        </div>

diff --git a/view/templates/field_input.tpl b/view/templates/field_input.tpl
index 495493f2fdf83cb864ebf60b874db3717d35c185..850656bb8c8f0da0cc8a814f2bdcfc2839737efe 100644 (file)
--- a/view/templates/field_input.tpl
+++ b/view/templates/field_input.tpl
@@ -2,5 +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|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'>
+               {{if $field.3}}
                <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+               {{/if}}
        </div>

diff --git a/view/templates/field_intcheckbox.tpl b/view/templates/field_intcheckbox.tpl
index 73bdf604170085b9c404cec81d11d65d9ae4cf1d..9c5f04e796d6ddeefc403e4622dc289f66b6a597 100644 (file)
--- a/view/templates/field_intcheckbox.tpl
+++ b/view/templates/field_intcheckbox.tpl
@@ -3,5 +3,7 @@
        <div class='field checkbox'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
                <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3|escape:'html'}}" {{if $field.2}}checked="true"{{/if}} aria-describedby='{{$field.0}}_tip'>
+               {{if $field.4}}
                <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.4}}</span>
+               {{/if}}
        </div>

diff --git a/view/templates/field_openid.tpl b/view/templates/field_openid.tpl
index 062ac6ac6eb19b4bd9941daf5ef6a4d8184d2174..9a18bbc13c3cb02a9659090be948e5364ea1ae55 100644 (file)
--- a/view/templates/field_openid.tpl
+++ b/view/templates/field_openid.tpl
@@ -2,5 +2,7 @@
        <div class='field input openid' id='wrapper_{{$field.0}}'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
                <input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2|escape:'html'}}" aria-describedby='{{$field.0}}_tip'>
-               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+               {{if $field.3}}
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               {{/if}}
        </div>

diff --git a/view/templates/field_password.tpl b/view/templates/field_password.tpl
index 333ce67c3839ff6cbea8dcfd6cbc185502bfbcda..4b4d4f2b2e3a5905390007ad63fdfed33ec0d571 100644 (file)
--- a/view/templates/field_password.tpl
+++ b/view/templates/field_password.tpl
@@ -2,5 +2,7 @@
        <div class='field password' id='wrapper_{{$field.0}}'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
                <input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq 'autofocus'}} autofocus{{/if}} aria-describedby='{{$field.0}}_tip'>
+               {{if $field.3}}
                <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+               {{/if}}
        </div>

diff --git a/view/templates/field_radio.tpl b/view/templates/field_radio.tpl
index 6b880ed9975097f469cc488cedcd1ef7268eb5cc..1e1d8e0b10c129131380e846a7eca61ef2421bba 100644 (file)
--- a/view/templates/field_radio.tpl
+++ b/view/templates/field_radio.tpl
@@ -1,5 +1,7 @@
        <div class='field radio'>
                <label for='id_{{$field.0}}_{{$field.2}}'>{{$field.1}}</label>
                <input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2|escape:'html'}}" {{if $field.4}}checked{{/if}} aria-describedby={{$field.0}}_{{$field.2}}_tip'>
+               {{if $field.3}}
                <span class='field_help' role='tooltip' id='{{$field.0}}_{{$field.2}}_tip'>{{$field.3}}</span>
+               {{/if}}
        </div>

diff --git a/view/templates/field_richtext.tpl b/view/templates/field_richtext.tpl
index 67553bb95a2bca3460d02767c7dd4bf4aefc0342..bc346ddb0b86d3671d2da984c007392acc3da162 100644 (file)
--- a/view/templates/field_richtext.tpl
+++ b/view/templates/field_richtext.tpl
@@ -3,5 +3,7 @@
        <div class='field richtext'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
                <textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext" aria-describedby='{{$field.0}}_tip'>{{$field.2}}</textarea>
-               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+               {{if $field.3}}
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               {{/if}}
        </div>

diff --git a/view/templates/field_select.tpl b/view/templates/field_select.tpl
index 2d037439df6b644dc92a7e10af58109beff6566c..87a2ab9ff8eb6fedbd2ab8a99c01e69963689c71 100644 (file)
--- a/view/templates/field_select.tpl
+++ b/view/templates/field_select.tpl
@@ -5,5 +5,7 @@
                <select name='{{$field.0}}' id='id_{{$field.0}}' 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='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+               {{if $field.3}}
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               {{/if}}
        </div>

diff --git a/view/templates/field_select_raw.tpl b/view/templates/field_select_raw.tpl
index 4c826a042749e593ec685a9af94bfa035c7daf16..147c028eff36f82c3256746e5f06e19f777cbd56 100644 (file)
--- a/view/templates/field_select_raw.tpl
+++ b/view/templates/field_select_raw.tpl
@@ -5,5 +5,7 @@
                <select name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>
                        {{$field.4}}
                </select>
-               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+               {{if $field.3}}
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               {{/if}}
        </div>

diff --git a/view/templates/field_textarea.tpl b/view/templates/field_textarea.tpl
index c37537d6ec57a21bffe900ff4e92be1ea16da799..60594a26667a0bdd36b9e447ef4db86ef518bea8 100644 (file)
--- a/view/templates/field_textarea.tpl
+++ b/view/templates/field_textarea.tpl
@@ -3,5 +3,7 @@
        <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>
-               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+               {{if $field.3}}
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               {{/if}}
        </div>

diff --git a/view/templates/field_themeselect.tpl b/view/templates/field_themeselect.tpl
index 51f6057ae3b25c2de05acfc98f4a6930230ed128..5f56c187ef957df5a4a253cbe233645612a34379 100644 (file)
--- a/view/templates/field_themeselect.tpl
+++ b/view/templates/field_themeselect.tpl
@@ -5,6 +5,8 @@
                <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|escape:'html'}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
                </select>
-               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+               {{if $field.3}}
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               {{/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 155d0488b32563a606ce805b2a3166d8a73efd3e..7e7c3cc4eea64f683cf1692058f02d0a5a093cdf 100644 (file)
--- a/view/templates/field_yesno.tpl
+++ b/view/templates/field_yesno.tpl
@@ -10,5 +10,7 @@
                                {{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
                        </a>
                </div>
-               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+               {{if $field.3}}
+               <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+               {{/if}}
        </div>