golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

h2 removal per wireframes. Props Viper007Bond. see #7552 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9032 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-09-29 22:06:23 +00:00
parent 3dc5beb9ce
commit ea0ce44d87
35 changed files with 14 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/categories.php
View File

@ -78,6 +78,8 @@ case 'bulk-delete':
break;
case 'edit':
$title = __('Edit Category');
require_once ('admin-header.php');
$cat_ID = (int) $_GET['cat_ID'];
$category = get_category_to_edit($cat_ID);
@ -140,8 +142,6 @@ endif; ?>
<div class="wrap">
<h2><?php printf( current_user_can('manage_categories') ? __('Categories (<a href="%s">Add New</a>)') : __('Manage Tags'), '#addcat' ); ?></h2>
<form id="posts-filter" action="" method="get">
<div class="tablenav">

6
wp-admin/edit-category-form.php
View File

@ -16,14 +16,14 @@ if ( ! empty($cat_ID) ) {
/**
* @var string
*/
$heading = __('Edit Category');
$heading = '';
$submit_text = __('Edit Category');
$form = '<form name="editcat" id="editcat" method="post" action="categories.php" class="validate">';
$action = 'editedcat';
$nonce_action = 'update-category_' . $cat_ID;
do_action('edit_category_form_pre', $category);
} else {
$heading = __('Add Category');
$heading = '<h2>' . __('Add Category') . '</h2>';
$submit_text = __('Add Category');
$form = '<form name="addcat" id="addcat" method="post" action="categories.php" class="add:the-list: validate">';
$action = 'addcat';
@ -56,7 +56,7 @@ _fill_empty_category($category);
?>
<div class="wrap">
<h2><?php echo $heading ?></h2>
<?php echo $heading ?>
<div id="ajax-response"></div>
<?php echo $form ?>
<input type="hidden" name="action" value="<?php echo $action ?>" />

2
wp-admin/edit-comments.php
View File

@ -123,8 +123,6 @@ if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['sp
<div class="wrap">
<h2><?php _e('Manage Comments'); ?></h2>
<ul class="subsubsub">
<?php
$status_links = array();

7
wp-admin/edit-form-advanced.php
View File

@ -426,13 +426,6 @@ endif;
<div class="wrap">
<h2><?php
if ( !isset($post_ID) || 0 == $post_ID)
printf( __( '<a href="%s">Posts</a> / Write New Post' ), 'edit.php' );
else
printf( __( '<a href="%s">Posts</a> / Edit Post' ), 'edit.php' );
?></h2>
<form name="post" action="post.php" method="post" id="post">
<?php

1
wp-admin/edit-form-comment.php
View File

@ -18,7 +18,6 @@ $form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . $comment-
<form name="post" action="comment.php" method="post" id="post">
<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
<div class="wrap">
<h2><?php echo $toprow_title; ?></h2>
<div id="poststuff">
<input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" />

2
wp-admin/edit-link-categories.php
View File

@ -78,8 +78,6 @@ endif; ?>
<div class="wrap">
<h2><?php printf( current_user_can('manage_categories') ? __('Link Categories (<a href="%s">Add New</a>)') : __('Manage Tags'), '#addcat' ); ?></h2>
<form id="posts-filter" action="" method="get">
<div class="tablenav">

6
wp-admin/edit-link-category-form.php
View File

@ -16,14 +16,14 @@ if ( ! empty($cat_ID) ) {
/**
* @var string
*/
$heading = __('Edit Category');
$heading = '';
$submit_text = __('Edit Category');
$form = '<form name="editcat" id="editcat" method="post" action="link-category.php" class="validate">';
$action = 'editedcat';
$nonce_action = 'update-link-category_' . $cat_ID;
do_action('edit_link_category_form_pre', $category);
} else {
$heading = __('Add Category');
$heading = '<h2>' . __('Add Category') . '</h2>';
$submit_text = __('Add Category');
$form = '<form name="addcat" id="addcat" class="add:the-list: validate" method="post" action="link-category.php">';
$action = 'addcat';
@ -53,7 +53,7 @@ _fill_empty_link_category($category);
?>
<div class="wrap">
<h2><?php echo $heading ?></h2>
<?php echo $heading ?>
<div id="ajax-response"></div>
<?php echo $form ?>
<input type="hidden" name="action" value="<?php echo $action ?>" />

2
wp-admin/edit-link-form.php
View File

@ -278,8 +278,6 @@ add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link'
<div class="wrap">
<h2><?php echo $heading; ?></h2>
<!--
<p id="big-add-button">
<span id="previewview">

7
wp-admin/edit-page-form.php
View File

@ -292,13 +292,6 @@ endif;
<div class="wrap">
<h2><?php
if ( !isset($post_ID) || 0 == $post_ID )
printf( __( '<a href="%s">Pages</a> / Write New Page' ), 'edit-pages.php' );
else
printf( __( '<a href="%s">Pages</a> / Edit Page' ), 'edit-pages.php' );
?></h2>
<form name="post" action="page.php" method="post" id="post">
<?php if ( $notice ) : ?>
<div id="notice" class="error"><p><?php echo $notice ?></p></div>

11
wp-admin/edit-pages.php
View File

@ -130,17 +130,6 @@ if ( (int) $_GET['skip'] ) {
<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
endif; ?>
<h2><?php
// Use $_GET instead of is_ since they can override each other
$h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( stripslashes( $_GET['s'] ) ) ) : '';
$h2_author = '';
if ( isset($_GET['author']) && $_GET['author'] ) {
$author_user = get_userdata( (int) $_GET['author'] );
$h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name ));
}
printf( _c( '%1$s%2$s%3$s (<a href="%4$s">Add New</a>)|You can reorder these: 1: Pages, 2: by {s}, 3: matching {s}' ), $post_status_label, $h2_author, $h2_search, 'page-new.php' );
?></h2>
<ul class="subsubsub">
<?php

6
wp-admin/edit-tag-form.php
View File

@ -10,14 +10,14 @@ if ( ! empty($tag_ID) ) {
/**
* @var string
*/
$heading = __('Edit Tag');
$heading = '';
$submit_text = __('Edit Tag');
$form = '<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate">';
$action = 'editedtag';
$nonce_action = 'update-tag_' . $tag_ID;
do_action('edit_tag_form_pre', $tag);
} else {
$heading = __('Add Tag');
$heading = '<h2>' . __('Add Tag') . '</h2>';
$submit_text = __('Add Tag');
$form = '<form name="addtag" id="addtag" method="post" action="edit-tags.php" class="add:the-list: validate">';
$action = 'addtag';
@ -27,7 +27,7 @@ if ( ! empty($tag_ID) ) {
?>
<div class="wrap">
<h2><?php echo $heading ?></h2>
<?php echo $heading ?>
<div id="ajax-response"></div>
<?php echo $form ?>
<input type="hidden" name="action" value="<?php echo $action ?>" />

3
wp-admin/edit-tags.php
View File

@ -72,6 +72,7 @@ case 'bulk-delete':
break;
case 'edit':
$title = __('Edit Tag');
require_once ('admin-header.php');
$tag_ID = (int) $_GET['tag_ID'];
@ -144,8 +145,6 @@ endif; ?>
<div class="wrap">
<h2><?php printf( current_user_can('manage_categories') ? __('Tags (<a href="%s">Add New</a>)') : __('Manage Tags'), '#addtag' ); ?></h2>
<form id="posts-filter" action="" method="get">
<div class="tablenav">

31
wp-admin/edit.php
View File

@ -120,37 +120,6 @@ unset($_GET['upd']);
<div class="wrap">
<h2><?php
if ( is_single() ) {
printf(__('Comments on %s'), apply_filters( "the_title", $post->post_title));
} else {
$post_status_label = _c('Posts|manage posts header');
if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) )
$post_status_label = $post_stati[$_GET['post_status']][1];
//TODO: Unreachable code: $post_listing_pageable is undefined, Similar code in upload.php
//if ( $post_listing_pageable && !is_archive() && !is_search() )
// $h2_noun = is_paged() ? sprintf(__( 'Previous %s' ), $post_status_label) : sprintf(__('Latest %s'), $post_status_label);
//else
$h2_noun = $post_status_label;
// Use $_GET instead of is_ since they can override each other
$h2_author = '';
$_GET['author'] = isset($_GET['author']) ? (int) $_GET['author'] : 0;
if ( $_GET['author'] != 0 ) {
if ( $_GET['author'] == '-' . $user_ID ) { // author exclusion
$h2_author = ' ' . __('by other authors');
} else {
$author_user = get_userdata( get_query_var( 'author' ) );
$h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name ));
}
}
$h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( get_search_query() ) ) : '';
$h2_cat = isset($_GET['cat']) && $_GET['cat'] ? ' ' . sprintf( __('in &#8220;%s&#8221;'), single_cat_title('', false) ) : '';
$h2_tag = isset($_GET['tag']) && $_GET['tag'] ? ' ' . sprintf( __('tagged with &#8220;%s&#8221;'), single_tag_title('', false) ) : '';
$h2_month = isset($_GET['m']) && $_GET['m'] ? ' ' . sprintf( __('during %s'), single_month_title(' ', false) ) : '';
printf( _c( '%1$s%2$s%3$s%4$s%5$s%6$s (<a href="%7$s">Add New</a>)|You can reorder these: 1: Posts, 2: by {s}, 3: matching {s}, 4: in {s}, 5: tagged with {s}, 6: during {s}' ), $h2_noun, $h2_author, $h2_search, $h2_cat, $h2_tag, $h2_month, 'post-new.php' );
}
?></h2>
<ul class="subsubsub">
<?php
if ( empty($locked_post_status) ) :

