From 395bc6e8d8431c7a79c1cc540d6d0b8e774cd4ac Mon Sep 17 00:00:00 2001 From: Aaron Jorbin Date: Wed, 4 Nov 2015 17:59:35 +0000 Subject: [PATCH] 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 git-svn-id: https://develop.svn.wordpress.org/trunk@35508 602fd350-edb4-49c9-b593-d223f7449a82 --- src/readme.html | 24 ++++++++++++------------ src/wp-admin/css/install.css | 5 +++-- src/wp-admin/install.php | 9 +++++---- src/wp-admin/maint/repair.php | 14 +++++++++++++- src/wp-admin/setup-config.php | 7 +++++-- src/wp-admin/upgrade.php | 8 ++++---- 6 files changed, 42 insertions(+), 25 deletions(-) diff --git a/src/readme.html b/src/readme.html index d581b8b3fc..db631011b4 100644 --- a/src/readme.html +++ b/src/readme.html @@ -13,11 +13,11 @@

Semantic Personal Publishing Platform

-

First Things First

+

First Things First

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’m proud to be a part of. Thousands of hours have gone into WordPress, and we’re dedicated to making it better every day. Thank you for making it part of your world.

— Matt Mullenweg

-

Installation: Famous 5-minute install

+

Installation: Famous 5-minute install

  1. Unzip the package in an empty directory and upload everything.
  2. Open wp-admin/install.php in your browser. It will take you through the process to set up a wp-config.php file with your database connection details. @@ -32,15 +32,15 @@
  3. The installer should then send you to the login page. Sign in with the username and password you chose during the installation. If a password was generated for you, you can then click on “Profile” to change the password.
-

Updating

-

Using the Automatic Updater

+

Updating

+

Using the Automatic Updater

If you are updating from version 2.7 or higher, you can use the automatic updater:

  1. Open wp-admin/update-core.php in your browser and follow the instructions.
  2. You wanted more, perhaps? That’s it!
-

Updating Manually

+

Updating Manually

  1. Before you update anything, make sure you have backup copies of any files you may have modified such as index.php.
  2. Delete your old WordPress files, saving ones you’ve modified.
    3. @@ -48,16 +48,16 @@
  3. Point your browser to /wp-admin/upgrade.php.
-

Migrating from other systems

+

Migrating from other systems

WordPress can import from a number of systems. First you need to get WordPress installed and working as described above, before using our import tools.

-

System Requirements

+

System Requirements

-

Recommendations

+

Recommendations

-

Online Resources

+

Online Resources

If you have any questions that aren’t addressed in this document, please take advantage of WordPress’ numerous online resources:

The WordPress Codex
@@ -80,18 +80,18 @@
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. (irc.freenode.net #wordpress)
-

Final Notes

+

Final Notes

-

Share the Love

+

Share the Love

WordPress has no multi-million dollar marketing campaign or celebrity sponsors, but we do have something even better—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.

WordPress is the official continuation of b2/cafélog, which came from Michel V. The work has been continued by the WordPress developers. If you would like to support WordPress, please consider donating.

-

License

+

License

WordPress is free software, and is released under the terms of the GPL version 2 or (at your option) any later version. See license.txt.

diff --git a/src/wp-admin/css/install.css b/src/wp-admin/css/install.css index 74958aa163..84424d7dc2 100644 --- a/src/wp-admin/css/install.css +++ b/src/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 } diff --git a/src/wp-admin/install.php b/src/wp-admin/install.php index 2011476e87..3e857e9752 100644 --- a/src/wp-admin/install.php +++ b/src/wp-admin/install.php @@ -16,8 +16,8 @@ if ( false ) { Error: PHP is not running -

WordPress

-

Error: PHP is not running

+ +

Error: PHP is not running

WordPress requires that your web server is running PHP. Your server does not have PHP installed, or PHP is turned off.

@@ -76,7 +76,7 @@ function display_header( $body_classes = '' ) { ?> -

+ +

@@ -286,7 +287,7 @@ switch($step) {

-

+

-

+ ' . __( 'Allow automatic repair database' ) . ''; + echo '

' . __( 'To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file. Once this line is added to your config, reload this page.' ) . "

define('WP_ALLOW_REPAIR', true);

"; $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 '

' . __( 'Check secret keys' ) . '

'; + // Translators: 1: wp-config.php; 2: Secret key service URL. echo '

' . 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 WordPress.org secret key service.' ), 'wp-config.php', 'https://api.wordpress.org/secret-key/1.1/salt/' ) . '

'; } } elseif ( isset( $_GET['repair'] ) ) { + + echo '

' . __( 'Results database repair' ) . '

'; + $optimize = 2 == $_GET['repair']; $okay = true; $problems = array(); @@ -137,6 +146,9 @@ if ( ! defined( 'WP_ALLOW_REPAIR' ) ) { echo '

' . __( 'Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.' ) . "

define('WP_ALLOW_REPAIR', true);

"; } } else { + + echo '

' . __( 'WordPress database repair' ) . '

'; + if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] ) echo '

' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the “Repair Database” button. Repairing can take a while, so please be patient.' ) . '

'; else diff --git a/src/wp-admin/setup-config.php b/src/wp-admin/setup-config.php index e94dc6bc2d..1f6a3ec4a4 100644 --- a/src/wp-admin/setup-config.php +++ b/src/wp-admin/setup-config.php @@ -88,7 +88,7 @@ function setup_config_display_header( $body_classes = array() ) { -

+ Select a default language'; echo ''; wp_install_language_form( $languages ); echo '
'; @@ -129,7 +130,7 @@ switch($step) { $step_1 .= '&language=' . $loaded_language; } ?> - +

    2. @@ -155,6 +156,7 @@ switch($step) { setup_config_display_header(); ?> +

    @@ -344,6 +346,7 @@ if ( ! /iPad|iPod|iPhone/.test( navigator.userAgent ) ) { chmod( $path_to_wp_config, 0666 ); setup_config_display_header(); ?> +

    diff --git a/src/wp-admin/upgrade.php b/src/wp-admin/upgrade.php index 9d8a50e869..0f63086c1a 100644 --- a/src/wp-admin/upgrade.php +++ b/src/wp-admin/upgrade.php @@ -67,11 +67,11 @@ else ?> -

    + -

    +

    @@ -92,7 +92,7 @@ switch ( $step ) : $goback = urlencode( $goback ); } ?> -

    +

    @@ -105,7 +105,7 @@ switch ( $step ) : $backto = esc_url( $backto ); $backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/'); ?> -

    +