From 1551a9298b3a86371260f5e278271845e9c9bed5 Mon Sep 17 00:00:00 2001
From: matt <matt@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 24 Mar 2008 08:28:15 +0000
Subject: [PATCH] Some options juggling to put things where they fit a little
 better, and more exposition around the more obtuse options.

git-svn-id: http://svn.automattic.com/wordpress/trunk@7498 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-discussion.php | 39 ++++++++++++++++++++++++++++++++-
 wp-admin/options-general.php    |  5 +++--
 wp-admin/options-misc.php       | 31 +++++++++++++++++++++++++-
 wp-admin/options-reading.php    | 31 ++------------------------
 wp-admin/options-writing.php    | 28 +----------------------
 5 files changed, 74 insertions(+), 60 deletions(-)

diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index bc5a73ecbd..69c0bbd359 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -76,9 +76,46 @@ include('admin-header.php');
 </tr>
 </table>
 
+<h3><?php _e('Avatars') ?></h3>
+
+<p><?php _e('By default WordPress uses <a href="http://gravatar.com/">Gravatars</a> &#8212; short for Globally Recognized Avatars &#8212; for the pictures that show up next to comments. Plugins may override this.'); ?></p>
+
+<?php // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that? ?>
+
+<table class="form-table">
+<tr valign="top">
+<th scope="row"><?php _e('Avatar display') ?></th>
+<td>
+<?php
+	$yesorno = array(0 => __("Don&#8217;t show Avatars"), 1 => __('Show Avatars'));
+	foreach ( $yesorno as $key => $value) {
+		$selected = (get_option('show_avatars') == $key) ? 'checked="checked"' : '';
+		echo "\n\t<label><input type='radio' name='show_avatars' value='$key' $selected> $value</label><br />";
+	}
+?>
+</td>
+</tr>
+<tr valign="top">
+<th scope="row"><?php _e('Maximum Rating') ?></th>
+<td>
+
+<?php
+$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'));
+foreach ($ratings as $key => $rating) :
+	$selected = (get_option('avatar_rating') == $key) ? 'checked="checked"' : '';
+	echo "\n\t<label><input type='radio' name='avatar_rating' value='$key' $selected> $rating</label><br />";
+endforeach;
+?>
+
+</td>
+</tr>
+
+</table>
+
+
 <p class="submit">
 <input type="hidden" name="action" value="update" />
-<input type="hidden" name="page_options" value="default_pingback_flag,default_ping_status,default_comment_status,comments_notify,moderation_notify,comment_moderation,require_name_email,comment_whitelist,comment_max_links,moderation_keys,blacklist_keys" />
+<input type="hidden" name="page_options" value="default_pingback_flag,default_ping_status,default_comment_status,comments_notify,moderation_notify,comment_moderation,require_name_email,comment_whitelist,comment_max_links,moderation_keys,blacklist_keys,show_avatars,avatar_rating" />
 <input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 </p>
 </form>
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index cfde4b7a5e..680f7ae982 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -34,7 +34,7 @@ include('./admin-header.php');
 <th scope="row"><?php _e('E-mail address') ?> </th>
 <td><input name="admin_email" type="text" id="admin_email" value="<?php form_option('admin_email'); ?>" size="40" class="code" />
 <br />
-<?php _e('This address is used only for admin purposes.') ?></td>
+<?php _e('This address is used for admin purposes, like new user notification.') ?></td>
 </tr>
 <tr valign="top">
 <th scope="row"><?php _e('Membership') ?></th>