1
wp-admin/export.php
View File

@ -22,7 +22,6 @@ require_once ('admin-header.php');
?>
<div class="wrap">
<h2><?php _e('Export'); ?></h2>
<p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
<p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p>
<p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function on another WordPress blog to import this blog.'); ?></p>

1
wp-admin/import.php
View File

@ -13,7 +13,6 @@ require_once ('admin-header.php');
?>
<div class="wrap">
<h2><?php _e('Import'); ?></h2>
<p><?php _e('If you have posts or comments in another system, WordPress can import those into this blog. To get started, choose a system to import from below:'); ?></p>
<?php

1
wp-admin/inbox.php
View File

@ -21,7 +21,6 @@ endif;
?>
<div class="wrap">
<form id="inbox-filter" action="" method="get">
<h2><?php _e('Inbox'); ?></h2>
<ul class="subsubsub">
<li><a href="#" class="current"><?php _e('Messages') ?></a> | </li><li><a href="#"><?php echo sprintf(__('Archived') . ' (%s)', '42'); ?></a></li>
</ul>

2
wp-admin/link-category.php
View File

@ -61,7 +61,7 @@ case 'delete':
break;
case 'edit':
$title = __('Categories');
$title = __('Edit Category');
$parent_file = 'edit.php';
$submenu_file = 'edit-link-categories.php';
require_once ('admin-header.php');

