Skip to content

Commit dc6940e

Browse files
ryanborenryanboren
committed
Styling updates for settings. see WordPress#5851
git-svn-id: https://develop.svn.wordpress.org/trunk@6841 602fd350-edb4-49c9-b593-d223f7449a82
1 parent f4cfccd commit dc6940e

7 files changed

Lines changed: 58 additions & 40 deletions

‎wp-admin/options-discussion.php‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
<h2><?php _e('Discussion Settings') ?></h2>
1212
<form method="post" action="options.php">
1313
<?php wp_nonce_field('update-options') ?>
14-
<h3><?php _e('Usual settings for an article:') ?></h3>
15-
<small><em><?php echo '(' . __('These settings may be overridden for individual articles.') . ')'; ?></em></small>
14+
<table class="niceblue">
15+
<tr valign="top">
16+
<th scope="row"><?php _e('Default article settings') ?></th>
17+
<td>
1618
<ul>
1719
<li>
1820
<label for="default_pingback_flag">
@@ -30,8 +32,12 @@
3032
<?php _e('Allow people to post comments on the article') ?></label>
3133
</li>
3234
</ul>
33-
34-
<h3><?php _e('E-mail me whenever:') ?></h3>
35+
<small><em><?php echo '(' . __('These settings may be overridden for individual articles.') . ')'; ?></em></small>
36+
</td>
37+
</tr>
38+
<tr valign="top">
39+
<th scope="row"><?php _e('E-mail me whenever') ?></th>
40+
<td>
3541
<ul>
3642
<li>
3743
<label for="comments_notify">
@@ -44,8 +50,11 @@
4450
<?php _e('A comment is held for moderation') ?> </label>
4551
</li>
4652
</ul>
47-
48-
<h3><?php _e('Before a comment appears:') ?></h3>
53+
</td>
54+
</tr>
55+
<tr valign="top">
56+
<th scope="row"><?php _e('Before a comment appears') ?></th>
57+
<td>
4958
<ul>
5059
<li>
5160
<label for="comment_moderation">
@@ -55,20 +64,29 @@
5564
<li><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></li>
5665
<li><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></li>
5766
</ul>
58-
59-
<h3><?php _e('Comment Moderation') ?></h3>
67+
</td>
68+
</tr>
69+
<tr valign="top">
70+
<th scope="row"><?php _e('Comment Moderation') ?></th>
71+
<td>
6072
<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>
6173

6274
<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="moderation.php">moderation queue</a>. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?></p>
6375
<p>
6476
<textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea>
6577
</p>
66-
67-
<h3><?php _e('Comment Blacklist') ?></h3>
78+
</td>
79+
</tr>
80+
<tr valign="top">
81+
<th scope="row"><?php _e('Comment Blacklist') ?></th>
82+
<td>
6883
<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>
6984
<p>
7085
<textarea name="blacklist_keys" cols="60" rows="4" id="blacklist_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('blacklist_keys'); ?></textarea>
7186
</p>
87+
</td>
88+
</tr>
89+
</table>
7290

7391
<p class="submit">
7492
<input type="hidden" name="action" value="update" />