@@ -82,7 +82,8 @@ foreach ( $offset_range as $offset ) {
 </select>
 <?php _e('hours') ?><br />
 <?php printf(__('<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>'), gmdate(__('Y-m-d G:i:s'))); ?><br />
-<?php if ($current_offset) printf(__('UTC %1$s is <code>%2$s</code>'), $current_offset_name, gmdate(__('Y-m-d G:i:s'), current_time('timestamp'))); ?>
+<?php if ($current_offset) printf(__('UTC %1$s is <code>%2$s</code>'), $current_offset_name, gmdate(__('Y-m-d G:i:s'), current_time('timestamp'))); ?><br />
+<?php _e('Unfortunately, you have to manually update this for Daylight Savings Time. Lame, we know, but will be fixed in the future.'); ?>
 </td>
 </tr>
 <tr>
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index d7a8b1b71b..6cf0c154cb 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -38,8 +38,36 @@ include('admin-header.php');
 </tr>
 </table>
 
+<h3><?php _e('Image sizes') ?></h3>
+<p><?php _e('The sizes listed below determine the maximum dimensions to use when inserting an image into the body of a post.'); ?></p>
 
 <table class="form-table">
+<tr valign="top">
+<th scope="row"><?php _e('Thumbnail size') ?></th>
+<td>
+<label for="thumbnail_size_w"><?php _e('Width'); ?></label>
+<input name="thumbnail_size_w" type="text" id="thumbnail_size_w" value="<?php form_option('thumbnail_size_w'); ?>" size="6" />
+<label for="thumbnail_size_h"><?php _e('Height'); ?></label>
+<input name="thumbnail_size_h" type="text" id="thumbnail_size_h" value="<?php form_option('thumbnail_size_h'); ?>" size="6" /><br />
+<input name="thumbnail_crop" type="checkbox" id="thumbnail_crop" value="1" <?php checked('1', get_option('thumbnail_crop')); ?>/>
+<label for="thumbnail_crop"><?php _e('Crop thumbnail to exact dimensions (normally thumbnails are proportional)'); ?></label>
+</td>
+</tr>
+<tr valign="top">
+<th scope="row"><?php _e('Medium size') ?></th>
+<td>
+<label for="medium_size_w"><?php _e('Max Width'); ?></label>
+<input name="medium_size_w" type="text" id="medium_size_w" value="<?php form_option('medium_size_w'); ?>" size="6" />
+<label for="medium_size_h"><?php _e('Max Height'); ?></label>
+<input name="medium_size_h" type="text" id="medium_size_h" value="<?php form_option('medium_size_h'); ?>" size="6" />
+</td>
+</tr>
+</table>
+
+
+
+<table class="form-table">
+
 <tr>
 <th scope="row" class="th-full">
 <label for="use_linksupdate">
@@ -57,11 +85,12 @@ include('admin-header.php');
 </label>
 </th>
 </tr>
+
 </table>
 
 <p class="submit">
 <input type="hidden" name="action" value="update" />
-<input type="hidden" name="page_options" value="hack_file,use_linksupdate,uploads_use_yearmonth_folders,upload_path,upload_url_path" />
+<input type="hidden" name="page_options" value="hack_file,use_linksupdate,uploads_use_yearmonth_folders,upload_path,upload_url_path,thumbnail_size_w,thumbnail_size_h,thumbnail_crop,medium_size_w,medium_size_h" />
 <input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" class="button" />
 </p>
 </form>
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 794af8476d..82c5049af4 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -57,34 +57,7 @@ include('admin-header.php');
 <label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label></p>
 </td>
 </tr>
-<tr valign="top">
-<th scope="row"><?php _e('Avatar display') ?></th>
-<td>
-<select name="show_avatars" id="show_avatars">
-<?php
-	$yesorno = array(0 => __("Don't show Avatars"), 1 => __('Show Avatars'));
-	foreach ( $yesorno as $key => $value) {
-		$selected = (get_option('show_avatars') == $key) ? 'selected="selected"' : '';
-		echo "\n\t<option value='$key' $selected>$value</option>";
-	}
-?>
-</select>
-</td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Show Avatars with Rating') ?></th>
-<td>
-<select name="avatar_rating" id="avatar_rating">
-<?php
-$ratings = array( 'G' => _c('G|rating'), 'PG' => _c('PG|Rating'), 'R' => _c('R|Rating'), 'X' => _c('X|Rating'));
-foreach ($ratings as $key => $rating) :
-	$selected = (get_option('avatar_rating') == $key) ? 'selected="selected"' : '';
-	echo "\n\t<option value='$key' $selected>$rating</option>";
-endforeach;
-?>
-</select>
-</td>
-</tr>
+
 <tr valign="top">
 <th 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 />
@@ -93,7 +66,7 @@ endforeach;
 </table>
 <p class="submit">
 <input type="hidden" name="action" value="update" />
-<input type="hidden" name="page_options" value="posts_per_page,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression,show_on_front,page_on_front,page_for_posts,show_avatars,avatar_rating" />
+<input type="hidden" name="page_options" value="posts_per_page,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression,show_on_front,page_on_front,page_for_posts" />
 <input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 </p>
 </form>
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 95a2a16e1c..645bfc7904 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -57,32 +57,6 @@ endforeach;
 </tr>
 </table>
 
-<h3><?php _e('Image sizes') ?></h3>
-<p><?php _e('The sizes listed below determine the maximum dimensions to use when inserting an image into the body of a post.'); ?></p>
-
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><?php _e('Thumbnail size') ?></th>
-<td>
-<label for="thumbnail_size_w"><?php _e('Width'); ?></label>
-<input name="thumbnail_size_w" type="text" id="thumbnail_size_w" value="<?php form_option('thumbnail_size_w'); ?>" size="6" />
-<label for="thumbnail_size_h"><?php _e('Height'); ?></label>
-<input name="thumbnail_size_h" type="text" id="thumbnail_size_h" value="<?php form_option('thumbnail_size_h'); ?>" size="6" />
-<input name="thumbnail_crop" type="checkbox" id="thumbnail_crop" value="1" <?php checked('1', get_option('thumbnail_crop')); ?>/>
-<label for="thumbnail_crop"><?php _e('Crop to size'); ?></label>
-</td>
-</tr>
-<tr valign="top">
-<th scope="row"><?php _e('Medium size') ?></th>
-<td>
-<label for="medium_size_w"><?php _e('Width'); ?></label>
-<input name="medium_size_w" type="text" id="medium_size_w" value="<?php form_option('medium_size_w'); ?>" size="6" />
-<label for="medium_size_h"><?php _e('Height'); ?></label>
-<input name="medium_size_h" type="text" id="medium_size_h" value="<?php form_option('medium_size_h'); ?>" size="6" />
-</td>
-</tr>
-</table>
-
 <h3><?php _e('Post via e-mail') ?></h3>
 <p><?php printf(__('To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: <code>%s</code>, <code>%s</code>, <code>%s</code>.'), wp_generate_password(), wp_generate_password(), wp_generate_password()) ?></p>
 
@@ -136,7 +110,7 @@ endforeach;
 
 <p class="submit">
 <input type="hidden" name="action" value="update" />
-<input type="hidden" name="page_options" value="default_post_edit_rows,use_smilies,ping_sites,mailserver_url,mailserver_port,mailserver_login,mailserver_pass,default_category,default_email_category,use_balanceTags,default_link_category,thumbnail_size_w,thumbnail_size_h,thumbnail_crop,medium_size_w,medium_size_h" />
+<input type="hidden" name="page_options" value="default_post_edit_rows,use_smilies,ping_sites,mailserver_url,mailserver_port,mailserver_login,mailserver_pass,default_category,default_email_category,use_balanceTags,default_link_category" />
 <input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 </p>
 </form>