From 61f911c42eac4273858162573040cdb3f7e92fdc Mon Sep 17 00:00:00 2001
From: markjaquith <markjaquith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 17 Oct 2008 20:02:03 +0000
Subject: [PATCH] Bring back the H2s. Rough draft.

git-svn-id: http://svn.automattic.com/wordpress/trunk@9232 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/categories.php                 | 1 +
 wp-admin/edit-comments.php              | 1 +
 wp-admin/edit-link-categories.php       | 1 +
 wp-admin/edit-link-form.php             | 1 +
 wp-admin/edit-page-form.php             | 1 +
 wp-admin/edit-pages.php                 | 4 +++-
 wp-admin/edit-tags.php                  | 1 +
 wp-admin/export.php                     | 2 ++
 wp-admin/import.php                     | 1 +
 wp-admin/index.php                      | 2 ++
 wp-admin/link-add.php                   | 2 +-
 wp-admin/link-manager.php               | 3 ++-
 wp-admin/media-new.php                  | 1 -
 wp-admin/media-upload.php               | 9 +++++----
 wp-admin/options-discussion.php         | 2 ++
 wp-admin/options-general.php            | 2 ++
 wp-admin/options-media.php              | 1 +
 wp-admin/options-misc.php               | 2 ++
 wp-admin/options-permalink.php          | 2 ++
 wp-admin/options-privacy.php            | 2 ++
 wp-admin/options-reading.php            | 2 ++
 wp-admin/options-writing.php            | 2 ++
 wp-admin/page-new.php                   | 2 +-
 wp-admin/plugin-editor.php              | 2 ++
 wp-admin/plugin-install.php             | 2 ++
 wp-admin/plugins.php                    | 2 ++
 wp-admin/theme-editor.php               | 2 +-
 wp-admin/themes.php                     | 2 ++
 wp-admin/turbo.php                      | 2 ++
 wp-admin/upload.php                     | 1 +
 wp-admin/user-edit.php                  | 1 +
 wp-admin/users.php                      | 1 +
 wp-admin/widgets.php                    | 1 +
 wp-content/themes/default/functions.php | 1 +
 34 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index 1c0d9fab8..d304fd39a 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -140,6 +140,7 @@ if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
 endif; ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
 
 <ul class="subsubsub"><li class="current"><a class="current"><br /></a></li></ul>
 <form class="search-form" action="" method="get">
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index cb556dac4..9cb613f80 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -121,6 +121,7 @@ if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['sp
 ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
 
 <ul class="subsubsub">
 <?php
diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index 5f621653f..02aaf38e5 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -76,6 +76,7 @@ $messages[6] = __('Categories deleted.'); ?>
 endif; ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
 
 <ul class="subsubsub"><li><a class="current"><br /></a></li></ul>
 <form class="search-form" action="" method="get">
diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index 747e5b9b3..daf8778be 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -320,6 +320,7 @@ add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link'
 </div>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
 
 <!--
 <p id="big-add-button">
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index a680ab45f..d51406508 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -358,6 +358,7 @@ endif;
 </div>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
 
 <form name="post" action="page.php" method="post" id="post">
 <?php if ( $notice ) : ?>
diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php
index b55c3035d..7651430b5 100644
--- a/wp-admin/edit-pages.php
+++ b/wp-admin/edit-pages.php
@@ -66,7 +66,7 @@ if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2']
 }
 
 if ( empty($title) )
-	$title = __('View All Pages');
+	$title = __('Edit Pages');
 $parent_file = 'edit.php';
 wp_enqueue_script('admin-forms');
 wp_enqueue_script('inline-edit-post');
