Changeset 1399:cdf556efc5ea for admin/install

Timestamp:

08/16/13 14:16:11 (12 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

default

Message:

Semantic xhtml and a11y. Let labels to be labels. Step One: admin. Plugins and Themes will come later.

Location:

admin/install

Files:

• index.php (modified) (1 diff)
• wizard.php (modified) (1 diff)

admin/install/index.php

@@ -320 +320 @@
      '<form action="index.php" method="post">'.
      '<fieldset><legend>'.__('User information').'</legend>'.
-     '<p><label for="u_firstname">'.__('First Name:').' '.
-     form::field('u_firstname',30,255,html::escapeHTML($u_firstname)).'</label></p>'.
-     '<p><label for="u_name">'.__('Last Name:').' '.
-     form::field('u_name',30,255,html::escapeHTML($u_name)).'</label></p>'.
-     '<p><label for="u_email">'.__('Email:').' '.
-     form::field('u_email',30,255,html::escapeHTML($u_email)).'</label></p>'.
+     '<p><label for="u_firstname">'.__('First Name:').'</label> '.
+     form::field('u_firstname',30,255,html::escapeHTML($u_firstname)).'</p>'.
+     '<p><label for="u_name">'.__('Last Name:').'</label> '.
+     form::field('u_name',30,255,html::escapeHTML($u_name)).'</p>'.
+     '<p><label for="u_email">'.__('Email:').'</label> '.
+     form::field('u_email',30,255,html::escapeHTML($u_email)).'</p>'.
      '</fieldset>'.
      
      '<fieldset><legend>'.__('Username and password').'</legend>'.
-     '<p><label for="u_login" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Username:').' '.
-     form::field('u_login',30,32,html::escapeHTML($u_login)).'</label></p>'.
-     '<p><label for="u_pwd" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Password:').' '.
-     form::password('u_pwd',30,255).'</label></p>'.
-     '<p><label for="u_pwd2" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Confirm password:').' '.
-     form::password('u_pwd2',30,255).'</label></p>'.
+     '<p><label for="u_login" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Username:').'</label> '.
+     form::field('u_login',30,32,html::escapeHTML($u_login)).'</p>'.
+     '<p><label for="u_pwd" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Password:').'</label> '.
+     form::password('u_pwd',30,255).'</p>'.
+     '<p><label for="u_pwd2" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Confirm password:').'</label> '.
+     form::password('u_pwd2',30,255).'</p>'.
      '</fieldset>'.
      

admin/install/wizard.php

@@ -178 +178 @@
 
 '<form action="wizard.php" method="post">'.
-'<p><label class="required" for="DBDRIVER"><abbr title="'.__('Required field').'">*</abbr> '.__('Database type:').' '.
-form::combo('DBDRIVER',array('MySQL'=>'mysql','PostgreSQL'=>'pgsql'),$DBDRIVER).'</label></p>'.
-'<p><label for="DBHOST">'.__('Database Host Name:').' '.
-form::field('DBHOST',30,255,html::escapeHTML($DBHOST)).'</label></p>'.
-'<p><label for="DBNAME">'.__('Database Name:').' '.
-form::field('DBNAME',30,255,html::escapeHTML($DBNAME)).'</label></p>'.
-'<p><label for="DBUSER">'.__('Database User Name:').' '.
-form::field('DBUSER',30,255,html::escapeHTML($DBUSER)).'</label></p>'.
-'<p><label for="DBPASSWORD">'.__('Database Password:').' '.
-form::password('DBPASSWORD',30,255).'</label></p>'.
-'<p><label for="DBPREFIX" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Database Tables Prefix:').' '.
-form::field('DBPREFIX',30,255,html::escapeHTML($DBPREFIX)).'</label></p>'.
+'<p><label class="required" for="DBDRIVER"><abbr title="'.__('Required field').'">*</abbr> '.__('Database type:').'</label> '.
+form::combo('DBDRIVER',array('MySQL'=>'mysql','PostgreSQL'=>'pgsql'),$DBDRIVER).'</p>'.
+'<p><label for="DBHOST">'.__('Database Host Name:').'</label> '.
+form::field('DBHOST',30,255,html::escapeHTML($DBHOST)).'</p>'.
+'<p><label for="DBNAME">'.__('Database Name:').'</label> '.
+form::field('DBNAME',30,255,html::escapeHTML($DBNAME)).'</p>'.
+'<p><label for="DBUSER">'.__('Database User Name:').'</label> '.
+form::field('DBUSER',30,255,html::escapeHTML($DBUSER)).'</p>'.
+'<p><label for="DBPASSWORD">'.__('Database Password:').'</label> '.
+form::password('DBPASSWORD',30,255).'</p>'.
+'<p><label for="DBPREFIX" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Database Tables Prefix:').'</label> '.
+form::field('DBPREFIX',30,255,html::escapeHTML($DBPREFIX)).'</p>'.
 
 '<p><input type="submit" value="'.__('Continue').'" /></p>'.