2
wp-admin/link-manager.php
View File

@ -99,8 +99,6 @@ if ( isset($_GET['deleted']) ) {
<div class="wrap">
<h2><?php printf( __('Links (<a href="%s">Add New</a>)' ), 'link-add.php' ); ?></h2>
<form id="list-filter" action="" method="get">
<?php
$categories = get_terms('link_category', "hide_empty=1");

1
wp-admin/media-upload.php
View File

@ -56,7 +56,6 @@ if ( isset($_GET['inline']) ) {
$parent_file = 'edit.php';
require_once('admin-header.php'); ?>
<div class="wrap">
<h2><?php _e('Upload Media') ?></h2>
<form enctype="multipart/form-data" method="post" action="media-upload.php?inline=&upload-page-form=" class="media-upload-form type-form validate" id="file-form">

1
wp-admin/options-discussion.php
View File

@ -16,7 +16,6 @@ include('admin-header.php');
?>
<div class="wrap">
<h2><?php _e('Discussion Settings') ?></h2>
<form method="post" action="options.php">
<input type='hidden' name='option_page' value='discussion' />
<?php wp_nonce_field('discussion-options') ?>

1
wp-admin/options-general.php
View File

@ -16,7 +16,6 @@ include('./admin-header.php');
?>
<div class="wrap">
<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' />

1
wp-admin/options-media.php
View File

@ -18,7 +18,6 @@ include('admin-header.php');
<div class="wrap">
<h2><?php _e('Media Settings') ?></h2>
<form action="options.php" method="post">
<p><?php _e('The setting below determines where images, documents, and other media files will be linked to when inserted into the body of a post.'); ?></p>

1
wp-admin/options-misc.php
View File

@ -17,7 +17,6 @@ include('admin-header.php');
?>
<div class="wrap">
<h2><?php _e('Miscellaneous Settings') ?></h2>
<form method="post" action="options.php">
<input type='hidden' name='option_page' value='misc' />
<?php wp_nonce_field('misc-options') ?>

1
wp-admin/options-permalink.php
View File

@ -123,7 +123,6 @@ else
<?php endif; ?>
<div class="wrap">
<h2><?php _e('Customize Permalink Structure') ?></h2>
<form name="form" action="options-permalink.php" method="post">
<?php wp_nonce_field('update-permalink') ?>
<p><?php _e('By default WordPress uses web <abbr title="Universal Resource Locator">URL</abbr>s which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>

1
wp-admin/options-privacy.php
View File

@ -16,7 +16,6 @@ include('./admin-header.php');
?>
<div class="wrap">
<h2><?php _e('Privacy Settings') ?></h2>
<form method="post" action="options.php">
<?php wp_nonce_field('privacy-options') ?>
<input type='hidden' name='option_page' value='privacy' />

1
wp-admin/options-reading.php
View File

@ -16,7 +16,6 @@ include('admin-header.php');
?>
<div class="wrap">
<h2><?php _e('Reading Settings') ?></h2>
<form name="form1" method="post" action="options.php">
<?php wp_nonce_field('reading-options') ?>
<input type='hidden' name='option_page' value='reading' />

1
wp-admin/options-writing.php
View File

@ -16,7 +16,6 @@ include('admin-header.php');
?>
<div class="wrap">
<h2><?php _e('Writing Settings') ?></h2>
<form method="post" action="options.php">
<?php wp_nonce_field('writing-options') ?>
<input type='hidden' name='option_page' value='writing' />

2
wp-admin/page.php
View File

@ -82,7 +82,7 @@ case 'post':
break;
case 'edit':
$title = __('Edit');
$title = __('Edit Page');
$editing = true;
$page_ID = $post_ID = $p = (int) $_GET['post'];
$post = get_post_to_edit($page_ID);

3
wp-admin/plugin-editor.php
View File

@ -96,9 +96,6 @@ default:
</div>
<?php endif; ?>
<div class="wrap">
<div class="bordertitle">
<h2><?php _e('Plugin Editor'); ?></h2>
</div>
<div class="tablenav">
<div class="alignleft">
<big><?php

1
wp-admin/plugin-install.php
View File

@ -48,7 +48,6 @@ do_action('install_plugins_pre_' . $tab);
include('admin-header.php');
?>
<div class="wrap">
<h2><?php _e('Install Plugins') ?></h2>
<ul class="subsubsub">
<?php
$display_tabs = array();

1
wp-admin/plugins.php
View File

@ -203,7 +203,6 @@ if( !empty($invalid) )
<?php endif; ?>
<div class="wrap">
<h2><?php _e('Plugin Management'); ?></h2>
<p><?php _e('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.'); ?></p>
<?php

33
wp-admin/upload.php
View File

@ -187,39 +187,6 @@ if ( isset($message) ) { ?>
<div class="wrap">
<h2><?php
if ( isset($_GET['detached']) ) {
_e('Unattached Media');
} elseif ( is_singular() ) {
printf( __('Comments on %s'), apply_filters("the_title", $post->post_title) );
} else {
$post_mime_type_label = _c('Media|manage media header');
if ( isset($_GET['post_mime_type']) && in_array( $_GET['post_mime_type'], array_keys($post_mime_types) ) )
$post_mime_type_label = $post_mime_types[$_GET['post_mime_type']][1];
//TODO: Unreachable code: $post_listing_pageable is undefined, Similar code in edit.php
//if ( $post_listing_pageable && !is_archive() && !is_search() )
// $h2_noun = is_paged() ? sprintf(__( 'Previous %s' ), $post_mime_type_label) : sprintf(__('Latest %s'), $post_mime_type_label);
//else
$h2_noun = $post_mime_type_label;
// Use $_GET instead of is_ since they can override each other
$h2_author = '';
$_GET['author'] = isset( $_GET['author'] ) ? (int) $_GET['author'] : 0;
if ( $_GET['author'] != 0 ) {
if ( $_GET['author'] == '-' . $user_ID ) { // author exclusion
$h2_author = ' ' . __('by other authors');
} else {
$author_user = get_userdata( get_query_var( 'author' ) );
$h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name ));
}
}
$h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching &#8220;%s&#8221;'), wp_specialchars( get_search_query() ) ) : '';
$h2_cat = isset($_GET['cat']) && $_GET['cat'] ? ' ' . sprintf( __('in &#8220;%s&#8221;'), single_cat_title('', false) ) : '';
$h2_tag = isset($_GET['tag']) && $_GET['tag'] ? ' ' . sprintf( __('tagged with &#8220;%s&#8221;'), single_tag_title('', false) ) : '';
$h2_month = isset($_GET['m']) && $_GET['m'] ? ' ' . sprintf( __('during %s'), single_month_title(' ', false) ) : '';
printf( _c( '%1$s%2$s%3$s%4$s%5$s%6$s (<a href="%7$s">Add New</a>)|You can reorder these: 1: Posts, 2: by {s}, 3: matching {s}, 4: in {s}, 5: tagged with {s}, 6: during {s}' ), $h2_noun, $h2_author, $h2_search, $h2_cat, $h2_tag, $h2_month, 'media-upload.php?inline' );
}
?></h2>
<ul class="subsubsub">
<?php
$type_links = array();

1
wp-admin/user-edit.php
View File

@ -169,7 +169,6 @@ include ('admin-header.php');
<?php endif; ?>
<div class="wrap" id="profile-page">
<h2><?php $is_profile_page? _e('Your Profile and Personal Options') : _e('Edit User'); ?></h2>
<form id="your-profile" action="" method="post">
<?php wp_nonce_field('update-user_' . $user_id) ?>

2
wp-admin/users.php
View File

@ -271,8 +271,6 @@ if ( ! empty($messages) ) {
<form id="posts-filter" action="" method="get">
<?php if ( $wp_user_search->is_search() ) : ?>
<h2><?php printf( current_user_can('create_users') ? __('Users Matching "%2$s" (<a href="%1$s">Add New</a>)') : __('Add New'), '#add-new-user', wp_specialchars($wp_user_search->search_term) ); ?></h2>
<?php else : ?>
<h2><?php printf( current_user_can('create_users') ? __('Users (<a href="%s">Add New</a>)') : __('Add New'), '#add-new-user' ); ?></h2>
<?php endif; ?>
<ul class="subsubsub">

1
wp-content/themes/default/functions.php
View File

@ -364,7 +364,6 @@ function kubrick_theme_page() {
?>
<div class='wrap'>
<div id="kubrick-header">
<h2><?php _e('Header Image and Color'); ?></h2>
<div id="headwrap">
<div id="header">
<div id="headerimg">