@@ -135,6 +135,8 @@ if ( (int) $_GET['locked'] ) {
 endif; ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
+
 <ul class="subsubsub">
 <?php
 
diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php
index 7848cbc3f..fa5287930 100644
--- a/wp-admin/edit-tags.php
+++ b/wp-admin/edit-tags.php
@@ -143,6 +143,7 @@ $messages[6] = __('Tags deleted.'); ?>
 endif; ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
 
 <ul class="subsubsub"><li class="current"><a class="current"><br /></a></li></ul>
 <form class="search-form" action="" method="get">
diff --git a/wp-admin/export.php b/wp-admin/export.php
index 44e24482b..a09d28ef7 100644
--- a/wp-admin/export.php
+++ b/wp-admin/export.php
@@ -22,6 +22,8 @@ require_once ('admin-header.php');
 ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></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>
diff --git a/wp-admin/import.php b/wp-admin/import.php
index 7cda6959a..928df7214 100644
--- a/wp-admin/import.php
+++ b/wp-admin/import.php
@@ -13,6 +13,7 @@ require_once ('admin-header.php');
 ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></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
diff --git a/wp-admin/index.php b/wp-admin/index.php
index 2fee73403..bab573766 100644
--- a/wp-admin/index.php
+++ b/wp-admin/index.php
@@ -38,6 +38,8 @@ $today = current_time('mysql', 1);
 </div>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2>
+
 <div id="dashboard-widgets-wrap">
 
 <?php wp_dashboard(); ?>
diff --git a/wp-admin/link-add.php b/wp-admin/link-add.php
index 42e8c9e81..de0f268bf 100644
--- a/wp-admin/link-add.php
+++ b/wp-admin/link-add.php
@@ -9,7 +9,7 @@
 /** Load WordPress Administration Bootstrap */
 require_once('admin.php');
 
-$title = __('Add Link');
+$title = __('Add New Link');
 $parent_file = 'link-manager.php';
 
 wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image',
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index 1cdbec990..21a4935ba 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -45,7 +45,7 @@ if ( empty($cat_id) )
 if ( empty($order_by) )
 	$order_by = 'order_name';
 
-$title = __('Manage Links');
+$title = __('Edit Links');
 $this_file = $parent_file = 'edit.php';
 include_once ("./admin-header.php");
 
@@ -95,6 +95,7 @@ if ( isset($_GET['deleted']) ) {
 ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
 
 <div class="filter">
 <form id="list-filter" action="" method="get">
diff --git a/wp-admin/media-new.php b/wp-admin/media-new.php
index 751c8d4c9..4cba71f98 100644
--- a/wp-admin/media-new.php
+++ b/wp-admin/media-new.php
@@ -9,7 +9,6 @@
 $_GET['inline'] = 'true';
 /** Administration bootstrap */
 require_once('admin.php');
-$title = __('Upload New Media');
 require_once('media-upload.php');
 
 ?>
\ No newline at end of file
diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index 64856c392..36aa690ee 100644
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -31,7 +31,7 @@ if ( isset($action) && $action == 'edit' && !$ID )
 	wp_die(__("You are not allowed to be here"));
 
 if ( isset($_GET['inline']) ) {
-	
+
 	if ( isset($_GET['upload-page-form']) ) {
 		$errors = media_upload_form_handler();
 
@@ -52,15 +52,16 @@ if ( isset($_GET['inline']) ) {
 		}
 	}
 
-	$title = __('Upload Media');
+	$title = __('Upload New Media');
 	$parent_file = 'edit.php';
 	require_once('admin-header.php'); ?>
 	<div class="wrap">
+	<h2><?php echo $title ?></h2> 
 
 	<form enctype="multipart/form-data" method="post" action="media-upload.php?inline=&amp;upload-page-form=" class="media-upload-form type-form validate" id="file-form">
-	
+
 	<?php media_upload_form(); ?>
-	
+
 	<script type="text/javascript">
 	jQuery(function($){
 		var preloaded = $(".media-item.preloaded");
diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 471f0dc91..69e8412b7 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -16,6 +16,8 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
+
 <form method="post" action="options.php">
 <input type='hidden' name='option_page' value='discussion' />
 <input type="hidden" name="action" value="update" />
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 1aa22ea2e..1f4b4fbd0 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -49,6 +49,8 @@ include('./admin-header.php');
 ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
+
 <form method="post" action="options.php">
 <input type='hidden' name='option_page' value='general' />
 <input type="hidden" name="action" value="update" />
diff --git a/wp-admin/options-media.php b/wp-admin/options-media.php
index 416223dae..7948d6916 100644
--- a/wp-admin/options-media.php
+++ b/wp-admin/options-media.php
@@ -17,6 +17,7 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
 
 <form action="options.php" method="post">
 <input type="hidden" name="action" value="update" />
diff --git a/wp-admin/options-misc.php b/wp-admin/options-misc.php
index 5a04abb86..e457bd4f3 100644
--- a/wp-admin/options-misc.php
+++ b/wp-admin/options-misc.php
@@ -17,6 +17,8 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
+
 <form method="post" action="options.php">
 <input type='hidden' name='option_page' value='misc' />
 <input type="hidden" name="action" value="update" />
diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php
index dc4e00f27..ec3001f31 100644
--- a/wp-admin/options-permalink.php
+++ b/wp-admin/options-permalink.php
@@ -123,6 +123,8 @@ else
 <?php endif; ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
+
 <form name="form" action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
 
diff --git a/wp-admin/options-privacy.php b/wp-admin/options-privacy.php
index 201677a56..cfe2c93c6 100644
--- a/wp-admin/options-privacy.php
+++ b/wp-admin/options-privacy.php
@@ -16,6 +16,8 @@ include('./admin-header.php');
 ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
+
 <form method="post" action="options.php">
 <?php wp_nonce_field('privacy-options') ?>
 <input type='hidden' name='option_page' value='privacy' />
diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 286347313..af90a088a 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -16,6 +16,8 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
+
 <form name="form1" method="post" action="options.php">
 <?php wp_nonce_field('reading-options') ?>
 <input type='hidden' name='option_page' value='reading' />
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 73b4c4704..316328f44 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -16,6 +16,8 @@ include('admin-header.php');
 ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
+
 <form method="post" action="options.php">
 <?php wp_nonce_field('writing-options') ?>
 <input type='hidden' name='option_page' value='writing' />
diff --git a/wp-admin/page-new.php b/wp-admin/page-new.php
index 42d400c78..ab2215ddb 100644
--- a/wp-admin/page-new.php
+++ b/wp-admin/page-new.php
@@ -8,7 +8,7 @@
 
 /** WordPress Administration Bootstrap */
 require_once('admin.php');
-$title = __('New Page');
+$title = __('Add New Page');
 $parent_file = 'edit-pages.php';
 $editing = true;
 wp_enqueue_script('autosave');
diff --git a/wp-admin/plugin-editor.php b/wp-admin/plugin-editor.php
index a7c58aa9f..1cabd3de1 100644
--- a/wp-admin/plugin-editor.php
+++ b/wp-admin/plugin-editor.php
@@ -96,6 +96,8 @@ default:
 </div>
 <?php endif; ?>
 <div class="wrap">
+	<h2><?php echo $title ?></h2> 
+
 <div class="tablenav">
 <div class="alignleft">
 <big><?php
diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php
index d974cbd01..2ab1fa58a 100644
--- a/wp-admin/plugin-install.php
+++ b/wp-admin/plugin-install.php
@@ -52,6 +52,8 @@ do_action('install_plugins_pre_' . $tab); //Used to override the general interfa
 include('admin-header.php');
 ?>
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
+
 	<ul class="subsubsub">
 <?php
 $display_tabs = array();
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index c37b5a3a8..6947e1176 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -203,6 +203,8 @@ if( !empty($invalid) )
 <?php endif; ?>
 
 <div class="wrap">
+	<h2><?php echo $title ?></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
 
diff --git a/wp-admin/theme-editor.php b/wp-admin/theme-editor.php
index 3cd2d46d8..c5b2e7c81 100644
--- a/wp-admin/theme-editor.php
+++ b/wp-admin/theme-editor.php
@@ -99,8 +99,8 @@ $description = get_file_description($file);
 $desc_header = ( $description != $file_show ) ? "$description</strong> (%s)" : "%s";
 ?>
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
 <div class="bordertitle">
-	<h2><?php _e('Theme Editor'); ?></h2>
 	<form id="themeselector" action="theme-editor.php" method="post">
 		<strong><label for="theme"><?php _e('Select theme to edit:'); ?> </label></strong>
 		<select name="theme" id="theme">
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index 483f6633d..6c17a818e 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -98,6 +98,8 @@ function theme_update_available( $theme ) {
 ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
+
 <h2><?php _e('Current Theme'); ?></h2>
 <div id="current-theme">
 <?php if ( $ct->screenshot ) : ?>
diff --git a/wp-admin/turbo.php b/wp-admin/turbo.php
index 8672a7279..6599b1c72 100644
--- a/wp-admin/turbo.php
+++ b/wp-admin/turbo.php
@@ -17,6 +17,8 @@ require_once('admin-header.php');
 if ( ! $is_opera ) {
 ?>
 	<div id="gears-info-box" class="wrap">
+	<h2><?php echo $title ?></h2> 
+
 	<img src="images/gear.png" title="Gear" alt="" class="gears-img" />
 	<div id="gears-msg1">
 	<h3 class="info-box-title"><?php _e('Speed up WordPress'); ?></h3>
diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index dff6d9649..547674fe3 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -183,6 +183,7 @@ if ( isset($message) ) { ?>
 <?php do_action('restrict_manage_posts'); ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
 
 <ul class="subsubsub">
 <?php
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index efac07629..30ffcd77c 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -177,6 +177,7 @@ include ('admin-header.php');
 <?php endif; ?>
 
 <div class="wrap" id="profile-page">
+	<h2><?php echo $title ?></h2> 
 
 <form id="your-profile" action="" method="post">
 <?php wp_nonce_field('update-user_' . $user_id) ?>
diff --git a/wp-admin/users.php b/wp-admin/users.php
index bae299384..a9b735c6b 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -264,6 +264,7 @@ if ( ! empty($messages) ) {
 } ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
 
 <form id="posts-filter" action="" method="get">
 	<?php if ( $wp_user_search->is_search() ) : ?>
diff --git a/wp-admin/widgets.php b/wp-admin/widgets.php
index 4e1dbfe4f..e761c0bc9 100644
--- a/wp-admin/widgets.php
+++ b/wp-admin/widgets.php
@@ -233,6 +233,7 @@ require_once( 'admin-header.php' ); ?>
 <?php endif; ?>
 
 <div class="wrap">
+<h2><?php echo $title ?></h2> 
 
 	<form id="widgets-filter" action="" method="get">
 
diff --git a/wp-content/themes/default/functions.php b/wp-content/themes/default/functions.php
index 72bf7d5ef..7e9c52dab 100644
--- a/wp-content/themes/default/functions.php
+++ b/wp-content/themes/default/functions.php
@@ -363,6 +363,7 @@ function kubrick_theme_page() {
 	if ( isset( $_REQUEST['saved'] ) ) echo '<div id="message" class="updated fade"><p><strong>'.__('Options saved.').'</strong></p></div>';
 ?>
 <div class='wrap'>
+	<h2><?php _e('Customize Header'); ?></h2>
 	<div id="kubrick-header">
 		<div id="headwrap">
 			<div id="header">