‎wp-admin/options-general.php‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,31 @@
1313
<?php wp_nonce_field('update-options') ?>
1414
<table class="niceblue">
1515
<tr valign="top">
16-
<th scope="row"><?php _e('Blog title:') ?></th>
16+
<th scope="row"><?php _e('Blog Title') ?></th>
1717
<td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" size="40" /></td>
1818
</tr>
1919
<tr valign="top">
20-
<th scope="row"><?php _e('Tagline:') ?></th>
20+
<th scope="row"><?php _e('Tagline') ?></th>
2121
<td><input name="blogdescription" type="text" id="blogdescription" style="width: 95%" value="<?php form_option('blogdescription'); ?>" size="45" />
2222
<br />
2323
<?php _e('In a few words, explain what this blog is about.') ?></td>
2424
</tr>
2525
<tr valign="top">
26-
<th scope="row"><?php _e('WordPress address (URL):') ?></th>
26+
<th scope="row"><?php _e('WordPress address (URL)') ?></th>
2727
<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>
2828
</tr>
2929
<tr valign="top">
30-
<th scope="row"><?php _e('Blog address (URL):') ?></th>
30+
<th scope="row"><?php _e('Blog address (URL)') ?></th>
3131
<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>
3232
</tr>
3333
<tr valign="top">
34-
<th scope="row"><?php _e('E-mail address:') ?> </th>
34+
<th scope="row"><?php _e('E-mail address') ?> </th>
3535
<td><input name="admin_email" type="text" id="admin_email" value="<?php form_option('admin_email'); ?>" size="40" class="code" />
3636
<br />
3737
<?php _e('This address is used only for admin purposes.') ?></td>
3838
</tr>
3939
<tr valign="top">
40-
<th scope="row"><?php _e('Membership:') ?></th>
40+
<th scope="row"><?php _e('Membership') ?></th>
4141
<td> <label for="users_can_register">
4242
<input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked('1', get_option('users_can_register')); ?> />
4343
<?php _e('Anyone can register') ?></label><br />
@@ -48,27 +48,27 @@
4848
</td>
4949
</tr>
5050
<tr valign="top">
51-
<th scope="row"><?php _e('New User Default Role:') ?></th>
51+
<th scope="row"><?php _e('New User Default Role') ?></th>
5252
<td><label for="default_role">
5353
<select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select></label>
5454
</td>
5555
</tr>
5656
<tr>
57-
<th scope="row"><?php _e('<abbr title="Coordinated Universal Time">UTC</abbr> time is:') ?> </th>
57+
<th scope="row"><?php _e('<abbr title="Coordinated Universal Time">UTC</abbr> time is') ?> </th>
5858
<td><code><?php echo gmdate(__('Y-m-d g:i:s a')); ?></code></td>
5959
</tr>
6060
<tr>
61-
<th scope="row"><?php _e('Times in the blog should differ by:') ?> </th>
61+
<th scope="row"><?php _e('Times in the blog should differ by') ?> </th>
6262
<td><input name="gmt_offset" type="text" id="gmt_offset" size="2" value="<?php form_option('gmt_offset'); ?>" />
6363
<?php _e('hours') ?> (<?php _e('Your timezone offset, for example <code>-6</code> for Central Time.'); ?>)</td>
6464
</tr>
6565
<tr>
66-
<th scope="row"><?php _e('Default date format:') ?></th>
66+
<th scope="row"><?php _e('Date Format') ?></th>
6767
<td><input name="date_format" type="text" id="date_format" size="30" value="<?php form_option('date_format'); ?>" /><br />
6868
<?php _e('Output:') ?> <strong><?php echo mysql2date(get_option('date_format'), current_time('mysql')); ?></strong></td>
6969
</tr>
7070
<tr>
71-
<th scope="row"><?php _e('Default time format:') ?></th>
71+
<th scope="row"><?php _e('Time Format') ?></th>
7272
<td><input name="time_format" type="text" id="time_format" size="30" value="<?php form_option('time_format'); ?>" /><br />
7373
<?php _e('Output:') ?> <strong><?php echo gmdate(get_option('time_format'), current_time('timestamp')); ?></strong></td>
7474
</tr>
@@ -77,7 +77,7 @@
7777
<td><?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>
7878
</tr>
7979
<tr>
80-
<th scope="row"><?php _e('Weeks in the calendar should start on:') ?></th>
80+
<th scope="row"><?php _e('Week Starts On') ?></th>
8181
<td><select name="start_of_week" id="start_of_week">
8282
<?php
8383
for ($day_index = 0; $day_index <= 6; $day_index++) :

‎wp-admin/options-misc.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
<h3><?php _e('Uploading'); ?></h3>
1616
<table class="niceblue">
1717
<tr valign="top">
18-
<th scope="row"><?php _e('Store uploads in this folder'); ?>:</th>
18+
<th scope="row"><?php _e('Store uploads in this folder'); ?></th>
1919
<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" />
2020
<br />
2121
<?php _e('Default is <code>wp-content/uploads</code>'); ?>
2222
</td>
2323
</tr>
2424

2525
<tr valign="top">
26-
<th scope="row"><?php _e('Full URL path to files (optional)'); ?>:</th>
26+
<th scope="row"><?php _e('Full URL path to files (optional)'); ?></th>
2727
<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" />
2828
</td>
2929
</tr>

