Adjust heading structure for pages using wp-admin/css/install.css

The readme, installation, upgrade, and repair pages use a common css file. The heading structure for these pages was inconstant with h2s where there should be h1s, h1s where there is no relevant info and sometimes, no h1s at all.

Fixes #34519
Props rianrietveld


Built from https://develop.svn.wordpress.org/trunk@35508


git-svn-id: http://core.svn.wordpress.org/trunk@35472 1a063a9b-81f0-0310-95a4-ce76da25c4cd

readme.html

@@ -13,11 +13,11 @@
 </h1>
 <p style="text-align: center">Semantic Personal Publishing Platform</p>
 
-<h1>First Things First</h1>
+<h2>First Things First</h2>
 <p>Welcome. WordPress is a very special project to me. Every developer and contributor adds something unique to the mix, and together we create something beautiful that I&#8217;m proud to be a part of. Thousands of hours have gone into WordPress, and we&#8217;re dedicated to making it better every day. Thank you for making it part of your world.</p>
 <p style="text-align: right">&#8212; Matt Mullenweg</p>
 
-<h1>Installation: Famous 5-minute install</h1>
+<h2>Installation: Famous 5-minute install</h2>
 <ol>
 	<li>Unzip the package in an empty directory and upload everything.</li>
 	<li>Open <span class="file"><a href="wp-admin/install.php">wp-admin/install.php</a></span> in your browser. It will take you through the process to set up a <code>wp-config.php</code> file with your database connection details.
@@ -32,15 +32,15 @@
 	<li>The installer should then send you to the <a href="wp-login.php">login page</a>. Sign in with the username and password you chose during the installation. If a password was generated for you, you can then click on &#8220;Profile&#8221; to change the password.</li>
 </ol>
 
-<h1>Updating</h1>
-<h2>Using the Automatic Updater</h2>
+<h2>Updating</h2>
+<h3>Using the Automatic Updater</h3>
 <p>If you are updating from version 2.7 or higher, you can use the automatic updater:</p>
 <ol>
 	<li>Open <span class="file"><a href="wp-admin/update-core.php">wp-admin/update-core.php</a></span> in your browser and follow the instructions.</li>
 	<li>You wanted more, perhaps? That&#8217;s it!</li>
 </ol>
 
-<h2>Updating Manually</h2>
+<h3>Updating Manually</h3>
 <ol>
 	<li>Before you update anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</li>
 	<li>Delete your old WordPress files, saving ones you&#8217;ve modified.</li>
@@ -48,16 +48,16 @@
 	<li>Point your browser to <span class="file"><a href="wp-admin/upgrade.php">/wp-admin/upgrade.php</a>.</span></li>
 </ol>
 
-<h1>Migrating from other systems</h1>
+<h2>Migrating from other systems</h2>
 <p>WordPress can <a href="https://codex.wordpress.org/Importing_Content">import from a number of systems</a>. First you need to get WordPress installed and working as described above, before using <a href="wp-admin/import.php" title="Import to WordPress">our import tools</a>.</p>
 
-<h1>System Requirements</h1>
+<h2>System Requirements</h2>
 <ul>
 	<li><a href="http://php.net/">PHP</a> version <strong>5.2.4</strong> or higher.</li>
 	<li><a href="http://www.mysql.com/">MySQL</a> version <strong>5.0</strong> or higher.</li>
 </ul>
 
-<h2>Recommendations</h2>
+<h3>Recommendations</h3>
 <ul>
 	<li><a href="http://php.net/">PHP</a> version <strong>5.6</strong> or higher.</li>
 	<li><a href="http://www.mysql.com/">MySQL</a> version <strong>5.5</strong> or higher.</li>
@@ -65,7 +65,7 @@
 	<li>A link to <a href="https://wordpress.org/">wordpress.org</a> on your site.</li>
 </ul>
 
-<h1>Online Resources</h1>
+<h2>Online Resources</h2>
 <p>If you have any questions that aren&#8217;t addressed in this document, please take advantage of WordPress&#8217; numerous online resources:</p>
 <dl>
 	<dt><a href="https://codex.wordpress.org/">The WordPress Codex</a></dt>
