added aria describedby elements refering to field help to the input templates

diff --git a/view/templates/field_checkbox.tpl b/view/templates/field_checkbox.tpl
index e476c07d722978696c5d7efafc5f1872abdfd5b8..06796376b60a5f4d52f2c94de7f1d5cbe1f77f1c 100644 (file)
--- a/view/templates/field_checkbox.tpl
+++ b/view/templates/field_checkbox.tpl
@@ -1,5 +1,5 @@
        <div class='field checkbox' id='div_id_{{$field.0}}'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}>
-               <span class='field_help'>{{$field.3}}</span>
+               <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip' value="1" {{if $field.2}}checked="checked"{{/if}}>
+               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
        </div>

diff --git a/view/templates/field_combobox.tpl b/view/templates/field_combobox.tpl
index a2f7c3f27e9a52d6aeb9dbd5cf9808df0e6f1fb7..45865501662a7d1e1ba7e6a5347659eaaca0339c 100644 (file)
--- a/view/templates/field_combobox.tpl
+++ b/view/templates/field_combobox.tpl
@@ -7,12 +7,12 @@
                   {{foreach $field.4 as $opt=>$val}}<option value="{{$val|escape:'html'}}">{{/foreach}}
                </datalist> *}}
                
-               <input id="id_{{$field.0}}" type="text" value="{{$field.2}}">
+               <input id="id_{{$field.0}}" type="text" value="{{$field.2}}" aria-describedby='{{$field.0}}_tip'>
                <select id="select_{{$field.0}}" onChange="$('#id_{{$field.0}}').val($(this).val())">
                        <option value="">{{$field.5}}</option>
                        {{foreach $field.4 as $opt=>$val}}<option value="{{$val|escape:'html'}}">{{$val}}</option>{{/foreach}}
                </select>
                
-               <span class='field_help'>{{$field.3}}</span>
+               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
        </div>
 

diff --git a/view/templates/field_input.tpl b/view/templates/field_input.tpl
index 6a3328c5cc28dafe2dde8fba89d1baa6ba1d1bf7..8db8e545f34644531821b9744875923003bf2c04 100644 (file)
--- a/view/templates/field_input.tpl
+++ b/view/templates/field_input.tpl
@@ -1,6 +1,6 @@
        
        <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'{{/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{{/if}}>
-               <span class='field_help'>{{$field.3}}</span>
+               <input{{if $field.6 eq 'email'}} type='email'{{elseif $field.6 eq 'url'}} type='url'{{/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{{/if}} aria-describedby='{{$field.0}}_tip'>
+               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
        </div>

diff --git a/view/templates/field_intcheckbox.tpl b/view/templates/field_intcheckbox.tpl
index 2f3c27d920cb860649e01ca4b7980920b02d3ae1..73bdf604170085b9c404cec81d11d65d9ae4cf1d 100644 (file)
--- a/view/templates/field_intcheckbox.tpl
+++ b/view/templates/field_intcheckbox.tpl
@@ -2,6 +2,6 @@
        
        <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}}>
-               <span class='field_help'>{{$field.4}}</span>
+               <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'>
+               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.4}}</span>
        </div>

diff --git a/view/templates/field_openid.tpl b/view/templates/field_openid.tpl
index e5f236c6791a08a475e0323ffbb8fb4fec67eba6..25773189f88bb8973914c350c2062a03f6bbfd6e 100644 (file)
--- a/view/templates/field_openid.tpl
+++ b/view/templates/field_openid.tpl
@@ -1,6 +1,6 @@
        
        <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}}' value="{{$field.2|escape:'html'}}">
-               <span class='field_help'>{{$field.3}}</span>
+               <input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}" aria-describedby='{{$field.0}}_tip'>
+               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
        </div>