‎wp-admin/options-permalink.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ function blurry() {
171171
<?php _e('Tag base'); ?>: <input name="tag_base" id="tag_base" type="text" class="code" value="<?php echo attribute_escape($tag_base); ?>" size="30" />
172172
</p>
173173
<p class="submit">
174-
<input type="submit" name="submit" value="<?php _e('Update Permalink Structure') ?>" />
174+
<input type="submit" name="submit" value="<?php _e('Save Changes') ?>" />
175175
</p>
176176
</form>
177177
<?php if ( $permalink_structure && !$usingpi && !$writable ) : ?>

‎wp-admin/options-privacy.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<?php wp_nonce_field('update-options') ?>
1414
<table class="niceblue">
1515
<tr valign="top">
16-
<th scope="row"><?php _e('Blog visibility:') ?> </th>
16+
<th scope="row"><?php _e('Blog Visibility') ?> </th>
1717
<td>
1818
<p><input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
1919
<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>

‎wp-admin/options-reading.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<table class="niceblue">
1515
<?php if ( get_pages() ): ?>
1616
<tr valign="top">
17-
<th scope="row"><?php _e('Front page displays:')?></th>
17+
<th scope="row"><?php _e('Front page displays')?></th>
1818
<td>
1919
<p><label>
2020
<input name="show_on_front" type="radio" value="posts" class="tog" <?php checked('posts', get_option('show_on_front')); ?> />
@@ -41,17 +41,17 @@
4141
</tr>
4242
<?php endif; ?>
4343
<tr valign="top">
44-
<th scope="row"><?php _e('Blog pages show at most:') ?></th>
44+
<th scope="row"><?php _e('Blog pages show at most') ?></th>
4545
<td>
4646
<input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" size="3" /> <?php _e('posts') ?>
4747
</td>
4848
</tr>
4949
<tr valign="top">
50-
<th scope="row"><?php _e('Syndication feeds show the most recent:') ?></th>
50+
<th scope="row"><?php _e('Syndication feeds show the most recent') ?></th>
5151
<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>
5252
</tr>
5353
<tr valign="top">
54-
<th scope="row"><?php _e('For each article in a feed, show:') ?> </th>
54+
<th scope="row"><?php _e('For each article in a feed, show') ?> </th>
5555
<td>
5656
<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 />
5757
<label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_option('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label></p>
@@ -72,7 +72,7 @@
7272
</td>
7373
</tr>
7474
<tr valign="top">
75-
<th scope="row"><?php _e('Show Avatars with Rating:') ?></th>
75+
<th scope="row"><?php _e('Show Avatars with Rating') ?></th>
7676
<td>
7777
<select name="avatar_rating" id="avatar_rating">
7878
<?php
@@ -86,7 +86,7 @@
8686
</td>
8787
</tr>
8888
<tr valign="top">
89-
<th scope="row"><?php _e('Encoding for pages and feeds:') ?></th>
89+
<th scope="row"><?php _e('Encoding for pages and feeds') ?></th>
9090
<td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option('blog_charset'); ?>" size="20" class="code" /><br />
9191
<?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>
9292
</tr>

‎wp-admin/options-writing.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
<table class="niceblue">
1616
<tr valign="top">
17-
<th width="33%" scope="row"> <?php _e('Size of the post box:') ?></th>
17+
<th scope="row"> <?php _e('Size of the post box') ?></th>
1818
<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; " />
1919
<?php _e('lines') ?></td>
2020
</tr>
2121
<tr valign="top">
22-
<th scope="row"><?php _e('Formatting:') ?></th>
22+
<th scope="row"><?php _e('Formatting') ?></th>
2323
<td>
2424
<label for="use_smilies">
2525
<input name="use_smilies" type="checkbox" id="use_smilies" value="1" <?php checked('1', get_option('use_smilies')); ?> />
@@ -28,7 +28,7 @@
2828
</td>
2929
</tr>
3030
<tr valign="top">
31-
<th scope="row"><?php _e('Default post category:') ?></th>
31+
<th scope="row"><?php _e('Default Post Category') ?></th>
3232
<td><select name="default_category" id="default_category">
3333
<?php
3434
$categories = get_categories('get=all');
@@ -42,7 +42,7 @@
4242
</select></td>
4343
</tr>
4444
<tr valign="top">
45-
<th scope="row"><?php _e('Default link category:') ?></th>
45+
<th scope="row"><?php _e('Default Link Category') ?></th>
4646
<td><select name="default_link_category" id="default_link_category">
4747
<?php
4848
$link_categories = get_terms('link_category', 'get=all');
@@ -62,24 +62,24 @@
6262

6363
<table class="niceblue">
6464
<tr valign="top">
65-
<th scope="row"><?php _e('Mail server:') ?></th>
65+
<th scope="row"><?php _e('Mail Server') ?></th>
6666
<td><input name="mailserver_url" type="text" id="mailserver_url" value="<?php form_option('mailserver_url'); ?>" size="40" />
6767
<label for="mailserver_port"><?php _e('Port:') ?></label>
6868
<input name="mailserver_port" type="text" id="mailserver_port" value="<?php form_option('mailserver_port'); ?>" size="6" />
6969
</td>
7070
</tr>
7171
<tr valign="top">
72-
<th width="33%" scope="row"><?php _e('Login name:') ?></th>
72+
<th scope="row"><?php _e('Login Name') ?></th>
7373
<td><input name="mailserver_login" type="text" id="mailserver_login" value="<?php form_option('mailserver_login'); ?>" size="40" /></td>
7474
</tr>
7575
<tr valign="top">
76-
<th scope="row"><?php _e('Password:') ?></th>
76+
<th scope="row"><?php _e('Password') ?></th>
7777
<td>
7878
<input name="mailserver_pass" type="text" id="mailserver_pass" value="<?php form_option('mailserver_pass'); ?>" size="40" />
7979
</td>
8080
</tr>
8181
<tr valign="top">
82-
<th scope="row"><?php _e('Default mail category:') ?></th>
82+
<th scope="row"><?php _e('Default Mail Category') ?></th>
8383
<td><select name="default_email_category" id="default_email_category">
8484
<?php
8585
//Alreay have $categories from default_category

0 commit comments

Comments
 (0)