@@ -80,18 +80,18 @@
 		<dd>There is an online chat channel that is used for discussion among people who use WordPress and occasionally support topics. The above wiki page should point you in the right direction. (<a href="irc://irc.freenode.net/wordpress">irc.freenode.net #wordpress</a>)</dd>
 </dl>
 
-<h1>Final Notes</h1>
+<h2>Final Notes</h2>
 <ul>
 	<li>If you have any suggestions, ideas, or comments, or if you (gasp!) found a bug, join us in the <a href="https://wordpress.org/support/">Support Forums</a>.</li>
 	<li>WordPress has a robust plugin <abbr title="application programming interface">API</abbr> that makes extending the code easy. If you are a developer interested in utilizing this, see the <a href="https://codex.wordpress.org/Plugin_API" title="WordPress plugin API">plugin documentation in the Codex</a>. You shouldn&#8217;t modify any of the core code.</li>
 </ul>
 
-<h1>Share the Love</h1>
+<h2>Share the Love</h2>
 <p>WordPress has no multi-million dollar marketing campaign or celebrity sponsors, but we do have something even better&#8212;you. If you enjoy WordPress please consider telling a friend, setting it up for someone less knowledgable than yourself, or writing the author of a media article that overlooks us.</p>
 
 <p>WordPress is the official continuation of <a href="http://cafelog.com/">b2/caf&#233;log</a>, which came from Michel V. The work has been continued by the <a href="https://wordpress.org/about/">WordPress developers</a>. If you would like to support WordPress, please consider <a href="https://wordpress.org/donate/" title="Donate to WordPress">donating</a>.</p>
 
-<h1>License</h1>
+<h2>License</h2>
 <p>WordPress is free software, and is released under the terms of the <abbr title="GNU General Public License">GPL</abbr> version 2 or (at your option) any later version. See <a href="license.txt">license.txt</a>.</p>
 
 </body>

wp-admin/css/install-rtl.css

@@ -38,7 +38,7 @@ a:focus {
 	outline: #5b9dd9 solid 1px;
 }
 
-h1 {
+h1, h2 {
 	border-bottom: 1px solid #dedede;
 	clear: both;
 	color: #666;
@@ -49,7 +49,7 @@ h1 {
 	font-weight: normal;
 }
 
-h2 {
+h3 {
 	font-size: 16px;
 }
 
@@ -87,6 +87,7 @@ label {
 
 #logo {
 	margin: 6px 0 14px 0;
+	padding: 0 0 7px 0;
 	border-bottom: none;
 	text-align:center
 }

wp-admin/css/install.css

@@ -38,7 +38,7 @@ a:focus {
 	outline: #5b9dd9 solid 1px;
 }
 
-h1 {
+h1, h2 {
 	border-bottom: 1px solid #dedede;
 	clear: both;
 	color: #666;
@@ -49,7 +49,7 @@ h1 {
 	font-weight: normal;
 }
 
-h2 {
+h3 {
 	font-size: 16px;
 }
 
@@ -87,6 +87,7 @@ label {
 
 #logo {
 	margin: 6px 0 14px 0;
+	padding: 0 0 7px 0;
 	border-bottom: none;
 	text-align:center
 }

wp-admin/install.php

@@ -16,8 +16,8 @@ if ( false ) {
 	<title>Error: PHP is not running</title>
 </head>
 <body class="wp-core-ui">
-	<h1 id="logo"><a href="https://wordpress.org/">WordPress</a></h1>
-	<h2>Error: PHP is not running</h2>
+	<p id="logo"><a href="https://wordpress.org/">WordPress</a></p>
+	<h1>Error: PHP is not running</h1>
 	<p>WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.</p>
 </body>
 </html>
@@ -76,7 +76,7 @@ function display_header( $body_classes = '' ) {
 	?>
 </head>
 <body class="wp-core-ui<?php echo $body_classes ?>">
-<h1 id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></h1>
+<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
 
 <?php
 } // end display_header()
@@ -106,6 +106,7 @@ function display_setup_form( $error = null ) {
 
 	if ( ! is_null( $error ) ) {
 ?>
+<h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
 <p class="message"><?php echo $error; ?></p>
 <?php } ?>
 <form id="setup" method="post" action="install.php?step=2" novalidate="novalidate">
@@ -286,7 +287,7 @@ switch($step) {
 <h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
 <p><?php _e( 'Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ); ?></p>
 
-<h1><?php _e( 'Information needed' ); ?></h1>
+<h2><?php _e( 'Information needed' ); ?></h2>
 <p><?php _e( 'Please provide the following information. Don&#8217;t worry, you can always change these settings later.' ); ?></p>
 
 <?php

wp-admin/maint/repair.php

@@ -22,11 +22,14 @@ header( 'Content-Type: text/html; charset=utf-8' );
 	?>
 </head>
 <body class="wp-core-ui">
-<h1 id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></h1>
+<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
 
 <?php
 
 if ( ! defined( 'WP_ALLOW_REPAIR' ) ) {
+
+	echo '<h1 class="screen-reader-text">' . __( 'Allow automatic repair database' ) . '</h1>';
+
 	echo '<p>' . __( 'To allow use of this page to automatically repair database problems, please add the following line to your <code>wp-config.php</code> file. Once this line is added to your config, reload this page.' ) . "</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
 
 	$default_key     = 'put your unique phrase here';
@@ -52,11 +55,17 @@ if ( ! defined( 'WP_ALLOW_REPAIR' ) ) {
 	$duplicated_keys = array_filter( $duplicated_keys );
 
 	if ( $duplicated_keys || $missing_key ) {
+
+		echo '<h2 class="screen-reader-text">' . __( 'Check secret keys' ) . '</h2>';
+
 		// Translators: 1: wp-config.php; 2: Secret key service URL.
 		echo '<p>' . sprintf( __( 'While you are editing your %1$s file, take a moment to make sure you have all 8 keys and that they are unique. You can generate these using the <a href="%2$s">WordPress.org secret key service</a>.' ), '<code>wp-config.php</code>', 'https://api.wordpress.org/secret-key/1.1/salt/' ) . '</p>';
 	}
 
 } elseif ( isset( $_GET['repair'] ) ) {
+
+	echo '<h1 class="screen-reader-text">' . __( 'Results database repair' ) . '</h1>';
+
 	$optimize = 2 == $_GET['repair'];
 	$okay = true;
 	$problems = array();
@@ -137,6 +146,9 @@ if ( ! defined( 'WP_ALLOW_REPAIR' ) ) {
 		echo '<p>' . __( 'Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.' ) . "</p><p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
 	}
 } else {
+
+	echo '<h1 class="screen-reader-text">' . __( 'WordPress database repair' ) . '</h1>';
+
 	if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] )
 		echo '<p>' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.' ) . '</p>';
 	else

wp-admin/setup-config.php

@@ -88,7 +88,7 @@ function setup_config_display_header( $body_classes = array() ) {
 	<?php wp_admin_css( 'install', true ); ?>
 </head>
 <body class="<?php echo implode( ' ', $body_classes ); ?>">
-<h1 id="logo"><a href="<?php esc_attr_e( 'https://wordpress.org/' ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></h1>
+<p id="logo"><a href="<?php esc_attr_e( 'https://wordpress.org/' ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
 <?php
 } // end function setup_config_display_header();
 
@@ -103,6 +103,7 @@ switch($step) {
 	case -1:
 		if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
 			setup_config_display_header( 'language-chooser' );
+			echo '<h1 class="screen-reader-text">Select a default language</h1>';
 			echo '<form id="setup" method="post" action="?step=0">';
 			wp_install_language_form( $languages );
 			echo '</form>';
@@ -129,7 +130,7 @@ switch($step) {
 			$step_1 .= '&amp;language=' . $loaded_language;
 		}
 ?>
-
+<h1 class="screen-reader-text"><?php _e( 'Before getting started' ) ?></h1>
 <p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ) ?></p>
 <ol>
 	<li><?php _e( 'Database name' ); ?></li>
@@ -155,6 +156,7 @@ switch($step) {
 
 		setup_config_display_header();
 	?>
+<h1 class="screen-reader-text"><?php _e( 'Setup your database connection' ) ?></h1>
 <form method="post" action="setup-config.php?step=2">
 	<p><?php _e( "Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host." ); ?></p>
 	<table class="form-table">
@@ -344,6 +346,7 @@ if ( ! /iPad|iPod|iPhone/.test( navigator.userAgent ) ) {
 		chmod( $path_to_wp_config, 0666 );
 		setup_config_display_header();
 ?>
+<h1 class="screen-reader-text"><?php _e( 'Successful database connection' ) ?></h1>
 <p><?php _e( "All right, sparky! You&#8217;ve made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;" ); ?></p>
 
 <p class="step"><a href="<?php echo $install; ?>" class="button button-large"><?php _e( 'Run the install' ); ?></a></p>

wp-admin/upgrade.php

@@ -67,11 +67,11 @@ else
 	?>
 </head>
 <body class="wp-core-ui">
-<h1 id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></h1>
+<p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
 
 <?php if ( get_option( 'db_version' ) == $wp_db_version || !is_blog_installed() ) : ?>
 
-<h2><?php _e( 'No Update Required' ); ?></h2>
+<h1><?php _e( 'No Update Required' ); ?></h1>
 <p><?php _e( 'Your WordPress database is already up-to-date!' ); ?></p>
 <p class="step"><a class="button button-large" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p>
 
@@ -92,7 +92,7 @@ switch ( $step ) :
 			$goback = urlencode( $goback );
 		}
 ?>
-<h2><?php _e( 'Database Update Required' ); ?></h2>
+<h1><?php _e( 'Database Update Required' ); ?></h1>
 <p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.' ); ?></p>
 <p><?php _e( 'The database update process may take a little while, so please be patient.' ); ?></p>
 <p class="step"><a class="button button-large button-primary" href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e( 'Update WordPress Database' ); ?></a></p>
@@ -105,7 +105,7 @@ switch ( $step ) :
 			$backto = esc_url( $backto );
 			$backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/');
 ?>
-<h2><?php _e( 'Update Complete' ); ?></h2>
+<h1><?php _e( 'Update Complete' ); ?></h1>
 	<p><?php _e( 'Your WordPress database has been successfully updated!' ); ?></p>
 	<p class="step"><a class="button button-large" href="<?php echo $backto; ?>"><?php _e( 'Continue' ); ?></a></p>
 

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-beta2-35507';
+$wp_version = '4.4-beta2-35508';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.