From 7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Fri, 4 Apr 2008 16:44:15 +0000
Subject: Merged with WordPress 2.5, unstable, only for testing

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-admin/options-general.php | 126 +++++++++++++++++++++++--------------------
 1 file changed, 69 insertions(+), 57 deletions(-)

(limited to 'wp-admin/options-general.php')

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index d05e8db..e2be9c0 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -1,45 +1,96 @@
 <?php
 require_once('./admin.php');
 
-$title = __('General Options');
+$title = __('General Settings');
 $parent_file = 'options-general.php';
 
 include('./admin-header.php');
 ?>
 
 <div class="wrap">
-<h2><?php _e('General Options') ?></h2>
+<h2><?php _e('General Settings') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('general-options') ?>
 <input type='hidden' name='option_page' value='general' />
-<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p>
-<table class="optiontable">
+<table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e('Blog title:') ?></th>
+<th scope="row"><?php _e('Blog Title') ?></th>
 <td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" size="40" /></td>
 </tr>
 <tr valign="top">
-<th scope="row"><?php _e('Tagline:') ?></th>
+<th scope="row"><?php _e('Tagline') ?></th>
 <td><input name="blogdescription" type="text" id="blogdescription" style="width: 95%" value="<?php form_option('blogdescription'); ?>" size="45" />
 <br />
 <?php _e('In a few words, explain what this blog is about.') ?></td>
-</tr> 
-<tr valign="top"> 
-<th scope="row"><?php _e('Membership:') ?></th> 
+</tr>
+<tr valign="top">
+<th scope="row"><?php _e('E-mail address') ?> </th>
+<td><input name="new_admin_email" type="text" id="new_admin_email" value="<?php form_option('admin_email'); ?>" size="40" class="code" />
+<br />
+<?php _e('This address is used only for admin purposes.') ?> <?php _e('If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></td>
+</tr>
+<tr valign="top">
+<th scope="row"><?php _e('Membership') ?></th>
 <td> <label for="comment_registration">
 <input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> /> 
 <?php _e('Users must be registered and logged in to comment') ?>
 </label>
-</td> 
-</tr> 
-<tr valign="top"> 
-<th scope="row"><?php _e('E-mail address:') ?> </th> 
-<td><input name="new_admin_email" type="text" id="new_admin_email" value="<?php form_option('admin_email'); ?>" size="40" class="code" />
-<br />
-<p><?php _e('This address is used only for admin purposes.') ?> <?php _e('If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>') ?></p>
-</td> 
+</td>
 </tr>
+<tr>
+<th scope="row"><?php _e('Timezone') ?> </th>
+<td>
+<select name="gmt_offset">
+<?php
+$current_offset = get_option('gmt_offset');
+$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,
+	0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 5.75, 6, 6.5, 7, 7.5, 8, 8.5, 8.75, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 13.75, 14);
+foreach ( $offset_range as $offset ) {
+	if ( 0 < $offset )
+		$offset_name = '+' . $offset;
+	elseif ( 0 == $offset )
+		$offset_name = '';
+	else
+		$offset_name = (string) $offset;
 
+	$offset_name = str_replace(array('.25','.5','.75'), array(':15',':30',':45'), $offset_name);
+
+	$selected = '';
+	if ( $current_offset == $offset ) {
+		$selected = " selected='selected'";
+		$current_offset_name = $offset_name;
+	}
+	echo "<option value=\"$offset\"$selected>" . sprintf(__('UTC %s'), $offset_name) . '</option>';
+}
+?>
+</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'))); ?>
+</td>
+</tr>
+<tr>
+<th scope="row"><?php _e('Date Format') ?></th>
+<td><input name="date_format" type="text" id="date_format" size="30" value="<?php form_option('date_format'); ?>" /><br />
+<?php _e('Output:') ?> <strong><?php echo mysql2date(get_option('date_format'), current_time('mysql')); ?></strong></td>
+</tr>
+<tr>
+<th scope="row"><?php _e('Time Format') ?></th>
+<td><input name="time_format" type="text" id="time_format" size="30" value="<?php form_option('time_format'); ?>" /><br />
+<?php _e('Output:') ?> <strong><?php echo gmdate(get_option('time_format'), current_time('timestamp')); ?></strong><br />
+<?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>
+</tr>
+<tr>
+<th scope="row"><?php _e('Week Starts On') ?></th>
+<td><select name="start_of_week" id="start_of_week">
+<?php
+for ($day_index = 0; $day_index <= 6; $day_index++) :
+	$selected = (get_option('start_of_week') == $day_index) ? 'selected="selected"' : '';
+	echo "\n\t<option value='$day_index' $selected>" . $wp_locale->get_weekday($day_index) . '</option>';
+endfor;
+?>
+</select></td>
+</tr>
 <?php
 $lang_files = glob( ABSPATH . LANGDIR . '/*.mo' );
 $lang = get_option('WPLANG');
@@ -63,48 +114,9 @@ if( is_array( $lang_files ) ) {
 	<?php
 } // languages
 ?>
-</table> 
-<fieldset class="options"> 
-<legend><?php _e('Date and Time') ?></legend> 
-<table class="optiontable"> 
-<tr> 
-<th scope="row"><?php _e('<abbr title="Coordinated Universal Time">UTC</abbr> time is:') ?> </th> 
-<td><code><?php echo gmdate(__('Y-m-d g:i:s a')); ?></code></td> 
-</tr>
-<tr>
-<th scope="row"><?php _e('Times in the blog should differ by:') ?> </th>
-<td><input name="gmt_offset" type="text" id="gmt_offset" size="2" value="<?php form_option('gmt_offset'); ?>" />
-<?php _e('hours') ?> (<?php _e('Your timezone offset, for example <code>-6</code> for Central Time.'); ?>)</td>
-</tr>
-<tr>
-<th scope="row"><?php _e('Default date format:') ?></th>
-<td><input name="date_format" type="text" id="date_format" size="30" value="<?php form_option('date_format'); ?>" /><br />
-<?php _e('Output:') ?> <strong><?php echo mysql2date(get_option('date_format'), current_time('mysql')); ?></strong></td>
-</tr>
-<tr>
-<th scope="row"><?php _e('Default time format:') ?></th>
-<td><input name="time_format" type="text" id="time_format" size="30" value="<?php form_option('time_format'); ?>" /><br />
-<?php _e('Output:') ?> <strong><?php echo gmdate(get_option('time_format'), current_time('timestamp')); ?></strong></td>
-</tr>
-<tr>
-<th scope="row">&nbsp;</th>
-<td><?php _e('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Click "Update options" to update sample output.') ?> </td>
-</tr>
-<tr>
-<th scope="row"><?php _e('Weeks in the calendar should start on:') ?></th>
-<td><select name="start_of_week" id="start_of_week">
-<?php
-for ($day_index = 0; $day_index <= 6; $day_index++) :
-	$selected = (get_option('start_of_week') == $day_index) ? 'selected="selected"' : '';
-	echo "\n\t<option value='$day_index' $selected>" . $wp_locale->get_weekday($day_index) . '</option>';
-endfor;
-?>
-</select></td>
-</tr>
 </table>
-</fieldset>
 
-<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
+<p class="submit"><input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" />
 <input type="hidden" name="action" value="update" />
 </p>
 </form>
-- 
cgit