From 3cbcbbbfb48955929bf6bb6dec48d3f2975d2d93 Mon Sep 17 00:00:00 2001 From: westi Date: Sun, 4 May 2008 10:37:06 +0000 Subject: [PATCH] Associate lables with form fields. Fixes #6859 props MarcoZ. git-svn-id: http://svn.automattic.com/wordpress/trunk@7883 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/categories.php | 1 + wp-admin/edit-comments.php | 1 + wp-admin/edit-form-advanced.php | 24 +++++++-------- wp-admin/edit-form-comment.php | 12 ++++---- wp-admin/edit-link-categories.php | 1 + wp-admin/edit-link-form.php | 39 +++++++++++++----------- wp-admin/edit-page-form.php | 20 ++++++------ wp-admin/edit-pages.php | 1 + wp-admin/edit-tags.php | 1 + wp-admin/edit.php | 1 + wp-admin/export.php | 4 +-- wp-admin/import/greymatter.php | 12 ++++---- wp-admin/import/mt.php | 4 +-- wp-admin/import/wordpress.php | 2 +- wp-admin/includes/media.php | 1 + wp-admin/includes/template.php | 10 +++--- wp-admin/link-import.php | 10 +++--- wp-admin/link-manager.php | 1 + wp-admin/options-discussion.php | 38 +++++++++++------------ wp-admin/options-general.php | 30 +++++++++--------- wp-admin/options-misc.php | 12 ++++---- wp-admin/options-permalink.php | 4 +-- wp-admin/options-privacy.php | 4 +-- wp-admin/options-reading.php | 18 +++++------ wp-admin/options-writing.php | 20 ++++++------ wp-admin/options.php | 2 +- wp-admin/setup-config.php | 20 ++++++------ wp-admin/sidebar.php | 8 ++--- wp-admin/theme-editor.php | 2 +- wp-admin/update.php | 8 ++--- wp-admin/upload.php | 1 + wp-admin/user-edit.php | 4 +-- wp-admin/users.php | 21 +++++++------ wp-admin/widgets.php | 7 +++-- wp-admin/wp-admin.css | 6 ++++ wp-content/themes/default/searchform.php | 1 + wp-content/themes/default/style.css | 4 +++ wp-includes/post-template.php | 2 +- wp-includes/widgets.php | 1 + 39 files changed, 192 insertions(+), 166 deletions(-) diff --git a/wp-admin/categories.php b/wp-admin/categories.php index bf6c382a8..473a3a442 100644 --- a/wp-admin/categories.php +++ b/wp-admin/categories.php @@ -126,6 +126,7 @@ endif; ?>

+

diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index 30d9aa146..6bb04aa6a 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -116,6 +116,7 @@ unset($status_links);

+

diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index e680179c4..c26a4fd47 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -84,9 +84,9 @@ else
-

+

- post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'> post_status ) : ?> @@ -181,7 +181,7 @@ if ( ( 'edit' == $action) && current_user_can('delete_post', $post_ID) )

-

+

@@ -196,7 +196,7 @@ endif; ?>
-

+

post_content); ?> @@ -210,7 +210,7 @@ endif; ?>

-

+

@@ -222,8 +222,8 @@ endif; ?>

- - 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?> + + 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?> @@ -258,7 +258,7 @@ endif; ?>

-
+

use them in your template'); ?>

@@ -266,7 +266,7 @@ endif; ?>

-


()

+


()

pingbacks, no other action necessary.'); ?>

">

-

+

@@ -320,7 +320,7 @@ list_meta($metadata);

- +
@@ -333,7 +333,7 @@ if ( $authors && count( $authors ) > 1 ) :

- $authors, 'name' => 'post_author_override', 'selected' => empty($post_ID) ? $user_ID : $post->post_author) ); ?> + $authors, 'name' => 'post_author_override', 'selected' => empty($post_ID) ? $user_ID : $post->post_author) ); ?>
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php index dfef0a78e..601f4cbb4 100644 --- a/wp-admin/edit-form-comment.php +++ b/wp-admin/edit-form-comment.php @@ -22,9 +22,9 @@ $form_extra = "' />\n

+

