Changeset 550:bbc82fcbee20

Timestamp:

07/10/11 08:32:41 (14 years ago)

Author:

kozlika

Branch:

default

Message:

Accessibility. Closes #1219

Location:

admin

Files:

• auth.php (modified) (5 diffs)
• style/default.css (modified) (1 diff)

admin/auth.php

@@ -334 +334 @@
      echo
      '<fieldset><legend>'.__('Request a new password').'</legend>'.
-     '<p><label for="user_id">'.__('Username:').' '.
-     form::field(array('user_id','user_id'),20,32,html::escapeHTML($user_id)).'</label></p>'.
-     
-     '<p><label for="user_email">'.__('Email:').' '.
-     form::field(array('user_email','user_email'),20,255,html::escapeHTML($user_email)).'</label></p>'.
+     '<p><label for="user_id">'.__('Username:').'</label> '.
+     form::field(array('user_id','user_id'),20,32,html::escapeHTML($user_id)).'</p>'.
+     
+     '<p><label for="user_email">'.__('Email:').'</label> '.
+     form::field(array('user_email','user_email'),20,255,html::escapeHTML($user_email)).'</p>'.
      
      '<p><input type="submit" value="'.__('recover').'" />'.
@@ -351 +351 @@
      echo
      '<fieldset><legend>'.__('Change your password').'</legend>'.
-     '<p><label for="new_pwd">'.__('New password:').' '.
-     form::password(array('new_pwd','new_pwd'),20,255).'</label></p>'.
-     
-     '<p><label for="new_pwd_c">'.__('Confirm password:').' '.
-     form::password(array('new_pwd_c','new_pwd_c'),20,255).'</label></p>'.
+     '<p><label for="new_pwd">'.__('New password:').'</label> '.
+     form::password(array('new_pwd','new_pwd'),20,255).'</p>'.
+     
+     '<p><label for="new_pwd_c">'.__('Confirm password:').'</label> '.
+     form::password(array('new_pwd_c','new_pwd_c'),20,255).'</p>'.
      '</fielset>'.
      
@@ -369 +369 @@
      else
      {
-          echo
-          '<fieldset>';
           if ($safe_mode) {
+               echo '<fieldset>';
                echo '<legend>'.__('Safe mode login').'</legend>';
                echo 
@@ -380 +379 @@
           }
           else {
-               echo '<legend>'.__('Connection').'</legend>';
+               echo '<div class="fieldset">';
           }
 
           echo
-          '<p><label for="user_id">'.__('Username:').' '.
-          form::field(array('user_id','user_id'),20,32,html::escapeHTML($user_id)).'</label></p>'.
-          
-          '<p><label for="user_pwd">'.__('Password:').' '.
-          form::password(array('user_pwd','user_pwd'),20,255).'</label></p>'.
-          
-          '<p><label for="user_remember" class="classic">'.
-          form::checkbox(array('user_remember','user_remember'),1).' '.
+          '<p><label for="user_id">'.__('Username:').'</label> '.
+          form::field(array('user_id','user_id'),20,32,html::escapeHTML($user_id)).'</p>'.
+          
+          '<p><label for="user_pwd">'.__('Password:').'</label> '.
+          form::password(array('user_pwd','user_pwd'),20,255).'</p>'.
+          
+          '<p>'.
+          form::checkbox(array('user_remember','user_remember'),1).
+          '<label for="user_remember" class="classic">'.
           __('Remember my ID on this computer').'</label></p>'.
           
@@ -400 +400 @@
           }
           if($safe_mode) {
-               echo form::hidden('safe_mode',1);
-          }
-          
+               echo 
+               form::hidden('safe_mode',1).
+               '</fieldset>';
+          }
+          else {
+               echo '</div>';
+          }
           echo
-          '</fieldset>'.
           '<p id="cookie_help" class="error">'.__('You must accept cookies in order to use the private area.').'</p>';
 

admin/style/default.css

@@ -372 +372 @@
      margin-left: .5em;
 }
-#login-screen fieldset {
+#login-screen fieldset, #login-screen .fieldset {
      border: 1px solid #999;
      padding: 1em 1em 0 1em;