WP Merge with revision 8075

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1328 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 9 insertions, 9 deletions

diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 147841a..18181ff 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -16,7 +16,7 @@ include('admin-header.php');
 <?php if ( get_pages() ): ?>
 <tr valign="top">
 <th scope="row"><?php _e('Front page displays')?></th>
-<td>
+<td><fieldset><legend class="hidden"><?php _e('Front page displays')?></legend>
 	<p><label>
 		<input name="show_on_front" type="radio" value="posts" class="tog" <?php checked('posts', get_option('show_on_front')); ?> />
 		<?php _e('Your latest posts'); ?>
@@ -28,8 +28,8 @@ include('admin-header.php');
 	</label>
 	</p>
 <ul>
-	<li><?php printf(__('Front page: %s'), wp_dropdown_pages("name=page_on_front&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_on_front'))); ?></li>
-	<li><?php printf(__('Posts page: %s'), wp_dropdown_pages("name=page_for_posts&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_for_posts'))); ?></li>
+	<li><?php printf("<label for='page_on_front'>".__('Front page: %s')."</label>", wp_dropdown_pages("name=page_on_front&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_on_front'))); ?></li>
+	<li><?php printf("<label for='page_for_posts'>".__('Posts page: %s')."</label>", wp_dropdown_pages("name=page_for_posts&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_for_posts'))); ?></li>
 </ul>
 <?php if ( 'page' == get_option('show_on_front') && get_option('page_for_posts') == get_option('page_on_front') ) : ?>
 <div id="front-page-warning" class="updated fade-ff0000">
@@ -38,29 +38,29 @@ include('admin-header.php');
 	</p>
 </div>
 <?php endif; ?>
-</td>
+</fieldset></td>
 </tr>
 <?php endif; ?>
 <tr valign="top">
-<th scope="row"><?php _e('Blog pages show at most') ?></th>
+<th scope="row"><label for="posts_per_page"><?php _e('Blog pages show at most') ?></label></th>
 <td>
 <input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" size="3" /> <?php _e('posts') ?>
 </td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Syndication feeds show the most recent') ?></th>
+<th scope="row"><label for="posts_per_rss"><?php _e('Syndication feeds show the most recent') ?></label></th>
 <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>
 </tr>
 <tr valign="top">
 <th scope="row"><?php _e('For each article in a feed, show') ?> </th>
-<td>
+<td><fieldset><legend class="hidden"><?php _e('For each article in a feed, show') ?> </legend>
 <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 />
 <label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label></p>
-</td>
+</fieldset></td>
 </tr>
 
 <tr valign="top">
-<th scope="row"><?php _e('Encoding for pages and feeds') ?></th>
+<th scope="row"><label for="blog_charset"><?php _e('Encoding for pages and feeds') ?></label></th>
 <td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option('blog_charset'); ?>" size="20" class="code" /><br />
 <?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>
 </tr>