- comment_approved, '1' ); ?> value='1'> comment_approved, '0' ); ?> value='0'> comment_approved, 'spam' ); ?> value='spam'> @@ -64,28 +64,28 @@ echo " +

-

+

-

+

-

+

comment_content, 'content', 'newcomment_author_url', false, 4); ?>
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php index ab1dc9a22..da5b41561 100644 --- a/wp-admin/edit-link-categories.php +++ b/wp-admin/edit-link-categories.php @@ -62,6 +62,7 @@ endif; ?>

+

diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php index 15c3fb5d2..7604d3e85 100644 --- a/wp-admin/edit-link-form.php +++ b/wp-admin/edit-link-form.php @@ -74,7 +74,7 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
-

+


@@ -82,7 +82,7 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
-

+


http://wordpress.org/ — don’t forget the http://'); ?> @@ -90,7 +90,7 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
-

+


@@ -104,6 +104,7 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )

+

@@ -147,6 +149,7 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') ) +

_blank your link will open in a new window.'); ?>

@@ -156,7 +159,7 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
- + @@ -164,15 +167,15 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') )
- + - + - + - + - + - + - +
+
-
+
-
+
-
+
-
+
@@ -214,11 +217,11 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') ) -
+
@@ -237,11 +240,11 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') ) -
+
@@ -254,7 +257,7 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') ) -
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php index f2eeab7d6..ef7540667 100644 --- a/wp-admin/edit-page-form.php +++ b/wp-admin/edit-page-form.php @@ -69,9 +69,9 @@ else
-

+

- post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'> @@ -160,7 +160,7 @@ if ( ('edit' == $action) && current_user_can('delete_page', $post_ID) )

-

+

@@ -175,7 +175,7 @@ endif; ?>
-

+

post_content); ?> @@ -224,7 +224,7 @@ list_meta($metadata);

-

+

@@ -232,14 +232,14 @@ list_meta($metadata);

- +

- post_parent); ?> @@ -251,7 +251,7 @@ list_meta($metadata);

- page_template); ?> @@ -263,7 +263,7 @@ list_meta($metadata);

-

+

@@ -277,7 +277,7 @@ if ( $authors && count( $authors ) > 1 ) :

- $authors, 'name' => 'post_author_override', 'selected' => empty($post_ID) ? $user_ID : $post->post_author) ); ?> + $authors, 'name' => 'post_author_override', 'selected' => empty($post_ID) ? $user_ID : $post->post_author) ); ?>
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php index a2b0181b4..20249a075 100644 --- a/wp-admin/edit-pages.php +++ b/wp-admin/edit-pages.php @@ -111,6 +111,7 @@ endif; ?>

+

diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 340174d2b..fffe7cab0 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -133,6 +133,7 @@ endif; ?>

+

diff --git a/wp-admin/edit.php b/wp-admin/edit.php index ab9b3ea75..b2a8e99d4 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -116,6 +116,7 @@ endif; ?>

+

