Ticket #6859: wp-6859-7.diff

File wp-6859-7.diff, 66.2 KB (added by MarcoZ, 5 years ago)

Update to trunk, resolve conflict in wp-admin/wp-admin.css. Otherwise unchanged.

Line 
1Index: wp-admin/categories.php
2===================================================================
3--- wp-admin/categories.php     (revision 7858)
4+++ wp-admin/categories.php     (working copy)
5@@ -126,6 +126,7 @@
6 <?php endif; ?>
7 
8 <p id="post-search">
9+       <label class="hidden" for="post-search-input"><?php _e('Search Categories'); ?>:</label>
10        <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
11        <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
12 </p>
13Index: wp-admin/edit-comments.php
14===================================================================
15--- wp-admin/edit-comments.php  (revision 7858)
16+++ wp-admin/edit-comments.php  (working copy)
17@@ -116,6 +116,7 @@
18 </ul>
19 
20 <p id="post-search">
21+       <label class="hidden" for="post-search-input"><?php _e( 'Search Comments' ); ?>:</label>
22        <input type="text" id="post-search-input" name="s" value="<?php echo $search; ?>" />
23        <input type="submit" value="<?php _e( 'Search Comments' ); ?>" class="button" />
24 </p>
25Index: wp-admin/edit-form-advanced.php
26===================================================================
27--- wp-admin/edit-form-advanced.php     (revision 7858)
28+++ wp-admin/edit-form-advanced.php     (working copy)
29@@ -84,9 +84,9 @@
30 
31 <div class="inside">
32 
33-<p><strong><?php _e('Publish Status') ?></strong></p>
34+<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
35 <p>
36-<select name='post_status' tabindex='4'>
37+<select name='post_status' id='post_status' tabindex='4'>
38 <?php if ( current_user_can('publish_posts') ) : // Contributors only get "Unpublished" and "Pending Review" ?>
39 <option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
40 <?php if ( 'future' == $post->post_status ) : ?>
41@@ -181,7 +181,7 @@
42 
43 <div id="post-body">
44 <div id="titlediv">
45-<h3><?php _e('Title') ?></h3>
46+<h3><label for="title"><?php _e('Title') ?></label></h3>
47 <div id="titlewrap">
48        <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape($post->post_title); ?>" id="title" autocomplete="off" />
49 </div>
50@@ -196,7 +196,7 @@
51 </div>
52 
53 <div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
54-<h3><?php _e('Post') ?></h3>
55+<h3><label for="content"><?php _e('Post') ?></label></h3>
56 <?php the_editor($post->post_content); ?>
57 <?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
58 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
59@@ -210,7 +210,7 @@
60 <div id="tagsdiv" class="postbox <?php echo postbox_classes('tagsdiv', 'post'); ?>">
61 <h3><?php _e('Tags'); ?></h3>
62 <div class="inside">
63-<p id="jaxtag"><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post_ID ); ?>" /></p>
64+<p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post_ID ); ?>" /></p>
65 <div id="tagchecklist"></div>
66 </div>
67 </div>
68@@ -258,7 +258,7 @@
69 
70 <div id="postexcerpt" class="postbox <?php echo postbox_classes('postexcerpt', 'post'); ?>">
71 <h3><?php _e('Excerpt') ?></h3>
72-<div class="inside"><textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt"><?php echo $post->post_excerpt ?></textarea>
73+<div class="inside"><label class="hidden" for="excerpt"><?php _e('Excerpt') ?></label><textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt"><?php echo $post->post_excerpt ?></textarea>
74 <p><?php _e('Excerpts are optional hand-crafted summaries of your content. You can <a href="http://codex.wordpress.org/Template_Tags/the_excerpt" target="_blank">use them in your template</a>'); ?></p>
75 </div>
76 </div>
77@@ -266,7 +266,7 @@
78 <div id="trackbacksdiv" class="postbox <?php echo postbox_classes('trackbacksdiv', 'post'); ?>">
79 <h3><?php _e('Trackbacks') ?></h3>
80 <div class="inside">
81-<p><?php _e('Send trackbacks to:'); ?> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p>
82+<p><label for="trackback"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p>
83 <p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress blogs they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p>
84 <?php
85 if ( ! empty($pings) )
86@@ -312,7 +312,7 @@
87 <div id="passworddiv" class="postbox <?php echo postbox_classes('passworddiv', 'post'); ?>">
88 <h3><?php _e('Password Protect This Post') ?></h3>
89 <div class="inside">
90-<p><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
91+<p><label class="hidden" for="post_password"><?php _e('Password Protect This Post') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
92 <p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this post and its comments.'); ?></p>
93 </div>
94 </div>
95@@ -320,7 +320,7 @@
96 <div id="slugdiv" class="postbox <?php echo postbox_classes('slugdiv', 'post'); ?>">
97 <h3><?php _e('Post Slug') ?></h3>
98 <div class="inside">
99-<input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
100+<label class="hidden" for="post_name"><?php _e('Post Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
101 </div>
102 </div>
103 
104Index: wp-admin/edit-form-comment.php
105===================================================================
106--- wp-admin/edit-form-comment.php      (revision 7858)
107+++ wp-admin/edit-form-comment.php      (working copy)
108@@ -22,9 +22,9 @@
109 
110 <div class="inside">
111 
112-<p><strong><?php _e('Approval Status') ?></strong></p>
113+<p><strong><label for='comment_status'><?php _e('Approval Status') ?></label></strong></p>
114 <p>
115-<select name='comment_status'>
116+<select name='comment_status' id='comment_status'>
117 <option<?php selected( $comment->comment_approved, '1' ); ?> value='1'><?php _e('Approved') ?></option>
118 <option<?php selected( $comment->comment_approved, '0' ); ?> value='0'><?php _e('Moderated') ?></option>
119 <option<?php selected( $comment->comment_approved, 'spam' ); ?> value='spam'><?php _e('Spam') ?></option>
120@@ -64,28 +64,28 @@
121 
122 <div id="post-body">
123 <div id="namediv" class="stuffbox">
124-<h3><?php _e('Name') ?></h3>
125+<h3><label for="name"><?php _e('Name') ?></label></h3>
126 <div class="inside">
127 <input type="text" name="newcomment_author" size="30" value="<?php echo attribute_escape( $comment->comment_author ); ?>" tabindex="1" id="name" />
128 </div>
129 </div>
130 
131 <div id="emaildiv" class="stuffbox">
132-<h3><?php _e('E-mail') ?></h3>
133+<h3><label for="email"><?php _e('E-mail') ?></label></h3>
134 <div class="inside">
135 <input type="text" name="newcomment_author_email" size="30" value="<?php echo attribute_escape( $comment->comment_author_email ); ?>" tabindex="2" id="email" />
136 </div>
137 </div>
138 
139 <div id="uridiv" class="stuffbox">
140-<h3><?php _e('URL') ?></h3>
141+<h3><label for="newcomment_author_url"><?php _e('URL') ?></label></h3>
142 <div class="inside">
143 <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" value="<?php echo attribute_escape( $comment->comment_author_url ); ?>" tabindex="3" />
144 </div>
145 </div>
146 
147 <div id="postdiv" class="postarea">
148-<h3><?php _e('Comment') ?></h3>
149+<h3><label for="content"><?php _e('Comment') ?></label></h3>
150 <?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4); ?>
151 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
152 </div>
153Index: wp-admin/edit-link-categories.php
154===================================================================
155--- wp-admin/edit-link-categories.php   (revision 7858)
156+++ wp-admin/edit-link-categories.php   (working copy)
157@@ -62,6 +62,7 @@
158 <?php endif; ?>
159 
160 <p id="post-search">
161+       <label class="hidden" for="post-search-input"><?php _e( 'Search Categories' ); ?>:</label>
162        <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
163        <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" />
164 </p>
165Index: wp-admin/edit-link-form.php
166===================================================================
167--- wp-admin/edit-link-form.php (revision 7858)
168+++ wp-admin/edit-link-form.php (working copy)
169@@ -74,7 +74,7 @@
170 
171 <div id="post-body">
172 <div id="namediv" class="stuffbox">
173-<h3><?php _e('Name') ?></h3>
174+<h3><label for="link_name"><?php _e('Name') ?></label></h3>
175 <div class="inside">
176        <input type="text" name="link_name" size="30" tabindex="1" value="<?php echo $link->link_name; ?>" id="link_name" /><br />
177     <?php _e('Example: Nifty blogging software'); ?>
178@@ -82,7 +82,7 @@
179 </div>
180 
181 <div id="addressdiv" class="stuffbox">
182-<h3><?php _e('Web Address') ?></h3>
183+<h3><label for="link_url"><?php _e('Web Address') ?></label></h3>
184 <div class="inside">
185        <input type="text" name="link_url" size="30" tabindex="1" value="<?php echo $link->link_url; ?>" id="link_url" /><br />
186     <?php _e('Example: <code>http://wordpress.org/</code> &#8212; don&#8217;t forget the <code>http://</code>'); ?>
187@@ -90,7 +90,7 @@
188 </div>
189 
190 <div id="descriptiondiv" class="stuffbox">
191-<h3><?php _e('Description') ?></h3>
192+<h3><label for="link_description"><?php _e('Description') ?></label></h3>
193 <div class="inside">
194        <input type="text" name="link_description" size="30" tabindex="1" value="<?php echo $link->link_description; ?>" id="link_description" /><br />
195     <?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?>
196@@ -104,6 +104,7 @@
197 <div id="category-adder" class="wp-hidden-children">
198        <h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4>
199        <p id="link-category-add" class="wp-hidden-child">
200+               <label class="hidden" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
201                <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" />
202                <input type="button" id="category-add-sumbit" class="add:categorychecklist:linkcategorydiv button" value="<?php _e( 'Add' ); ?>" />
203                <?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
204@@ -138,6 +139,7 @@
205 <div id="linktargetdiv" class="postbox <?php echo postbox_classes('linktargetdiv', 'link'); ?>">
206 <h3><?php _e('Target') ?></h3>
207 <div class="inside">
208+<fieldset><legend class="hidden"><?php _e('Target') ?></legend>
209 <label for="link_target_blank" class="selectit">
210 <input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo(($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
211 <code>_blank</code></label><br />
212@@ -147,6 +149,7 @@
213 <label for="link_target_none" class="selectit">
214 <input id="link_target_none" type="radio" name="link_target" value="" <?php echo(($link->link_target == '') ? 'checked="checked"' : ''); ?> />
215 <?php _e('none') ?></label>
216+</fieldset>
217 <p><?php _e('Choose the frame your link targets. Essentially this means if you choose <code>_blank</code> your link will open in a new window.'); ?></p>
218 </div>
219 </div>
220@@ -156,7 +159,7 @@
221 <div class="inside">
222 <table class="editform" style="width: 100%;" cellspacing="2" cellpadding="5">
223        <tr>
224-               <th style="width: 20%;" scope="row"><?php _e('rel:') ?></th>
225+               <th style="width: 20%;" scope="row"><label for="link_rel"><?php _e('rel:') ?></label></th>
226                <td style="width: 80%;"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo $link->link_rel; ?>" /></td>
227        </tr>
228        <tr>
229@@ -164,15 +167,15 @@
230                        <table cellpadding="3" cellspacing="5" class="form-table">
231                                <tr>
232                                        <th scope="row"> <?php _e('identity') ?> </th>
233-                                       <td>
234+                                       <td><fieldset><legend class="hidden"> <?php _e('identity') ?> </legend>
235                                                <label for="me">
236                                                <input type="checkbox" name="identity" value="me" id="me" <?php xfn_check('identity', 'me'); ?> />
237                                                <?php _e('another web address of mine') ?></label>
238-                                       </td>
239+                                       </fieldset></td>
240                                </tr>
241                                <tr>
242                                        <th scope="row"> <?php _e('friendship') ?> </th>
243-                                       <td>
244+                                       <td><fieldset><legend class="hidden"> <?php _e('friendship') ?> </legend>
245                                                <label for="contact">
246                                                <input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php _e('contact') ?></label>
247                                                <label for="acquaintance">
248@@ -181,30 +184,30 @@
249                                                <input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label>
250                                                <label for="friendship">
251                                                <input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php _e('none') ?></label>
252-                                       </td>
253+                                       </fieldset></td>
254                                </tr>
255                                <tr>
256                                        <th scope="row"> <?php _e('physical') ?> </th>
257-                                       <td>
258+                                       <td><fieldset><legend class="hidden"> <?php _e('physical') ?> </legend>
259                                                <label for="met">
260                                                <input class="valinp" type="checkbox" name="physical" value="met" id="met" <?php xfn_check('physical', 'met'); ?> />
261                                                <?php _e('met') ?></label>
262-                                       </td>
263+                                       </fieldset></td>
264                                </tr>
265                                <tr>
266                                        <th scope="row"> <?php _e('professional') ?> </th>
267-                                       <td>
268+                                       <td><fieldset><legend class="hidden"> <?php _e('professional') ?> </legend>
269                                                <label for="co-worker">
270                                                <input class="valinp" type="checkbox" name="professional" value="co-worker" id="co-worker" <?php xfn_check('professional', 'co-worker'); ?> />
271                                                <?php _e('co-worker') ?></label>
272                                                <label for="colleague">
273                                                <input class="valinp" type="checkbox" name="professional" value="colleague" id="colleague" <?php xfn_check('professional', 'colleague'); ?> />
274                                                <?php _e('colleague') ?></label>
275-                                       </td>
276+                                       </fieldset></td>
277                                </tr>
278                                <tr>
279                                        <th scope="row"> <?php _e('geographical') ?> </th>
280-                                       <td>
281+                                       <td><fieldset><legend class="hidden"> <?php _e('geographical') ?> </legend>
282                                                <label for="co-resident">
283                                                <input class="valinp" type="radio" name="geographical" value="co-resident" id="co-resident" <?php xfn_check('geographical', 'co-resident', 'radio'); ?> />
284                                                <?php _e('co-resident') ?></label>
285@@ -214,11 +217,11 @@
286                                                <label for="geographical">
287                                                <input class="valinp" type="radio" name="geographical" value="" id="geographical" <?php xfn_check('geographical', '', 'radio'); ?> />
288                                                <?php _e('none') ?></label>
289-                                       </td>
290+                                       </fieldset></td>
291                                </tr>
292                                <tr>
293                                        <th scope="row"> <?php _e('family') ?> </th>
294-                                       <td>
295+                                       <td><fieldset><legend class="hidden"> <?php _e('family') ?> </legend>
296                                                <label for="child">
297                                                <input class="valinp" type="radio" name="family" value="child" id="child" <?php xfn_check('family', 'child', 'radio'); ?>  />
298                                                <?php _e('child') ?></label>
299@@ -237,11 +240,11 @@
300                                                <label for="family">
301                                                <input class="valinp" type="radio" name="family" value="" id="family" <?php xfn_check('family', '', 'radio'); ?> />
302                                                <?php _e('none') ?></label>
303-                                       </td>
304+                                       </fieldset></td>
305                                </tr>
306                                <tr>
307                                        <th scope="row"> <?php _e('romantic') ?> </th>
308-                                       <td>
309+                                       <td><fieldset><legend class="hidden"> <?php _e('romantic') ?> </legend>
310                                                <label for="muse">
311                                                <input class="valinp" type="checkbox" name="romantic" value="muse" id="muse" <?php xfn_check('romantic', 'muse'); ?> />
312                                                <?php _e('muse') ?></label>
313@@ -254,7 +257,7 @@
314                                                <label for="romantic">
315                                                <input class="valinp" type="checkbox" name="romantic" value="sweetheart" id="romantic" <?php xfn_check('romantic', 'sweetheart'); ?> />
316                                                <?php _e('sweetheart') ?></label>
317-                                       </td>
318+                                       </fieldset></td>
319                                </tr>
320                        </table>
321                </td>
322Index: wp-admin/edit-page-form.php
323===================================================================
324--- wp-admin/edit-page-form.php (revision 7858)
325+++ wp-admin/edit-page-form.php (working copy)
326@@ -69,9 +69,9 @@
327 
328 <div class="inside">
329 
330-<p><strong><?php _e('Publish Status') ?></strong></p>
331+<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
332 <p>
333-<select name='post_status' tabindex='4'>
334+<select name='post_status' tabindex='4' id='post_status'>
335 <?php if ( current_user_can('publish_pages') ) : ?>
336 <option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
337 <?php else: ?>
338@@ -160,7 +160,7 @@
339 
340 <div id="post-body">
341 <div id="titlediv">
342-<h3><?php _e('Title') ?></h3>
343+<h3><label for="title"><?php _e('Title') ?></label></h3>
344 <div id="titlewrap">
345   <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" autocomplete="off" />
346 </div>
347@@ -175,7 +175,7 @@
348 </div>
349 
350 <div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
351-<h3><?php _e('Page') ?></h3>
352+<h3><label for="content"><?php _e('Page') ?></label></h3>
353 <?php the_editor($post->post_content); ?>
354 <?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
355 <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
356@@ -224,7 +224,7 @@
357 <div id="pagepassworddiv" class="postbox <?php echo postbox_classes('pagepassworddiv', 'page'); ?>">
358 <h3><?php _e('Password Protect This Page') ?></h3>
359 <div class="inside">
360-<p><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
361+<p><label class="hidden" for="post_password"><?php _e('Password Protect This Page') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p>
362 <p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this page and its comments.'); ?></p>
363 </div>
364 </div>
365@@ -232,14 +232,14 @@
366 <div id="pageslugdiv" class="postbox <?php echo postbox_classes('pageslugdiv', 'page'); ?>">
367 <h3><?php _e('Page Slug') ?></h3>
368 <div class="inside">
369-<input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
370+<label class="hidden" for="post_name"><?php _e('Page Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
371 </div>
372 </div>
373 
374 <div id="pageparentdiv" class="postbox <?php echo postbox_classes('pageparentdiv', 'page'); ?>">
375 <h3><?php _e('Page Parent') ?></h3>
376 <div class="inside">
377-<select name="parent_id">
378+<label class="hidden" for="parent_id"><?php _e('Page Parent') ?></label><select name="parent_id" id="parent_id">
379 <option value='0'><?php _e('Main Page (no parent)'); ?></option>
380 <?php parent_dropdown($post->post_parent); ?>
381 </select>
382@@ -251,7 +251,7 @@
383 <div id="pagetemplatediv" class="postbox <?php echo postbox_classes('pagetemplatediv', 'page'); ?>">
384 <h3><?php _e('Page Template') ?></h3>
385 <div class="inside">
386-<select name="page_template">
387+<label class="hidden" for="page_template"><?php _e('Page Template') ?></label><select name="page_template" id="page_template">
388 <option value='default'><?php _e('Default Template'); ?></option>
389 <?php page_template_dropdown($post->page_template); ?>
390 </select>
391@@ -263,7 +263,7 @@
392 <div id="pageorderdiv" class="postbox <?php echo postbox_classes('pageorderdiv', 'page'); ?>">
393 <h3><?php _e('Page Order') ?></h3>
394 <div class="inside">
395-<p><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $post->menu_order ?>" /></p>
396+<p><label class="hidden" for="menu_order"><?php _e('Page Order') ?></label><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $post->menu_order ?>" /></p>
397 <p><?php _e('Pages are usually ordered alphabetically, but you can put a number above to change the order pages appear in. (We know this is a little janky, it&#8217;ll be better in future releases.)'); ?></p>
398 </div>
399 </div>
400Index: wp-admin/edit-pages.php
401===================================================================
402--- wp-admin/edit-pages.php     (revision 7858)
403+++ wp-admin/edit-pages.php     (working copy)
404@@ -111,6 +111,7 @@
405 ?>
406 
407 <p id="post-search">
408+       <label class="hidden" for="post-search-input"><?php _e( 'Search Pages' ); ?>:</label>
409        <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
410        <input type="submit" value="<?php _e( 'Search Pages' ); ?>" class="button" />
411 </p>
412Index: wp-admin/edit-tags.php
413===================================================================
414--- wp-admin/edit-tags.php      (revision 7858)
415+++ wp-admin/edit-tags.php      (working copy)
416@@ -133,6 +133,7 @@
417 <?php endif; ?>
418 
419 <p id="post-search">
420+       <label class="hidden" for="post-search-input"><?php _e( 'Search Tags' ); ?>:</label>
421        <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
422        <input type="submit" value="<?php _e( 'Search Tags' ); ?>" class="button" />
423 </p>
424Index: wp-admin/edit.php
425===================================================================
426--- wp-admin/edit.php   (revision 7858)
427+++ wp-admin/edit.php   (working copy)
428@@ -116,6 +116,7 @@
429 ?>
430 
431 <p id="post-search">
432+       <label class="hidden" for="post-search-input"><?php _e( 'Search Posts' ); ?>:</label>
433        <input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
434        <input type="submit" value="<?php _e( 'Search Posts' ); ?>" class="button" />
435 </p>
436Index: wp-admin/export.php
437===================================================================
438--- wp-admin/export.php (revision 7858)
439+++ wp-admin/export.php (working copy)
440@@ -22,9 +22,9 @@
441 
442 <table class="form-table">
443 <tr>
444-<th><?php _e('Restrict Author'); ?></th>
445+<th><label for="author"><?php _e('Restrict Author'); ?></label></th>
446 <td>
447-<select name="author">
448+<select name="author" id="author">
449 <option value="all" selected="selected"><?php _e('All Authors'); ?></option>
450 <?php
451 $authors = $wpdb->get_col( "SELECT post_author FROM $wpdb->posts GROUP BY post_author" );
452Index: wp-admin/import/greymatter.php
453===================================================================
454--- wp-admin/import/greymatter.php      (revision 7858)
455+++ wp-admin/import/greymatter.php      (working copy)
456@@ -38,16 +38,16 @@
457 <h3><?php _e('Second step: GreyMatter details:') ?></h3>
458 <table class="form-table">
459 <tr>
460-<td><?php _e('Path to GM files:') ?></td>
461-<td><input type="text" style="width:300px" name="gmpath" value="/home/my/site/cgi-bin/greymatter/" /></td>
462+<td><label for="gmpath"><?php _e('Path to GM files:') ?></label></td>
463+<td><input type="text" style="width:300px" name="gmpath" id="gmpath" value="/home/my/site/cgi-bin/greymatter/" /></td>
464 </tr>
465 <tr>
466-<td><?php _e('Path to GM entries:') ?></td>
467-<td><input type="text" style="width:300px" name="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td>
468+<td><label for="archivespath"><?php _e('Path to GM entries:') ?></label></td>
469+<td><input type="text" style="width:300px" name="archivespath" id="archivespath" value="/home/my/site/cgi-bin/greymatter/archives/" /></td>
470 </tr>
471 <tr>
472-<td><?php _e("Last entry's number:") ?></td>
473-<td><input type="text" name="lastentry" value="00000001" /><br />
474+<td><label for="lastentry"><?php _e("Last entry's number:") ?></label></td>
475+<td><input type="text" name="lastentry" id="lastentry" value="00000001" /><br />
476        <?php _e("This importer will search for files 00000001.cgi to 000-whatever.cgi,<br />so you need to enter the number of the last GM post here.<br />(if you don't know that number, just log into your FTP and look it out<br />in the entries' folder)") ?></td>
477 </tr>
478 </table>
479Index: wp-admin/import/mt.php
480===================================================================
481--- wp-admin/import/mt.php      (revision 7858)
482+++ wp-admin/import/mt.php      (working copy)
483@@ -166,9 +166,9 @@
484                $j = -1;
485                foreach ($authors as $author) {
486                        ++ $j;
487-                       echo '<li>'.__('Current author:').' <strong>'.$author.'</strong><br />'.sprintf(__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30"> <br />');
488+                       echo '<li><label>'.__('Current author:').' <strong>'.$author.'</strong><br />'.sprintf(__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user[]'.'" maxlength="30"> <br />');
489                        $this->users_form($j);
490-                       echo '</li>';
491+                       echo '</label></li>';
492                }
493 
494                echo '<input type="submit" value="'.__('Submit').'">'.'<br />';
495Index: wp-admin/import/wordpress.php
496===================================================================
497--- wp-admin/import/wordpress.php       (revision 7858)
498+++ wp-admin/import/wordpress.php       (working copy)
499@@ -218,7 +218,7 @@
500        function users_form($n, $author) {
501 
502                if ( $this->allow_create_users() ) {
503-                       printf(__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user_create['.intval($n).']'.'" maxlength="30"> <br />');
504+                       printf('<label>'.__('Create user %1$s or map to existing'), ' <input type="text" value="'.$author.'" name="'.'user_create['.intval($n).']'.'" maxlength="30"></label> <br />');
505                }
506                else {
507                        echo __('Map to existing').'<br />';
508Index: wp-admin/includes/media.php
509===================================================================
510--- wp-admin/includes/media.php (revision 7858)
511+++ wp-admin/includes/media.php (working copy)
512@@ -956,6 +956,7 @@
513 <input type="hidden" name="post_mime_type" value="<?php echo attribute_escape( $_GET['post_mime_type'] ); ?>" />
514 
515 <div id="search-filter">
516+       <label class="hidden" for="post-search-input"><?php _e('Search Media');?>:</label>
517        <input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
518        <input type="submit" value="<?php echo attribute_escape( __( 'Search Media' ) ); ?>" class="button" />
519 </div>
520Index: wp-admin/includes/template.php
521===================================================================
522--- wp-admin/includes/template.php      (revision 7858)
523+++ wp-admin/includes/template.php      (working copy)
524@@ -774,8 +774,8 @@
525        $delete_nonce = wp_create_nonce( 'delete-meta_' . $entry['meta_id'] );
526 
527        $r .= "\n\t<tr id='meta-{$entry['meta_id']}' class='$style'>";
528-       $r .= "\n\t\t<td valign='top'><input name='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' size='20' value='{$entry['meta_key']}' /></td>";
529-       $r .= "\n\t\t<td><textarea name='meta[{$entry['meta_id']}][value]' tabindex='6' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>";
530+       $r .= "\n\t\t<td valign='top'><label class='hidden' for='meta[{$entry['meta_id']}][key]'>" . __( 'Key' ) . "</label><input name='meta[{$entry['meta_id']}][key]' id='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' size='20' value='{$entry['meta_key']}' /></td>";
531+       $r .= "\n\t\t<td><label class='hidden' for='meta[{$entry['meta_id']}][value]'>" . __( 'Value' ) . "</label><textarea name='meta[{$entry['meta_id']}][value]' id='meta[{$entry['meta_id']}][value]' tabindex='6' rows='2' cols='30'>{$entry['meta_value']}</textarea></td>";
532        $r .= "\n\t\t<td style='text-align: center;'><input name='updatemeta' type='submit' tabindex='6' value='".attribute_escape(__( 'Update' ))."' class='add:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$update_nonce updatemeta' /><br />";
533        $r .= "\n\t\t<input name='deletemeta[{$entry['meta_id']}]' type='submit' ";
534        $r .= "class='delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce deletemeta' tabindex='6' value='".attribute_escape(__( 'Delete' ))."' />";
535@@ -800,8 +800,8 @@
536 <p><strong><?php _e( 'Add a new custom field:' ) ?></strong></p>
537 <table id="newmeta" cellspacing="3" cellpadding="3">
538        <tr>
539-<th colspan="2"><?php _e( 'Key' ) ?></th>
540-<th><?php _e( 'Value' ) ?></th>
541+<th colspan="2"><label <?php if ( $keys ) : ?> for="metakeyselect" <?php else : ?> for="metakeyinput" <?php endif; ?>><?php _e( 'Key' ) ?></label></th>
542+<th><label for="metavalue"><?php _e( 'Value' ) ?></label></th>
543 </tr>
544        <tr valign="top">
545                <td style="width: 18%;" class="textright">
546@@ -815,7 +815,7 @@
547                echo "\n\t<option value='$key'>$key</option>";
548        }
549 ?>
550-</select> <?php _e( 'or' ); ?>
551+</select> <label for="metakeyinput"><?php _e( 'or' ); ?></label>
552 <?php endif; ?>
553 </td>
554 <td><input type="text" id="metakeyinput" name="metakeyinput" tabindex="7" /></td>
555Index: wp-admin/link-import.php
556===================================================================
557--- wp-admin/link-import.php    (revision 7858)
558+++ wp-admin/link-import.php    (working copy)
559@@ -30,19 +30,19 @@
560 <input type="hidden" name="step" value="1" />
561 <input type="hidden" name="MAX_FILE_SIZE" value="30000" />
562 <div style="width: 48%;" class="alignleft">
563-<h3><?php _e('Specify an OPML URL:'); ?></h3>
564-<input type="text" name="opml_url" size="50" style="width: 90%;" value="http://" />
565+<h3><label for="opml_url"><?php _e('Specify an OPML URL:'); ?></label></h3>
566+<input type="text" name="opml_url" id="opml_url" size="50" style="width: 90%;" value="http://" />
567 </div>
568 
569 <div style="width: 48%;" class="alignleft">
570-<h3><?php _e('Or choose from your local disk:'); ?></h3>
571+<h3><label for="userfile"><?php _e('Or choose from your local disk:'); ?></label></h3>
572 <input id="userfile" name="userfile" type="file" size="30" />
573 </div>
574 
575 </div>
576 
577-<p style="clear: both; margin-top: 1em;"><?php _e('Now select a category you want to put these links in.') ?><br />
578-<?php _e('Category:') ?> <select name="cat_id">
579+<p style="clear: both; margin-top: 1em;"><label for="cat_id"><?php _e('Now select a category you want to put these links in.') ?></label><br />
580+<?php _e('Category:') ?> <select name="cat_id" id="cat_id">
581 <?php
582 $categories = get_terms('link_category', 'get=all');
583 foreach ($categories as $category) {
584Index: wp-admin/link-manager.php
585===================================================================
586--- wp-admin/link-manager.php   (revision 7858)
587+++ wp-admin/link-manager.php   (working copy)
588@@ -78,6 +78,7 @@
589 <h2><?php printf( __( 'Manage Links (<a href="%s">add new</a>)' ), 'link-add.php' ); ?></h2>
590 
591 <p id="post-search">
592+       <label class="hidden" for="post-search-input"><?php _e( 'Search Links' ); ?>:</label>
593        <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" />
594        <input type="submit" value="<?php _e( 'Search Links' ); ?>" class="button" />
595 </p>
596Index: wp-admin/options-discussion.php
597===================================================================
598--- wp-admin/options-discussion.php     (revision 7858)
599+++ wp-admin/options-discussion.php     (working copy)
600@@ -14,7 +14,7 @@
601 <table class="form-table">
602 <tr valign="top">
603 <th scope="row"><?php _e('Default article settings') ?></th>
604-<td>
605+<td><fieldset><legend class="hidden"><?php _e('Default article settings') ?></legend>
606 <label for="default_pingback_flag">
607 <input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> />
608 <?php _e('Attempt to notify any blogs linked to from the article (slows down posting.)') ?></label>
609@@ -28,11 +28,11 @@
610 <?php _e('Allow people to post comments on the article') ?></label>
611 <br />
612 <small><em><?php echo '(' . __('These settings may be overridden for individual articles.') . ')'; ?></em></small>
613-</td>
614+</fieldset></td>
615 </tr>
616 <tr valign="top">
617 <th scope="row"><?php _e('E-mail me whenever') ?></th>
618-<td>
619+<td><fieldset><legend class="hidden"><?php _e('E-mail me whenever') ?></legend>
620 <label for="comments_notify">
621 <input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> />
622 <?php _e('Anyone posts a comment') ?> </label>
623@@ -40,11 +40,11 @@
624 <label for="moderation_notify">
625 <input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_option('moderation_notify')); ?> />
626 <?php _e('A comment is held for moderation') ?> </label>
627-</td>
628+</fieldset></td>
629 </tr>
630 <tr valign="top">
631 <th scope="row"><?php _e('Before a comment appears') ?></th>
632-<td>
633+<td><fieldset><legend class="hidden"><?php _e('Before a comment appears') ?></legend>
634 <label for="comment_moderation">
635 <input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_option('comment_moderation')); ?> />
636 <?php _e('An administrator must always approve the comment') ?> </label>
637@@ -52,27 +52,27 @@
638 <label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail') ?></label>
639 <br />
640 <label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_option('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment') ?></label>
641-</td>
642+</fieldset></td>
643 </tr>
644 <tr valign="top">
645 <th scope="row"><?php _e('Comment Moderation') ?></th>
646-<td>
647-<p><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_option('comment_max_links'). '" />' ) ?></p>
648+<td><fieldset><legend class="hidden"><?php _e('Comment Moderation') ?></legend>
649+<p><label for="comment_max_links"><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_option('comment_max_links'). '" />' ) ?></label></p>
650 
651-<p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
652+<p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></label></p>
653 <p>
654 <textarea name="moderation_keys" cols="60" rows="10" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea>
655 </p>
656-</td>
657+</fieldset></td>
658 </tr>
659 <tr valign="top">
660 <th scope="row"><?php _e('Comment Blacklist') ?></th>
661-<td>
662-<p><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
663+<td><fieldset><legend class="hidden"><?php _e('Comment Blacklist') ?></legend>
664+<p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></label></p>
665 <p>
666 <textarea name="blacklist_keys" cols="60" rows="10" id="blacklist_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('blacklist_keys'); ?></textarea>
667 </p>
668-</td>
669+</fieldset></td>
670 </tr>
671 </table>
672 
673@@ -85,7 +85,7 @@
674 <table class="form-table">
675 <tr valign="top">
676 <th scope="row"><?php _e('Avatar display') ?></th>
677-<td>
678+<td><fieldset><legend class="hidden"><?php _e('Avatar display') ?></legend>
679 <?php
680        $yesorno = array(0 => __("Don&#8217;t show Avatars"), 1 => __('Show Avatars'));
681        foreach ( $yesorno as $key => $value) {
682@@ -93,11 +93,11 @@
683                echo "\n\t<label><input type='radio' name='show_avatars' value='$key' $selected> $value</label><br />";
684        }
685 ?>
686-</td>
687+</fieldset></td>
688 </tr>
689 <tr valign="top">
690 <th scope="row"><?php _e('Maximum Rating') ?></th>
691-<td>
692+<td><fieldset><legend class="hidden"><?php _e('Maximum Rating') ?></legend>
693 
694 <?php
695 $ratings = array( 'G' => __('G &#8212; Suitable for all audiences'), 'PG' => __('PG &#8212; Possibly offensive, usually for audiences 13 and above'), 'R' => __('R &#8212; Intended for adult audiences above 17'), 'X' => __('X &#8212; Even more mature than above'));
696@@ -107,7 +107,7 @@
697 endforeach;
698 ?>
699 
700-</td>
701+</fieldset></td>
702 </tr>
703 
704 </table>
705Index: wp-admin/options-general.php
706===================================================================
707--- wp-admin/options-general.php        (revision 7858)
708+++ wp-admin/options-general.php        (working copy)
709@@ -13,50 +13,50 @@
710 <?php wp_nonce_field('update-options') ?>
711 <table class="form-table">
712 <tr valign="top">
713-<th scope="row"><?php _e('Blog Title') ?></th>
714+<th scope="row"><label for="blogname"><?php _e('Blog Title') ?></label></th>
715 <td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" size="40" /></td>
716 </tr>
717 <tr valign="top">
718-<th scope="row"><?php _e('Tagline') ?></th>
719+<th scope="row"><label for="blogdescription"><?php _e('Tagline') ?></label></th>
720 <td><input name="blogdescription" type="text" id="blogdescription" style="width: 95%" value="<?php form_option('blogdescription'); ?>" size="45" />
721 <br />
722 <?php _e('In a few words, explain what this blog is about.') ?></td>
723 </tr>
724 <tr valign="top">
725-<th scope="row"><?php _e('WordPress address (URL)') ?></th>
726+<th scope="row"><label for="siteurl"><?php _e('WordPress address (URL)') ?></label></th>
727 <td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>" size="40" class="code<?php if ( defined( 'WP_SITEURL' ) ) : ?> disabled" disabled="disabled"<?php else: ?>"<?php endif; ?> /></td>
728 </tr>
729 <tr valign="top">
730-<th scope="row"><?php _e('Blog address (URL)') ?></th>
731+<th scope="row"><label for="home"><?php _e('Blog address (URL)') ?></label></th>
732 <td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>" size="40" class="code<?php if ( defined( 'WP_HOME' ) ) : ?> disabled" disabled="disabled"<?php else: ?>"<?php endif; ?> /><br /><?php _e('Enter the address here if you want your blog homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different from the directory</a> you installed WordPress.'); ?></td>
733 </tr>
734 <tr valign="top">
735-<th scope="row"><?php _e('E-mail address') ?> </th>
736+<th scope="row"><label for="admin_email"><?php _e('E-mail address') ?> </label></th>
737 <td><input name="admin_email" type="text" id="admin_email" value="<?php form_option('admin_email'); ?>" size="40" class="code" />
738 <br />
739 <?php _e('This address is used for admin purposes, like new user notification.') ?></td>
740 </tr>
741 <tr valign="top">
742 <th scope="row"><?php _e('Membership') ?></th>
743-<td> <label for="users_can_register">
744+<td> <fieldset><legend class="hidden"><?php _e('Membership') ?></legend><label for="users_can_register">
745 <input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked('1', get_option('users_can_register')); ?> />
746 <?php _e('Anyone can register') ?></label><br />
747 <label for="comment_registration">
748 <input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
749 <?php _e('Users must be registered and logged in to comment') ?>
750 </label>
751-</td>
752+</fieldset></td>
753 </tr>
754 <tr valign="top">
755-<th scope="row"><?php _e('New User Default Role') ?></th>
756-<td><label for="default_role">
757-<select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select></label>
758+<th scope="row"><label for="default_role"><?php _e('New User Default Role') ?></label></th>
759+<td>
760+<select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select>
761 </td>
762 </tr>
763 <tr>
764-<th scope="row"><?php _e('Timezone') ?> </th>
765+<th scope="row"><label for="gmt_offset"><?php _e('Timezone') ?> </label></th>
766 <td>
767-<select name="gmt_offset">
768+<select name="gmt_offset" id="gmt_offset">
769 <?php
770 $current_offset = get_option('gmt_offset');
771 $offset_range = array (-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
772@@ -87,18 +87,18 @@
773 </td>
774 </tr>
775 <tr>
776-<th scope="row"><?php _e('Date Format') ?></th>
777+<th scope="row"><label for="date_format"><?php _e('Date Format') ?></label></th>
778 <td><input name="date_format" type="text" id="date_format" size="30" value="<?php form_option('date_format'); ?>" /><br />
779 <?php _e('Output:') ?> <strong><?php echo mysql2date(get_option('date_format'), current_time('mysql')); ?></strong></td>
780 </tr>
781 <tr>
782-<th scope="row"><?php _e('Time Format') ?></th>
783+<th scope="row"><label for="time_format"><?php _e('Time Format') ?></label></th>
784 <td><input name="time_format" type="text" id="time_format" size="30" value="<?php form_option('time_format'); ?>" /><br />
785 <?php _e('Output:') ?> <strong><?php echo gmdate(get_option('time_format'), current_time('timestamp')); ?></strong><br />
786 <?php _e('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Click "Save Changes" to update sample output.') ?></td>
787 </tr>
788 <tr>
789-<th scope="row"><?php _e('Week Starts On') ?></th>
790+<th scope="row"><label for="start_of_week"><?php _e('Week Starts On') ?></label></th>
791 <td><select name="start_of_week" id="start_of_week">
792 <?php
793 for ($day_index = 0; $day_index <= 6; $day_index++) :
794Index: wp-admin/options-misc.php
795===================================================================
796--- wp-admin/options-misc.php   (revision 7858)
797+++ wp-admin/options-misc.php   (working copy)
798@@ -15,7 +15,7 @@
799 <h3><?php _e('Uploading'); ?></h3>
800 <table class="form-table">
801 <tr valign="top">
802-<th scope="row"><?php _e('Store uploads in this folder'); ?></th>
803+<th scope="row"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></th>
804 <td><input name="upload_path" type="text" id="upload_path" class="code" value="<?php echo attribute_escape(str_replace(ABSPATH, '', get_option('upload_path'))); ?>" size="40" />
805 <br />
806 <?php _e('Default is <code>wp-content/uploads</code>'); ?>
807@@ -23,7 +23,7 @@
808 </tr>
809 
810 <tr valign="top">
811-<th scope="row"><?php _e('Full URL path to files (optional)'); ?></th>
812+<th scope="row"><label for="upload_url_path"><?php _e('Full URL path to files (optional)'); ?></label></th>
813 <td><input name="upload_url_path" type="text" id="upload_url_path" class="code" value="<?php echo attribute_escape( get_option('upload_url_path')); ?>" size="40" />
814 </td>
815 </tr>
816@@ -44,23 +44,23 @@
817 <table class="form-table">
818 <tr valign="top">
819 <th scope="row"><?php _e('Thumbnail size') ?></th>
820-<td>
821+<td><fieldset><legend class="hidden"><?php _e('Thumbnail size') ?></legend>
822 <label for="thumbnail_size_w"><?php _e('Width'); ?></label>
823 <input name="thumbnail_size_w" type="text" id="thumbnail_size_w" value="<?php form_option('thumbnail_size_w'); ?>" size="6" />
824 <label for="thumbnail_size_h"><?php _e('Height'); ?></label>
825 <input name="thumbnail_size_h" type="text" id="thumbnail_size_h" value="<?php form_option('thumbnail_size_h'); ?>" size="6" /><br />
826 <input name="thumbnail_crop" type="checkbox" id="thumbnail_crop" value="1" <?php checked('1', get_option('thumbnail_crop')); ?>/>
827 <label for="thumbnail_crop"><?php _e('Crop thumbnail to exact dimensions (normally thumbnails are proportional)'); ?></label>
828-</td>
829+</fieldset></td>
830 </tr>
831 <tr valign="top">
832 <th scope="row"><?php _e('Medium size') ?></th>
833-<td>
834+<td><fieldset><legend class="hidden"><?php _e('Medium size') ?></legend>
835 <label for="medium_size_w"><?php _e('Max Width'); ?></label>
836 <input name="medium_size_w" type="text" id="medium_size_w" value="<?php form_option('medium_size_w'); ?>" size="6" />
837 <label for="medium_size_h"><?php _e('Max Height'); ?></label>
838 <input name="medium_size_h" type="text" id="medium_size_h" value="<?php form_option('medium_size_h'); ?>" size="6" />
839-</td>
840+</fieldset></td>
841 </tr>
842 </table>
843 
844Index: wp-admin/options-permalink.php
845===================================================================
846--- wp-admin/options-permalink.php      (revision 7858)
847+++ wp-admin/options-permalink.php      (working copy)
848@@ -170,11 +170,11 @@
849 
850 <table class="form-table">
851        <tr>
852-               <th><?php _e('Category base'); ?></th>
853+               <th><label for="category_base"><?php _e('Category base'); ?></label></th>
854                <td><input name="category_base" id="category_base" type="text" class="code"  value="<?php echo attribute_escape($category_base); ?>" size="30" /></td>
855        </tr>
856        <tr>
857-               <th><?php _e('Tag base'); ?></th>
858+               <th><label for="tag_base"><?php _e('Tag base'); ?></label></th>
859                <td><input name="tag_base" id="tag_base" type="text" class="code"  value="<?php echo attribute_escape($tag_base); ?>" size="30" /></td>
860        </tr>
861 </table>
862Index: wp-admin/options-privacy.php
863===================================================================
864--- wp-admin/options-privacy.php        (revision 7858)
865+++ wp-admin/options-privacy.php        (working copy)
866@@ -14,13 +14,13 @@
867 <table class="form-table">
868 <tr valign="top">
869 <th scope="row"><?php _e('Blog Visibility') ?> </th>
870-<td>
871+<td><fieldset><legend class="hidden"><?php _e('Blog Visibility') ?> </legend>
872 <p><input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
873 <label for="blog-public"><?php _e('I would like my blog to be visible to everyone, including search engines (like Google, Sphere, Technorati) and archivers');?></label></p>
874 <p><input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
875 <label for="blog-norobots"><?php _e('I would like to block search engines, but allow normal visitors'); ?></label></p>
876 <?php do_action('blog_privacy_selector'); ?>
877-</td>
878+</fieldset></td>
879 </tr>
880 </table>
881 
882Index: wp-admin/options-reading.php
883===================================================================
884--- wp-admin/options-reading.php        (revision 7858)
885+++ wp-admin/options-reading.php        (working copy)
886@@ -15,7 +15,7 @@
887 <?php if ( get_pages() ): ?>
888 <tr valign="top">
889 <th scope="row"><?php _e('Front page displays')?></th>
890-<td>
891+<td><fieldset><legend class="hidden"><?php _e('Front page displays')?></legend>
892        <p><label>
893                <input name="show_on_front" type="radio" value="posts" class="tog" <?php checked('posts', get_option('show_on_front')); ?> />
894                <?php _e('Your latest posts'); ?>
895@@ -37,29 +37,29 @@
896        </p>
897 </div>
898 <?php endif; ?>
899-</td>
900+</fieldset></td>
901 </tr>
902 <?php endif; ?>
903 <tr valign="top">
904-<th scope="row"><?php _e('Blog pages show at most') ?></th>
905+<th scope="row"><label for="posts_per_page"><?php _e('Blog pages show at most') ?></label></th>
906 <td>
907 <input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" size="3" /> <?php _e('posts') ?>
908 </td>
909 </tr>
910 <tr valign="top">
911-<th scope="row"><?php _e('Syndication feeds show the most recent') ?></th>
912+<th scope="row"><label for="posts_per_rss"><?php _e('Syndication feeds show the most recent') ?></label></th>
913 <td><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php form_option('posts_per_rss'); ?>" size="3" /> <?php _e('posts') ?></td>
914 </tr>
915 <tr valign="top">
916 <th scope="row"><?php _e('For each article in a feed, show') ?> </th>
917-<td>
918+<td><fieldset><legend class="hidden"><?php _e('For each article in a feed, show') ?> </legend>
919 <p><label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_option('rss_use_excerpt')); ?>    /> <?php _e('Full text') ?></label><br />
920 <label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label></p>
921-</td>
922+</fieldset></td>
923 </tr>
924 
925 <tr valign="top">
926-<th scope="row"><?php _e('Encoding for pages and feeds') ?></th>
927+<th scope="row"><label for="blog_charset"><?php _e('Encoding for pages and feeds') ?></label></th>
928 <td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option('blog_charset'); ?>" size="20" class="code" /><br />
929 <?php _e('The character encoding you write your blog in (UTF-8 is <a href="http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html">recommended</a>)') ?></td>
930 </tr>
931Index: wp-admin/options-writing.php
932===================================================================
933--- wp-admin/options-writing.php        (revision 7858)
934+++ wp-admin/options-writing.php        (working copy)
935@@ -14,21 +14,21 @@
936 
937 <table class="form-table">
938 <tr valign="top">
939-<th scope="row"> <?php _e('Size of the post box') ?></th>
940+<th scope="row"><label for="default_post_edit_rows"> <?php _e('Size of the post box') ?></label></th>
941 <td><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php form_option('default_post_edit_rows'); ?>" size="2" style="width: 1.5em;" />
942 <?php _e('lines') ?></td>
943 </tr>
944 <tr valign="top">
945 <th scope="row"><?php _e('Formatting') ?></th>
946-<td>
947+<td><fieldset><legend class="hidden"><?php _e('Formatting') ?></legend>
948 <label for="use_smilies">
949 <input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked('1', get_option('use_smilies')); ?> />
950 <?php _e('Convert emoticons like <code>:-)</code> and <code>:-P</code> to graphics on display') ?></label><br />
951 <label for="use_balanceTags"><input name="use_balanceTags" type="checkbox" id="use_balanceTags" value="1" <?php checked('1', get_option('use_balanceTags')); ?> /> <?php _e('WordPress should correct invalidly nested XHTML automatically') ?></label>
952-</td>
953+</fieldset></td>
954 </tr>
955 <tr valign="top">
956-<th scope="row"><?php _e('Default Post Category') ?></th>
957+<th scope="row"><label for="default_category"><?php _e('Default Post Category') ?></label></th>
958 <td><select name="default_category" id="default_category">
959 <?php
960 $categories = get_categories('get=all');
961@@ -42,7 +42,7 @@
962 </select></td>
963 </tr>
964 <tr valign="top">
965-<th scope="row"><?php _e('Default Link Category') ?></th>
966+<th scope="row"><label for="default_link_category"><?php _e('Default Link Category') ?></label></th>
967 <td><select name="default_link_category" id="default_link_category">
968 <?php
969 $link_categories = get_terms('link_category', 'get=all');
970@@ -62,24 +62,24 @@
971 
972 <table class="form-table">
973 <tr valign="top">
974-<th scope="row"><?php _e('Mail Server') ?></th>
975+<th scope="row"><label for="mailserver_url"><?php _e('Mail Server') ?></label></th>
976 <td><input name="mailserver_url" type="text" id="mailserver_url" value="<?php form_option('mailserver_url'); ?>" size="40" />
977 <label for="mailserver_port"><?php _e('Port') ?></label>
978 <input name="mailserver_port" type="text" id="mailserver_port" value="<?php form_option('mailserver_port'); ?>" size="6" />
979 </td>
980 </tr>
981 <tr valign="top">
982-<th scope="row"><?php _e('Login Name') ?></th>
983+<th scope="row"><label for="mailserver_login"><?php _e('Login Name') ?></label></th>
984 <td><input name="mailserver_login" type="text" id="mailserver_login" value="<?php form_option('mailserver_login'); ?>" size="40" /></td>
985 </tr>
986 <tr valign="top">
987-<th scope="row"><?php _e('Password') ?></th>
988+<th scope="row"><label for="mailserver_pass"><?php _e('Password') ?></label></th>
989 <td>
990 <input name="mailserver_pass" type="text" id="mailserver_pass" value="<?php form_option('mailserver_pass'); ?>" size="40" />
991 </td>
992 </tr>
993 <tr valign="top">
994-<th scope="row"><?php _e('Default Mail Category') ?></th>
995+<th scope="row"><label for="default_email_category"><?php _e('Default Mail Category') ?></label></th>
996 <td><select name="default_email_category" id="default_email_category">
997 <?php
998 //Alreay have $categories from default_category
999@@ -98,7 +98,7 @@
1000 
1001 <?php if ( get_option('blog_public') ) : ?>
1002 
1003-<p><?php _e('When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="http://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service <abbr title="Universal Resource Locator">URL</abbr>s with line breaks.') ?></p>
1004+<p><label for="ping_sites"><?php _e('When you publish a new post, WordPress automatically notifies the following site update services. For more about this, see <a href="http://codex.wordpress.org/Update_Services">Update Services</a> on the Codex. Separate multiple service <abbr title="Universal Resource Locator">URL</abbr>s with line breaks.') ?></label></p>
1005 
1006 <textarea name="ping_sites" id="ping_sites" style="width: 98%;" rows="3" cols="50"><?php form_option('ping_sites'); ?></textarea>
1007 
1008Index: wp-admin/options.php
1009===================================================================
1010--- wp-admin/options.php        (revision 7858)
1011+++ wp-admin/options.php        (working copy)
1012@@ -73,7 +73,7 @@
1013        }
1014        echo "
1015 <tr>
1016-       <th scope='row'>$option->option_name</th>
1017+       <th scope='row'><label for='$option->option_name'>$option->option_name</label></th>
1018 <td>";
1019 
1020        if (strpos($value, "\n") !== false) echo "<textarea class='$class' name='$option->option_name' id='$option->option_name' cols='30' rows='5'>" . wp_specialchars($value) . "</textarea>";
1021Index: wp-admin/setup-config.php
1022===================================================================
1023--- wp-admin/setup-config.php   (revision 7858)
1024+++ wp-admin/setup-config.php   (working copy)
1025@@ -68,28 +68,28 @@
1026        <p>Below you should enter your database connection details. If you're not sure about these, contact your host. </p>
1027        <table class="form-table">
1028                <tr>
1029-                       <th scope="row">Database Name</th>
1030-                       <td><input name="dbname" type="text" size="25" value="wordpress" /></td>
1031+                       <th scope="row"><label for="dbname">Database Name</label></th>
1032+                       <td><input name="dbname" id="dbname" type="text" size="25" value="wordpress" /></td>
1033                        <td>The name of the database you want to run WP in. </td>
1034                </tr>
1035                <tr>
1036-                       <th scope="row">User Name</th>
1037-                       <td><input name="uname" type="text" size="25" value="username" /></td>
1038+                       <th scope="row"><label for="uname">User Name</label></th>
1039+                       <td><input name="uname" id="uname" type="text" size="25" value="username" /></td>
1040                        <td>Your MySQL username</td>
1041                </tr>
1042                <tr>
1043-                       <th scope="row">Password</th>
1044-                       <td><input name="pwd" type="text" size="25" value="password" /></td>
1045+                       <th scope="row"><label for="pwd">Password</label></th>
1046+                       <td><input name="pwd" id="pwd" type="text" size="25" value="password" /></td>
1047                        <td>...and MySQL password.</td>
1048                </tr>
1049                <tr>
1050-                       <th scope="row">Database Host</th>
1051-                       <td><input name="dbhost" type="text" size="25" value="localhost" /></td>
1052+                       <th scope="row"><label for="dbhost">Database Host</label></th>
1053+                       <td><input name="dbhost" id="dbhost" type="text" size="25" value="localhost" /></td>
1054                        <td>99% chance you won't need to change this value.</td>
1055                </tr>
1056                <tr>
1057-                       <th scope="row">Table Prefix</th>
1058-                       <td><input name="prefix" type="text" id="prefix" value="wp_" size="25" /></td>
1059+                       <th scope="row"><label for="prefix">Table Prefix</label></th>
1060+                       <td><input name="prefix" id="prefix" type="text" id="prefix" value="wp_" size="25" /></td>
1061                        <td>If you want to run multiple WordPress installations in a single database, change this.</td>
1062                </tr>
1063        </table>
1064Index: wp-admin/sidebar.php
1065===================================================================
1066--- wp-admin/sidebar.php        (revision 7858)
1067+++ wp-admin/sidebar.php        (working copy)
1068@@ -60,8 +60,8 @@
1069 <input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />
1070 <input type="hidden" name="mode" value="sidebar" />
1071 <?php wp_nonce_field('add-post'); ?>
1072-<p><?php _e('Title:'); ?>
1073-<input type="text" name="post_title" size="20" tabindex="1" style="width: 100%;" />
1074+<p><label for="post_title"><?php _e('Title:'); ?></label>
1075+<input type="text" name="post_title" id="post_title" size="20" tabindex="1" style="width: 100%;" />
1076 </p>
1077 <p><?php _e('Categories:'); ?>
1078 <span class="sidebar-categories">
1079@@ -69,8 +69,8 @@
1080 </span>
1081 </p>
1082 <p>
1083-Post:
1084-<textarea rows="8" cols="12" style="width: 100%" name="content" tabindex="2"></textarea>
1085+<label for="content">Post:</label>
1086+<textarea rows="8" cols="12" style="width: 100%" name="content" id="content" tabindex="2"></textarea>
1087 </p>
1088 <p>
1089        <input name="saveasdraft" type="submit" id="saveasdraft" tabindex="9" value="<?php _e('Save as Draft'); ?>" />
1090Index: wp-admin/theme-editor.php
1091===================================================================
1092--- wp-admin/theme-editor.php   (revision 7858)
1093+++ wp-admin/theme-editor.php   (working copy)
1094@@ -92,7 +92,7 @@
1095 <div class="bordertitle">
1096        <h2><?php _e('Theme Editor'); ?></h2>
1097        <form id="themeselector" name="theme" action="theme-editor.php" method="post">
1098-               <strong><?php _e('Select theme to edit:'); ?> </strong>
1099+               <strong><label for="theme"><?php _e('Select theme to edit:'); ?> </label></strong>
1100                <select name="theme" id="theme">
1101 <?php
1102        foreach ($themes as $a_theme) {
1103Index: wp-admin/update.php
1104===================================================================
1105--- wp-admin/update.php (revision 7858)
1106+++ wp-admin/update.php (working copy)
1107@@ -45,19 +45,19 @@
1108 <p><?php _e('To perform the requested update, FTP connection information is required.') ?></p>
1109 <table class="form-table">
1110 <tr valign="top">
1111-<th scope="row"><?php _e('Hostname:') ?></th>
1112+<th scope="row"><label for="hostname"><?php _e('Hostname:') ?></label></th>
1113 <td><input name="hostname" type="text" id="hostname" value="<?php echo attribute_escape($hostname) ?>"<?php if( defined('FTP_HOST') ) echo ' disabled="disabled"' ?> size="40" /></td>
1114 </tr>
1115 <tr valign="top">
1116-<th scope="row"><?php _e('Username:') ?></th>
1117+<th scope="row"><label for="username"><?php _e('Username:') ?></label></th>
1118 <td><input name="username" type="text" id="username" value="<?php echo attribute_escape($username) ?>"<?php if( defined('FTP_USER') ) echo ' disabled="disabled"' ?> size="40" /></td>
1119 </tr>
1120 <tr valign="top">
1121-<th scope="row"><?php _e('Password:') ?></th>
1122+<th scope="row"><label for="password"><?php _e('Password:') ?></label></th>
1123 <td><input name="password" type="password" id="password" value=""<?php if( defined('FTP_PASS') ) echo ' disabled="disabled"' ?> size="40" /><?php if( defined('FTP_PASS') && !empty($password) ) echo '<em>'.__('(Password not shown)').'</em>'; ?></td>
1124 </tr>
1125 <tr valign="top">
1126-<th scope="row"><?php _e('Use SSL:') ?></th>
1127+<th scope="row"><label for="ssl"><?php _e('Use SSL:') ?></label></th>
1128 <td>
1129 <select name="ssl" id="ssl"<?php if( defined('FTP_SSL') ) echo ' disabled="disabled"' ?>>
1130 <?php
1131Index: wp-admin/upload.php
1132===================================================================
1133--- wp-admin/upload.php (revision 7858)
1134+++ wp-admin/upload.php (working copy)
1135@@ -125,6 +125,7 @@
1136 ?>
1137 
1138 <p id="post-search">
1139+       <label class="hidden" for="post-search-input"><?php _e( 'Search Media' ); ?>:</label>
1140        <input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
1141        <input type="submit" value="<?php _e( 'Search Media' ); ?>" class="button" />
1142 </p>
1143Index: wp-admin/user-edit.php
1144===================================================================
1145--- wp-admin/user-edit.php      (revision 7858)
1146+++ wp-admin/user-edit.php      (working copy)
1147@@ -162,7 +162,7 @@
1148 <?php endif; ?>
1149 <tr>
1150 <th scope="row"><?php _e('Admin Color Scheme')?></th>
1151-<td>
1152+<td><fieldset><legend class="hidden"><?php _e('Admin Color Scheme')?></legend>
1153 <?php
1154 $current_color = get_user_option('admin_color');
1155 if ( empty($current_color) )
1156@@ -181,7 +181,7 @@
1157        <label for="admin_color_<?php echo $color; ?>"><?php echo $color_info->name ?></label>
1158 </div>
1159 <?php endforeach; ?>
1160-</td>
1161+</fieldset></td>
1162 </tr>
1163 </table>
1164 
1165Index: wp-admin/users.php
1166===================================================================
1167--- wp-admin/users.php  (revision 7858)
1168+++ wp-admin/users.php  (working copy)
1169@@ -145,13 +145,13 @@
1170        ?>
1171        </ul>
1172 <?php if ( $go_delete ) : ?>
1173-       <p><?php _e('What should be done with posts and links owned by this user?'); ?></p>
1174+       <fieldset><p><legend><?php _e('What should be done with posts and links owned by this user?'); ?></legend></p>
1175        <ul style="list-style:none;">
1176                <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" checked="checked" />
1177                <?php _e('Delete all posts and links.'); ?></label></li>
1178                <li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
1179                <?php echo '<label for="delete_option1">'.__('Attribute all posts and links to:')."</label> $user_dropdown"; ?></li>
1180-       </ul>
1181+       </ul></fieldset>
1182        <input type="hidden" name="action" value="dodelete" />
1183        <p class="submit"><input type="submit" name="submit" value="<?php _e('Confirm Deletion'); ?>" class="button-secondary" /></p>
1184 <?php else : ?>
1185@@ -287,6 +287,7 @@
1186 ?>
1187 </ul>
1188        <p id="post-search">
1189+       <label class="hidden" for="post-search-input"><?php _e( 'Search Users' ); ?>:</label>
1190        <input type="text" id="post-search-input" name="usersearch" value="<?php echo attribute_escape($wp_user_search->search_term); ?>" />
1191        <input type="submit" value="<?php _e( 'Search Users' ); ?>" class="button" />
1192        </p>
1193@@ -403,29 +404,29 @@
1194 <?php wp_nonce_field('add-user') ?>
1195 <table class="form-table">
1196        <tr class="form-field form-required">
1197-               <th scope="row"><?php _e('Username (required)') ?><input name="action" type="hidden" id="action" value="adduser" /></th>
1198+               <th scope="row"><label for="user_login"><?php _e('Username (required)') ?></label><input name="action" type="hidden" id="action" value="adduser" /></th>
1199                <td ><input name="user_login" type="text" id="user_login" value="<?php echo $new_user_login; ?>" /></td>
1200        </tr>
1201        <tr class="form-field">
1202-               <th scope="row"><?php _e('First Name') ?> </th>
1203+               <th scope="row"><label for="first_name"><?php _e('First Name') ?> </label></th>
1204                <td><input name="first_name" type="text" id="first_name" value="<?php echo $new_user_firstname; ?>" /></td>
1205        </tr>
1206        <tr class="form-field">
1207-               <th scope="row"><?php _e('Last Name') ?> </th>
1208+               <th scope="row"><label for="last_name"><?php _e('Last Name') ?> </label></th>
1209                <td><input name="last_name" type="text" id="last_name" value="<?php echo $new_user_lastname; ?>" /></td>
1210        </tr>
1211        <tr class="form-field form-required">
1212-               <th scope="row"><?php _e('E-mail (required)') ?></th>
1213+               <th scope="row"><label for="email"><?php _e('E-mail (required)') ?></label></th>
1214                <td><input name="email" type="text" id="email" value="<?php echo $new_user_email; ?>" /></td>
1215        </tr>
1216        <tr class="form-field">
1217-               <th scope="row"><?php _e('Website') ?></th>
1218+               <th scope="row"><label for="url"><?php _e('Website') ?></label></th>
1219                <td><input name="url" type="text" id="url" value="<?php echo $new_user_uri; ?>" /></td>
1220        </tr>
1221 
1222 <?php if ( apply_filters('show_password_fields', true) ) : ?>
1223        <tr class="form-field form-required">
1224-               <th scope="row"><?php _e('Password (twice)') ?> </th>
1225+               <th scope="row"><label for="pass1"><?php _e('Password (twice)') ?> </label></th>
1226                <td><input name="pass1" type="password" id="pass1" />
1227                <br />
1228                <input name="pass2" type="password" id="pass2" /></td>
1229@@ -433,7 +434,7 @@
1230 <?php endif; ?>
1231 
1232        <tr class="form-field">
1233-               <th scope="row"><?php _e('Role'); ?></th>
1234+               <th scope="row"><label for="role"><?php _e('Role'); ?></label></th>
1235                <td><select name="role" id="role">
1236                        <?php
1237                        if ( !$new_user_role )
1238Index: wp-admin/widgets.php
1239===================================================================
1240--- wp-admin/widgets.php        (revision 7858)
1241+++ wp-admin/widgets.php        (working copy)
1242@@ -232,15 +232,16 @@
1243 
1244        <h2><?php _e( 'Widgets' ); ?></h2>
1245        <p id="widget-search">
1246+               <label class="hidden" for="widget-search-input"><?php _e( 'Search Widgets' ); ?>:</label>
1247                <input type="text" id="widget-search-input" name="s" value="<?php echo attribute_escape( $widget_search ); ?>" />
1248                <input type="submit" class="button" value="<?php _e( 'Search Widgets' ); ?>" />
1249        </p>
1250 
1251        <div class="widget-liquid-left-holder">
1252        <div id="available-widgets-filter" class="widget-liquid-left">
1253-               <h3><?php _e('Available Widgets'); ?></h3>
1254+               <h3><label for="show"><?php _e('Available Widgets'); ?></label></h3>
1255                <div class="nav">
1256-                       <select name="show">
1257+                       <select name="show" id="show">
1258 <?php foreach ( $show_values as $show_value => $show_text ) : $show_value = attribute_escape( $show_value ); ?>
1259                                <option value='<?php echo $show_value; ?>'<?php selected( $show_value, $show ); ?>><?php echo wp_specialchars( $show_text ); ?></option>
1260 <?php endforeach; ?>
1261@@ -254,7 +255,7 @@
1262        </div>
1263 
1264        <div id="available-sidebars" class="widget-liquid-right">
1265-               <h3><?php _e('Current Widgets'); ?></h3>
1266+               <h3><label for="sidebar-selector"><?php _e('Current Widgets'); ?></label></h3>
1267 
1268                <div class="nav">
1269                        <select id="sidebar-selector" name="sidebar">
1270Index: wp-admin/wp-admin.css
1271===================================================================
1272--- wp-admin/wp-admin.css       (revision 7858)
1273+++ wp-admin/wp-admin.css       (working copy)
1274@@ -1507,3 +1507,9 @@
1275 #wp-word-count {
1276        display: block;
1277 }
1278+
1279+fieldset {
1280+       border: 0;
1281+       padding: 0;
1282+       margin: 0;
1283+}
1284Index: wp-content/themes/default/searchform.php
1285===================================================================
1286--- wp-content/themes/default/searchform.php    (revision 7858)
1287+++ wp-content/themes/default/searchform.php    (working copy)
1288@@ -1,4 +1,5 @@
1289 <form method="get" id="searchform" action="<?php bloginfo('url'); ?>/">
1290+<label class="hidden" for="s"><?php _e('Search for:'); ?></label>
1291 <div><input type="text" value="<?php the_search_query(); ?>" name="s" id="s" />
1292 <input type="submit" id="searchsubmit" value="Search" />
1293 </div>
1294Index: wp-content/themes/default/style.css
1295===================================================================
1296--- wp-content/themes/default/style.css (revision 7858)
1297+++ wp-content/themes/default/style.css (working copy)
1298@@ -616,6 +616,10 @@
1299        text-align: center;
1300        }
1301 
1302+.hidden {
1303+       display: none;
1304+       }
1305+
1306 hr {
1307        display: none;
1308        }
1309Index: wp-includes/widgets.php
1310===================================================================
1311--- wp-includes/widgets.php     (revision 7858)
1312+++ wp-includes/widgets.php     (working copy)
1313@@ -461,6 +461,7 @@
1314                <?php echo $before_widget; ?>
1315                        <form id="searchform" method="get" action="<?php bloginfo('home'); ?>">
1316                        <div>
1317+                       <label class="hidden" for="s"><?php _e('Search for:'); ?></label>
1318                        <input type="text" name="s" id="s" size="15" /><br />
1319                        <input type="submit" value="<?php echo attribute_escape(__('Search')); ?>" />
1320                        </div>