diff --git a/view/templates/field_password.tpl b/view/templates/field_password.tpl
index 8a9f0dc330e89ddf8fdb4609268b0dbc3851fd55..333ce67c3839ff6cbea8dcfd6cbc185502bfbcda 100644 (file)
--- a/view/templates/field_password.tpl
+++ b/view/templates/field_password.tpl
@@ -1,6 +1,6 @@
        
        <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}}>
-               <span class='field_help'>{{$field.3}}</span>
+               <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'>
+               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
        </div>

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

diff --git a/view/templates/field_richtext.tpl b/view/templates/field_richtext.tpl
index f0ea50b58b88d03a6cf6a73039fa48c968103e70..67553bb95a2bca3460d02767c7dd4bf4aefc0342 100644 (file)
--- a/view/templates/field_richtext.tpl
+++ b/view/templates/field_richtext.tpl
@@ -2,6 +2,6 @@
        
        <div class='field richtext'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext">{{$field.2}}</textarea>
-               <span class='field_help'>{{$field.3}}</span>
+               <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>
        </div>

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

diff --git a/view/templates/field_select_raw.tpl b/view/templates/field_select_raw.tpl
index 02308e2f4b70c0b60b59d7989d8533a8337e6f13..4c826a042749e593ec685a9af94bfa035c7daf16 100644 (file)
--- a/view/templates/field_select_raw.tpl
+++ b/view/templates/field_select_raw.tpl
@@ -2,8 +2,8 @@
        
        <div class='field select'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <select name='{{$field.0}}' id='id_{{$field.0}}'>
+               <select name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>
                        {{$field.4}}
                </select>
-               <span class='field_help'>{{$field.3}}</span>
+               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
        </div>

diff --git a/view/templates/field_textarea.tpl b/view/templates/field_textarea.tpl
index 29d3b7a7c6f7672bd286b0741d0e26729e72472a..c37537d6ec57a21bffe900ff4e92be1ea16da799 100644 (file)
--- a/view/templates/field_textarea.tpl
+++ b/view/templates/field_textarea.tpl
@@ -2,6 +2,6 @@
        
        <div class='field textarea'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <textarea name='{{$field.0}}' id='id_{{$field.0}}'>{{$field.2}}</textarea>
-               <span class='field_help'>{{$field.3}}</span>
+               <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>
        </div>

diff --git a/view/templates/field_themeselect.tpl b/view/templates/field_themeselect.tpl
index edd25dbe0f8cc77a66b2410d9f48fa55f8a3d60b..51f6057ae3b25c2de05acfc98f4a6930230ed128 100644 (file)
--- a/view/templates/field_themeselect.tpl
+++ b/view/templates/field_themeselect.tpl
@@ -2,9 +2,9 @@
        {{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}} >
+               <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'>{{$field.3}}</span>
+               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
                {{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 de70c5ae6dccdfc967500b51f025d72a2d529963..155d0488b32563a606ce805b2a3166d8a73efd3e 100644 (file)
--- a/view/templates/field_yesno.tpl
+++ b/view/templates/field_yesno.tpl
@@ -2,7 +2,7 @@
        <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|escape:'html'}}">
+                       <input  type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}" aria-describedby='{{$field.0}}_tip'>
                        <a href="#" class='off'>
                                {{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
                        </a>
@@ -10,5 +10,5 @@
                                {{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
                        </a>
                </div>
-               <span class='field_help'>{{$field.3}}</span>
+               <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
        </div>

diff --git a/view/templates/login.tpl b/view/templates/login.tpl
index 37d105c087b0c53367ee7dd6d3d81970c9dc3201..caa2e74a4bce134540ed6870e5ac720bf96b92bc 100644 (file)
--- a/view/templates/login.tpl
+++ b/view/templates/login.tpl
@@ -1,6 +1,7 @@
 
 
 <form action="{{$dest_url}}" method="post" >
+<fieldset>
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
@@ -29,7 +30,7 @@
                <input type="hidden" name="{{$k}}" value="{{$v|escape:'html'}}" />
        {{/foreach}}
        
-       
+</fieldset>
 </form>