From 7a60a8f1c1cdae295c4bb79d53a1d10b73fa5e42 Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Fri, 24 Mar 2017 06:11:55 +0000
Subject: [PATCH] Some WAI changes (#1111)

---
 .../site/htdocs/static/languages/en.json           |  2 +-
 .../site/templates/bootstrap/checklogins.tpl       |  8 ++++----
 .../site/templates/bootstrap/confirm.tpl           |  4 ++--
 .../site/templates/bootstrap/ext2fcheck.tpl        |  4 ++--
 .../site/templates/bootstrap/login.tpl             |  4 ++--
 .../site/templates/bootstrap/mail.tpl              | 14 +++++++-------
 .../site/templates/bootstrap/menu.tpl              |  4 ++--
 .../site/templates/bootstrap/openidform.tpl        |  2 +-
 .../site/templates/bootstrap/password.tpl          |  8 ++++----
 .../site/templates/bootstrap/register.tpl          | 12 ++++++------
 .../site/templates/bootstrap/standardform.tpl      |  6 +++---
 .../site/templates/bootstrap/yubikeyform.tpl       |  2 +-
 12 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/lemonldap-ng-portal/site/htdocs/static/languages/en.json b/lemonldap-ng-portal/site/htdocs/static/languages/en.json
index 70ef86c5d..a7afe7fb1 100644
--- a/lemonldap-ng-portal/site/htdocs/static/languages/en.json
+++ b/lemonldap-ng-portal/site/htdocs/static/languages/en.json
@@ -1,4 +1,4 @@
-{
+
 "PE0":"User authenticated",
 "PE1":"Your connection has expired, you must authenticate once again",
 "PE2":"User and password fields must be filled",
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/checklogins.tpl b/lemonldap-ng-portal/site/templates/bootstrap/checklogins.tpl
index a55721da0..dc594c952 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/checklogins.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/checklogins.tpl
@@ -2,20 +2,20 @@
     <TMPL_IF NAME="CHECK_LOGINS">
     <div class="form-group input-group">
       <span class="input-group-addon">
-        <input type="checkbox" id="checkLogins" name="checkLogins" <TMPL_IF NAME="ASK_LOGINS">checked</TMPL_IF> />
+        <input type="checkbox" id="checkLogins" name="checkLogins" aria-describedby="checkLoginsLabel" <TMPL_IF NAME="ASK_LOGINS">checked</TMPL_IF> />
       </span>
       <p class="form-control">
-        <span trspan="checkLastLogins">Check my last logins</span>
+        <label id="checkLoginsLabel" for="checkLogins" trspan="checkLastLogins">Check my last logins</label>
       </p>
     </div>
     </TMPL_IF>
     <TMPL_IF NAME="STAYCONNECTED">
     <div class="form-group input-group">
       <span class="input-group-addon">
-        <input type="checkbox" id="stayconnected" name="stayconnected" />
+        <input type="checkbox" id="stayconnected" name="stayconnected" aria-describedby="stayConnectedLabel" />
       </span>
       <p class="form-control">
-        <span trspan="stayConnected">Stay connected on this device</span>
+        <label id="stayConnectedLabel" for="stayconnected" trspan="stayConnected">Stay connected on this device</label>
       </p>
     </div>
     </TMPL_IF>
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/confirm.tpl b/lemonldap-ng-portal/site/templates/bootstrap/confirm.tpl
index 9ba0a81d0..d0abfe2bc 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/confirm.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/confirm.tpl
@@ -51,8 +51,8 @@
 
       <TMPL_IF NAME="REMEMBER">
       <div class="checkbox">
-        <label for="remember">
-          <input type="checkbox" id="remember" name="cookie_type" value="1">
+        <input type="checkbox" id="remember" name="cookie_type" value="1" aria-describedby="rememberlabel">
+        <label id="rememberlabel" for="remember">
           <span trspan="rememberChoice">Remember my choice</span>
         </label>
       </div>
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/ext2fcheck.tpl b/lemonldap-ng-portal/site/templates/bootstrap/ext2fcheck.tpl
index 1a18ee389..dd010f1f1 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/ext2fcheck.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/ext2fcheck.tpl
@@ -1,10 +1,10 @@
 <TMPL_INCLUDE NAME="header.tpl">
 
-<div class="message message-positive alert"><span trspan="enterExt2fCode"></span></div>
+<div class="message message-positive alert"><label for="extcode" id="extcodelabel" trspan="enterExt2fCode"></span></div>
 <form action="/ext2fcheck" method="post" class="password" role="form">
   <div class="form">
     <div class="form-group input-group">
-        <input name="code" value="" class="form-control">
+        <input name="code" value="" class="form-control" id="extcode" aria-describedby="extcodelabel">
         <input type="hidden" id="token" name="token" value="<TMPL_VAR NAME="TOKEN">">
     </div>
   </div>
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/login.tpl b/lemonldap-ng-portal/site/templates/bootstrap/login.tpl
index 13f62fedf..d3415894e 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/login.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/login.tpl
@@ -1,7 +1,7 @@
 <TMPL_INCLUDE NAME="header.tpl">
 
 
-  <div id="logincontent" class="container">
+<main id="logincontent" class="container">
 
   <TMPL_IF NAME="AUTH_ERROR">
   <div class="message message-<TMPL_VAR NAME="AUTH_ERROR_TYPE"> alert"><span trmsg="<TMPL_VAR NAME="AUTH_ERROR">"></span></div>
@@ -179,6 +179,6 @@
     </div>
   </TMPL_IF>
 
-  </div>
+</main>
 
 <TMPL_INCLUDE NAME="footer.tpl">
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl b/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
index 8f4488e35..757e4c2df 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/mail.tpl
@@ -31,7 +31,7 @@
     </div>
     <div class="form-group input-group">
       <span class="input-group-addon"><i class="glyphicon glyphicon-eye-open"></i> </span>
-      <input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" placeholder="Captcha" required />
+      <input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" trplaceholder="captcha" required />
     </div>
     </TMPL_IF>
     <TMPL_IF NAME="TOKEN">
@@ -70,9 +70,9 @@
 
 
       <div class="checkbox">
-        <label for="resendconfirmation">
-          <input id="resendconfirmation" type="checkbox" name="resendconfirmation">
-          <span trspan="confirmPwd">Yes, resend the mail</span>
+        <label>
+          <input id="resendconfirmation" type="checkbox" name="resendconfirmation" aria-describedby="resendconfirmationlabel">
+          <label for="resendconfirmation" id="resendconfirmationlabel" trspan="confirmPwd">Yes, resend the mail</label>
         </label>
       </div>
 
@@ -113,9 +113,9 @@
         </div>
 
         <div class="checkbox">
-          <label for="reset">
-            <input id="reset" type="checkbox" name="reset" />
-            <span trspan="generatePwd">Generate the password automatically</span>
+          <label>
+            <input id="reset" type="checkbox" name="reset" aria-describedby="resetlabel"/>
+            <label for="reset" id="resetlabel" trspan="generatePwd">Generate the password automatically</label>
           </label>
         </div>
 
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl b/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl
index e15ca0b54..f06c40d92 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/menu.tpl
@@ -1,6 +1,6 @@
 <TMPL_INCLUDE NAME="header.tpl">
 
-<div id="menucontent" class="container">
+<main id="menucontent" class="container">
 
   <TMPL_IF NAME="AUTH_ERROR">
   <div class="message message-<TMPL_VAR NAME="AUTH_ERROR_TYPE"> alert"><span trmsg="<TMPL_VAR NAME="AUTH_ERROR">"></span></div>
@@ -217,7 +217,7 @@
 
   </div>
 
-</div>
+</main>
 
 <TMPL_IF NAME="PING">
 <!-- Keep session alive -->
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/openidform.tpl b/lemonldap-ng-portal/site/templates/bootstrap/openidform.tpl
index 53fe9578b..6a1dc2ac1 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/openidform.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/openidform.tpl
@@ -1,7 +1,7 @@
 <div class="form">
   <div class="form-group input-group">
     <span class="input-group-addon"><i class="glyphicon glyphicon-link"></i> </span>
-    <input name="openid_identifier" type="text" class="form-control" trplaceholder="enterOpenIDLogin" />
+    <input name="openid_identifier" type="text" class="form-control" trplaceholder="enterOpenIDLogin" aria-required="true"/>
   </div>
 
   <TMPL_INCLUDE NAME="checklogins.tpl">
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/password.tpl b/lemonldap-ng-portal/site/templates/bootstrap/password.tpl
index 6d19a36e2..37b98ca3b 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/password.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/password.tpl
@@ -22,11 +22,11 @@
     <TMPL_IF NAME="REQUIRE_OLDPASSWORD">
 
       <TMPL_IF NAME="HIDE_OLDPASSWORD">
-        <input name="oldpassword" type="hidden" value="<TMPL_VAR NAME=OLDPASSWORD>">
+        <input name="oldpassword" type="hidden" value="<TMPL_VAR NAME=OLDPASSWORD>" aria-required="true">
       <TMPL_ELSE>
         <div class="form-group input-group">
           <span class="input-group-addon"><i class="glyphicon glyphicon-lock"></i> </span>
-          <input name="oldpassword" type="password" value="<TMPL_VAR NAME=OLDPASSWORD>" class="form-control" trplaceholder="currentPwd" required/>
+          <input name="oldpassword" type="password" value="<TMPL_VAR NAME=OLDPASSWORD>" class="form-control" trplaceholder="currentPwd" required/ aria-required="true">
         </div>
       </TMPL_IF>
 
@@ -34,11 +34,11 @@
 
     <div class="form-group input-group">
       <span class="input-group-addon"><i class="glyphicon glyphicon-lock"></i> </span>
-      <input name="newpassword" type="password" class="form-control" trplaceholder="newPassword" required />
+      <input name="newpassword" type="password" class="form-control" trplaceholder="newPassword" required aria-required="true"/>
     </div>
     <div class="form-group input-group">
       <span class="input-group-addon"><i class="glyphicon glyphicon-lock"></i> </span>
-      <input name="confirmpassword" type="password" class="form-control" trplaceholder="confirmPwd" required/>
+      <input name="confirmpassword" type="password" class="form-control" trplaceholder="confirmPwd" required aria-required="true"/>
     </div>
 
     <button type="submit" class="btn btn-success" >
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/register.tpl b/lemonldap-ng-portal/site/templates/bootstrap/register.tpl
index 8e35505f8..09b430cc3 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/register.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/register.tpl
@@ -20,17 +20,17 @@
 
     <div class="form-group input-group">
       <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i> </span>
-      <input name="firstname" type="text" value="<TMPL_VAR NAME="FIRSTNAME">" class="form-control" trplaceholder="firstName" required />
+      <input name="firstname" type="text" value="<TMPL_VAR NAME="FIRSTNAME">" class="form-control" trplaceholder="firstName" required aria-required="true"/>
     </div>
 
     <div class="form-group input-group">
       <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i> </span>
-      <input name="lastname" type="text" value="<TMPL_VAR NAME="LASTNAME">" class="form-control" trplaceholder="lastName" required />
+      <input name="lastname" type="text" value="<TMPL_VAR NAME="LASTNAME">" class="form-control" trplaceholder="lastName" required aria-required="true"/>
     </div>
 
     <div class="form-group input-group">
       <span class="input-group-addon"><i class="glyphicon glyphicon-envelope"></i> </span>
-      <input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" trplaceholder="mail" required />
+      <input name="mail" type="text" value="<TMPL_VAR NAME="MAIL">" class="form-control" trplaceholder="mail" required aria-required="true"/>
     </div>
 
     <TMPL_IF NAME=CAPTCHA_SRC>
@@ -39,7 +39,7 @@
     </div>
     <div class="form-group input-group">
       <span class="input-group-addon"><i class="glyphicon glyphicon-eye-open"></i> </span>
-      <input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" placeholder="Captcha" required />
+      <input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" placeholder="Captcha" required aria-required="true"/>
     </div>
     </TMPL_IF>
     <TMPL_IF NAME="TOKEN">
@@ -85,8 +85,8 @@
 
       <div class="checkbox">
         <label for="resendconfirmation">
-          <input id="resendconfirmation" type="checkbox" name="resendconfirmation">
-          <span trspan="yesResendMail">Yes, resend the mail</span>
+          <input id="resendconfirmation" type="checkbox" name="resendconfirmation" ariadescribedby="resendconfirmationlabel">
+          <label id="resendconfirmationlabel" for="resendconfirmation" trspan="yesResendMail">Yes, resend the mail</label>
         </label>
       </div>
 
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl b/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
index 9e703a86c..d7aac2278 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/standardform.tpl
@@ -1,12 +1,12 @@
 <div class="form">
   <div class="form-group input-group">
     <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i> </span>
-    <input name="user" type="text" class="form-control" value="<TMPL_VAR NAME="LOGIN">" trplaceholder="login" required />
+    <input name="user" type="text" class="form-control" value="<TMPL_VAR NAME="LOGIN">" trplaceholder="login" required aria-required="true"/>
   </div>
 
   <div class="form-group input-group">
     <span class="input-group-addon"><i class="glyphicon glyphicon-lock"></i> </span>
-    <input name="password" type="password" class="form-control" trplaceholder="password" required />
+    <input name="password" type="password" class="form-control" trplaceholder="password" required aria-required="true"/>
   </div>
 
   <TMPL_IF NAME=CAPTCHA_SRC>
@@ -15,7 +15,7 @@
   </div>
   <div class="form-group input-group">
     <span class="input-group-addon"><i class="glyphicon glyphicon-eye-open"></i> </span>
-    <input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" placeholder="Captcha" required />
+    <input type="text" name="captcha" size="<TMPL_VAR NAME=CAPTCHA_SIZE>" class="form-control" trplaceholder="captcha" required aria-required="true"/>
   </div>
   </TMPL_IF>
   <TMPL_IF NAME="TOKEN">
diff --git a/lemonldap-ng-portal/site/templates/bootstrap/yubikeyform.tpl b/lemonldap-ng-portal/site/templates/bootstrap/yubikeyform.tpl
index 61bdf0445..9f134a852 100644
--- a/lemonldap-ng-portal/site/templates/bootstrap/yubikeyform.tpl
+++ b/lemonldap-ng-portal/site/templates/bootstrap/yubikeyform.tpl
@@ -1,7 +1,7 @@
 <div class="form">
   <div class="form-group input-group">
     <span class="input-group-addon"><i class="glyphicon glyphicon-chevron-right"></i> </span>
-    <input name="yubikeyOTP" type="text" class="form-control" trplaceholder="enterYubikey" />
+    <input name="yubikeyOTP" type="text" class="form-control" trplaceholder="enterYubikey" aria-required="true"/>
   </div>
 
   <TMPL_INCLUDE NAME="checklogins.tpl">