X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/ff81ee6e8304a1982a3ec4f5b134764a29d502cf..9c40b4d36daed9e28e48a5fe9205c32557195a4b:/wp-admin/options-reading.php?ds=sidebyside

diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 30f06d27..64410c38 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -1,63 +1,87 @@
 <?php
+/**
+ * Reading settings administration panel.
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** WordPress Administration Bootstrap */
 require_once('admin.php');
 
-$title = __('Reading Options');
+$title = __('Reading Settings');
 $parent_file = 'options-general.php';
 
 include('admin-header.php');
 ?>
 
-<div class="wrap"> 
-<h2><?php _e('Reading Options') ?></h2> 
-<form name="form1" method="post" action="options.php"> 
-<fieldset class="options"> 
-<legend><?php _e('Blog Pages') ?></legend> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
-<tr valign="top"> 
-<th width="33%" scope="row"><?php _e('Show at most:') ?></th> 
-<td>
-<input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" size="3" /> 
-<select name="what_to_show" id="what_to_show" > 
-<option value="days" <?php selected('days', get_settings('what_to_show')); ?>><?php _e('days') ?></option> 
-<option value="posts" <?php selected('posts', get_settings('what_to_show')); ?>><?php _e('posts') ?></option> 
-</select>
-</td> 
-</tr> 
-</table> 
-</fieldset> 
-
-<fieldset class="options"> 
-<legend><?php _e('Syndication Feeds') ?></legend> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
-<tr valign="top"> 
-<th width="33%" scope="row"><?php _e('Show the most recent:') ?></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> 
+<div class="wrap">
+<?php screen_icon(); ?>
+<h2><?php echo esc_html( $title ); ?></h2>
+
+<form name="form1" method="post" action="options.php">
+<?php settings_fields('reading'); ?>
+
+<table class="form-table">
+<?php if ( get_pages() ): ?>
+<tr valign="top">
+<th scope="row"><?php _e('Front page displays')?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Front page displays')?></span></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'); ?>
+	</label>
+	</p>
+	<p><label>
+		<input name="show_on_front" type="radio" value="page" class="tog" <?php checked('page', get_option('show_on_front')); ?> />
+		<?php printf(__('A <a href="%s">static page</a> (select below)'), 'edit-pages.php'); ?>
+	</label>
+	</p>
+<ul>
+	<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">
+	<p>
+		<?php _e('<strong>Warning:</strong> these pages should not be the same!'); ?>
+	</p>
+</div>
+<?php endif; ?>
+</fieldset></td>
 </tr>
+<?php endif; ?>
 <tr valign="top">
-<th scope="row"><?php _e('For each article, show:') ?> </th>
+<th scope="row"><label for="posts_per_page"><?php _e('Blog pages show at most') ?></label></th>
 <td>
-<label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_settings('rss_use_excerpt')); ?>  /> <?php _e('Full text') ?></label><br />
-<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_settings('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label>
+<input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" class="small-text" /> <?php _e('posts') ?>
 </td>
-</tr> 
-</table> 
-</fieldset> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
-<tr valign="top"> 
-<th width="33%" scope="row"><?php _e('Encoding for pages and feeds:') ?></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>
-</table> 
-<p>
-<label><input type="checkbox" name="gzipcompression" value="1" <?php checked('1', get_settings('gzipcompression')); ?> /> 
-<?php _e('WordPress should compress articles (gzip) if browsers ask for them') ?></label>
-</p>
+<tr valign="top">
+<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'); ?>" class="small-text" /> <?php _e('posts') ?></td>
+</tr>
+<tr valign="top">
+<th scope="row"><?php _e('For each article in a feed, show') ?> </th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('For each article in a feed, show') ?> </span></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>
+</fieldset></td>
+</tr>
+
+<tr valign="top">
+<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'); ?>" class="regular-text" />
+<span class="description"><?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>)') ?></span></td>
+</tr>
+<?php do_settings_fields('reading', 'default'); ?>
+</table>
+
+<?php do_settings_sections('reading'); ?>
+
 <p class="submit">
-<input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="posts_per_page,what_to_show,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression" /> 
-<input type="submit" name="Submit" value="<?php _e('Update Options') ?> &raquo;" /> 
-</p> 
-</form> 
-</div> 
-<?php include('./admin-footer.php'); ?>
\ No newline at end of file
+	<input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e('Save Changes') ?>" />
+</p>
+</form>
+</div>
+<?php include('./admin-footer.php'); ?>