diff --git a/wp-admin/export.php b/wp-admin/export.php index 99505e4ad..08a0b2571 100644 --- a/wp-admin/export.php +++ b/wp-admin/export.php @@ -22,9 +22,9 @@ require_once ('admin-header.php'); - +"; - $r .= "\n\t\t"; - $r .= "\n\t\t"; + $r .= "\n\t\t"; + $r .= "\n\t\t"; $r .= "\n\t\t
- get_col( "SELECT post_author FROM $wpdb->posts GROUP BY post_author" ); diff --git a/wp-admin/import/greymatter.php b/wp-admin/import/greymatter.php index 92abc48bd..58aa75771 100644 --- a/wp-admin/import/greymatter.php +++ b/wp-admin/import/greymatter.php @@ -38,16 +38,16 @@ class GM_Import {

- - + + - - + + - - +

+
so you need to enter the number of the last GM post here.
(if you don't know that number, just log into your FTP and look it out
in the entries' folder)") ?>
diff --git a/wp-admin/import/mt.php b/wp-admin/import/mt.php index 6ab2f79c0..0792be338 100644 --- a/wp-admin/import/mt.php +++ b/wp-admin/import/mt.php @@ -166,9 +166,9 @@ class MT_Import { $j = -1; foreach ($authors as $author) { ++ $j; - echo '
  • '.__('Current author:').' '.$author.'
    '.sprintf(__('Create user %1$s or map to existing'), '
    '); + echo '
    • '; + echo ''; } echo ''.'
    '; diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php index 03395bdba..913a96281 100644 --- a/wp-admin/import/wordpress.php +++ b/wp-admin/import/wordpress.php @@ -218,7 +218,7 @@ class WP_Import { function users_form($n, $author) { if ( $this->allow_create_users() ) { - printf(__('Create user %1$s or map to existing'), '
    '); + printf('
    '); } else { echo __('Map to existing').'
    '; diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 60fdd83ef..a5f96706a 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -959,6 +959,7 @@ function media_upload_library_form($errors) {
    +
    diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 8833c87e0..01030507e 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -774,8 +774,8 @@ function _list_meta_row( $entry, &$count ) { $delete_nonce = wp_create_nonce( 'delete-meta_' . $entry['meta_id'] ); $r .= "\n\t

    "; $r .= "\n\t\t"; @@ -800,8 +800,8 @@ function meta_form() {

    - - + + diff --git a/wp-admin/link-import.php b/wp-admin/link-import.php index f2183f6bf..a2d6e4d56 100644 --- a/wp-admin/link-import.php +++ b/wp-admin/link-import.php @@ -30,19 +30,19 @@ switch ($step) {
    -

    - +

    +
    -

    +

    -


    - add new)' ), 'link-add.php' ); ?>

    +

    diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php index 32a666ed9..c95bf0c98 100644 --- a/wp-admin/options-discussion.php +++ b/wp-admin/options-discussion.php @@ -14,7 +14,7 @@ include('admin-header.php');
    @@ -815,7 +815,7 @@ function meta_form() { echo "\n\t"; } ?> - +
    - + - + - + - + - +
    +
    @@ -28,11 +28,11 @@ include('admin-header.php');
    -
    +
    @@ -40,11 +40,11 @@ include('admin-header.php'); -
    +
    @@ -52,27 +52,27 @@ include('admin-header.php');
    -
    -

    ' ) ?>

    +
    +

    -

    moderation queue. One word or IP per line. It will match inside words, so "press" will match "WordPress".') ?>

    +

    -
    -

    +
    +

    -
    @@ -85,7 +85,7 @@ include('admin-header.php'); - + - + - +
    +
    __("Don’t show Avatars"), 1 => __('Show Avatars')); foreach ( $yesorno as $key => $value) { @@ -93,11 +93,11 @@ include('admin-header.php'); echo "\n\t
    "; } ?> -
    +
    __('G — Suitable for all audiences'), 'PG' => __('PG — Possibly offensive, usually for audiences 13 and above'), 'R' => __('R — Intended for adult audiences above 17'), 'X' => __('X — Even more mature than above')); @@ -107,11 +107,11 @@ foreach ($ratings as $key => $rating) : endforeach; ?> -
    +

    @@ -142,7 +142,7 @@ foreach ( $avatar_defaults as $default_key => $default_name ) { echo apply_filters('default_avatar_select', $avatar_list); ?> -
    diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index 680f7ae98..aec47d05a 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -13,50 +13,50 @@ include('./admin-header.php'); - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php index 645bfc790..90ecca7ca 100644 --- a/wp-admin/options-writing.php +++ b/wp-admin/options-writing.php @@ -14,21 +14,21 @@ include('admin-header.php');

    " />
    " />
    to be different from the directory you installed WordPress.'); ?>


    -
    + +
    -



    Documentation on date formatting. Click "Save Changes" to update sample output.') ?>
    - + - + @@ -44,23 +44,23 @@ include('admin-header.php');

    wp-content/uploads'); ?> @@ -23,7 +23,7 @@ include('admin-header.php');
    - + - +
    +

    /> -
    +
    -
    diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php index 38144a3ba..8ce51a7d2 100644 --- a/wp-admin/options-permalink.php +++ b/wp-admin/options-permalink.php @@ -170,11 +170,11 @@ $structures = array( - + - +
    diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php index b493fc9dc..3d9d140fc 100644 --- a/wp-admin/options-privacy.php +++ b/wp-admin/options-privacy.php @@ -14,13 +14,13 @@ include('./admin-header.php'); - +
    +

    />

    />

    -
    diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php index 82c5049af..b49f88b86 100644 --- a/wp-admin/options-reading.php +++ b/wp-admin/options-reading.php @@ -15,7 +15,7 @@ include('admin-header.php');
    +

      -
      • -
      • +
    • ".__('Front page: %s')."", wp_dropdown_pages("name=page_on_front&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_on_front'))); ?>
      • +
    • ".__('Posts page: %s')."", wp_dropdown_pages("name=page_for_posts&echo=0&show_option_none=".__('- Select -')."&selected=" . get_option('page_for_posts'))); ?>
    @@ -37,29 +37,29 @@ include('admin-header.php');

    -
    +


    -

    recommended)') ?>
    - + - + - + - + - + - + - + - + - +
    +

    -
    diff --git a/wp-admin/options.php b/wp-admin/options.php index 88ee29ae3..7f158db4d 100644 --- a/wp-admin/options.php +++ b/wp-admin/options.php @@ -73,7 +73,7 @@ foreach ( (array) $options as $option) : } echo "
    $option->option_name "; if (strpos($value, "\n") !== false) echo ""; diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index e2c39147f..39220046d 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -68,28 +68,28 @@ switch($step) {

    Below you should enter your database connection details. If you're not sure about these, contact your host.

    - - + + - - + + - - + + - - + + - - + +
    Database Name The name of the database you want to run WP in.
    User Name Your MySQL username
    Password ...and MySQL password.
    Database Host 99% chance you won't need to change this value.
    Table Prefix If you want to run multiple WordPress installations in a single database, change this.
    diff --git a/wp-admin/sidebar.php b/wp-admin/sidebar.php index f04eb75d9..62631a2f9 100644 --- a/wp-admin/sidebar.php +++ b/wp-admin/sidebar.php @@ -60,8 +60,8 @@ form { -

    - +

    +

    @@ -69,8 +69,8 @@ form {

    -Post: - + +

    diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php index f17a48c11..5640dcad8 100644 --- a/wp-admin/theme-editor.php +++ b/wp-admin/theme-editor.php @@ -92,7 +92,7 @@ $desc_header = ( $description != $file_show ) ? "$description (%s)" : "

    - + - + - + - + - + - +
    size="40" />
    size="40" />
    size="40" />'.__('(Password not shown)').''; ?>

    diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index 9c298dda3..4e148d521 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -162,7 +162,7 @@ include ('admin-header.php');
    +
    $color_info ): ?> -
    diff --git a/wp-admin/users.php b/wp-admin/users.php index 7aa7873d8..3b881cc88 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -145,13 +145,13 @@ case 'delete': ?> -

    +

    • '.__('Attribute all posts and links to:')." $user_dropdown"; ?>
      • -
    +

    @@ -287,6 +287,7 @@ unset($role_links); ?>

    +

    @@ -299,7 +300,7 @@ unset($role_links);
    - +
    @@ -403,29 +404,29 @@ foreach ( $wp_user_search->get_results() as $userid ) { - + - + - + - + - + - + @@ -433,7 +434,7 @@ foreach ( $wp_user_search->get_results() as $userid ) { - +

    -

    +

    - $show_text ) : $show_value = attribute_escape( $show_value ); ?> @@ -256,7 +257,7 @@ if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) : ?>
    -

    +

    diff --git a/wp-content/themes/default/style.css b/wp-content/themes/default/style.css index 5ec023152..062526fde 100644 --- a/wp-content/themes/default/style.css +++ b/wp-content/themes/default/style.css @@ -616,6 +616,10 @@ blockquote cite { text-align: center; } +.hidden { + display: none; + } + hr { display: none; } diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index db0f03f83..7bbdbadb3 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -283,7 +283,7 @@ function wp_dropdown_pages($args = '') { $output = ''; if ( ! empty($pages) ) { - $output = "\n"; if ( $show_option_none ) $output .= "\t\n"; $output .= walk_page_dropdown_tree($pages, $depth, $r); diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php index d77d85e3f..1e008a705 100644 --- a/wp-includes/widgets.php +++ b/wp-includes/widgets.php @@ -461,6 +461,7 @@ function wp_widget_search($args) {
    +