Add form labels

Author: benmwebb

account/account/templates/logged_out.html

@@ -21,8 +21,8 @@ <h4>Login Page</h4>
   <table width="60%">
     <tr><td colspan="5"><hr width="100%" /></td></tr>
     <tr><td nowrap colspan="1">Sali Lab Web Server Login {{ help_link("account") }}</td></tr>
-    <tr><td width="20%" align="right" colspan="1">Username:</td> <td align="left" colspan="1"><input type="text" name="user_name"  size="10" maxlength="25" /></td> <td align="right" colspan="1"><input type="submit" name=".submit" value="Login" /></td></tr>
-    <tr><td align="right" colspan="1">Password:</td> <td align="left" colspan="1"><input type="password" name="password"  size="10" maxlength="25" /></td> <td align="right"><input type="reset" /></td></tr>
+    <tr><td width="20%" align="right" colspan="1"><label for="user_name">Username:</label></td> <td align="left" colspan="1"><input id="user_name" type="text" name="user_name"  size="10" maxlength="25" /></td> <td align="right" colspan="1"><input type="submit" name=".submit" value="Login" /></td></tr>
+    <tr><td align="right" colspan="1"><label for="password">Password:</label></td> <td align="left" colspan="1"><input id="password" type="password" name="password"  size="10" maxlength="25" /></td> <td align="right"><input type="reset" /></td></tr>
     <tr><td align="center" colspan="2"><label><input type="checkbox" name="permanent" value="on" checked="checked" />Check if you want to <span class="tooltip" title="If set, the logon cookie will expire after one year rather than at the end of your browser session.">log on permanently</span> on this computer</label></td></tr>
     <tr><td align="left" colspan="2"><br /> <a href="{{ url_for("reset") }}">Forgot Username or Password?</a></td></tr>
     <tr><td align="left" colspan="2"><br /> <a href="{{ url_for("register") }}">Create Account</a></td></tr>

account/account/templates/register.html

@@ -11,14 +11,14 @@ <h4>Account Setup</h4>
   <table>
     <tr><td colspan="5"><hr /></td></tr>
     <tr><th colspan="2">Create an Account {{ help_link("account") }}</th></tr>
-    <tr><td>Choose Username (max 25 characters):</td> <td><input type="text" name="user_name" value="{{ form.user_name }}" size="10" maxlength="25" /></td></tr>
-    <tr><td>Choose Password (min 8, max 25 characters):</td> <td><input type="password" name="password"  size="10" maxlength="25" /></td></tr>
-    <tr><td>Re-enter Password:</td> <td><input type="password" name="passwordcheck"  size="10" maxlength="25" /></td></tr>
-    <tr><td>First Name <input type="hidden" name="create" value="y"  /></td> <td><input type="text" name="first_name" value="{{ form.first_name }}" size="20" maxlength="40" /></td></tr>
-    <tr><td>Last Name</td> <td><input type="text" name="last_name" value="{{ form.last_name }}" size="20" maxlength="40" /></td></tr>
-    <tr><td>Institution</td> <td><input type="text" name="institution" value="{{ form.institution }}" size="20" maxlength="40" /></td></tr>
-    <tr><td><span class="tooltip" title="This will be used to notify you of completed jobs, and to reset your password if you forget it. It will not be used for any other purpose.">Email Address</span></td> <td><input type="text" name="email" value="{{ form.email }}" size="20" maxlength="40" /></td></tr>
-    <tr><td><a href="https://salilab.org/modeller/" title="If you have a MODELLER license key, you can save it here; it will be provided automatically to any web service that needs it.">MODELLER license key</a> (optional)</td> <td><input type="text" name="modeller_key" value="{{ form.modeller_key }}" size="20" maxlength="40" /></td></tr>
+    <tr><td><label for="user_name">Choose Username (max 25 characters):</label></td> <td><input id="user_name" type="text" name="user_name" value="{{ form.user_name }}" size="10" maxlength="25" /></td></tr>
+    <tr><td><label for="password">Choose Password (min 8, max 25 characters):</label></td> <td><input id="password" type="password" name="password"  size="10" maxlength="25" /></td></tr>
+    <tr><td><label for="passwordcheck">Re-enter Password:</label></td> <td><input id="passwordcheck" type="password" name="passwordcheck"  size="10" maxlength="25" /></td></tr>
+    <tr><td><label for="first_name">First Name</label> <input type="hidden" name="create" value="y"  /></td> <td><input id="first_name" type="text" name="first_name" value="{{ form.first_name }}" size="20" maxlength="40" /></td></tr>
+    <tr><td><label for="last_name">Last Name</label></td> <td><input id="last_name" type="text" name="last_name" value="{{ form.last_name }}" size="20" maxlength="40" /></td></tr>
+    <tr><td><label for="institution">Institution</label></td> <td><input id="institution" type="text" name="institution" value="{{ form.institution }}" size="20" maxlength="40" /></td></tr>
+    <tr><td><span class="tooltip" title="This will be used to notify you of completed jobs, and to reset your password if you forget it. It will not be used for any other purpose."><label for="email">Email Address</label></span></td> <td><input id="email" type="text" name="email" value="{{ form.email }}" size="20" maxlength="40" /></td></tr>
+    <tr><td><a href="https://salilab.org/modeller/" title="If you have a MODELLER license key, you can save it here; it will be provided automatically to any web service that needs it."><label for="modeller_key">MODELLER license key</label></a> (optional)</td> <td><input id="modeller_key" type="text" name="modeller_key" value="{{ form.modeller_key }}" size="20" maxlength="40" /></td></tr>
     <tr><td align="center" colspan="2"><div class=standout> <label><input type="checkbox" name="academic" value="on" {{ 'checked="checked"' if form.academic }} />I am a <span class="tooltip" title="Sali Lab web server accounts are currently only available for non-profit or academic users.">non-profit/academic user</span>
 	                and this server will be used solely for educational 
 	                purposes or for basic research intended to advance 

account/account/templates/reset.html

@@ -14,8 +14,8 @@ <h4>Password Reset</h4>
 <form method="post" enctype="multipart/form-data">
   <table>
     <tr>
-      <td>Email:</td>
-      <td><input type="text" name="email" size="10" /></td>
+      <td><label for="reset-email">Email:</label></td>
+      <td><input id="reset-email" type="text" name="email" size="10" /></td>
     </tr>
     <tr>
       <td><input type="submit" name=".submit" value="Send reset email" /></td>