From a229ea9c65b5251869197f2907f1c4efc11e376c Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Mon, 17 Dec 2018 16:35:32 +0000 Subject: [PATCH] Help/About: WordPress 5.0 About Page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The About page describes all the great changes in WordPress 5.0. Highlights: - Warn users of Gutenberg plugin of its deactivation upon 5.0 upgrade. - Added illustrations to the Four Freedoms page. - Include a link to wporg user’s plugin favorites as a way to display only the classic plugin as a suggestion for install. - Detail the Classic Editor plugin and the support timeline. Props pixelverbieger, ocean90, karmatosed, pento, boemedia, lonelyvegan, sami.keijonen, TimothyBlynJacobs, xkon, afercia, laurelfulford, joostdevalk, ipstenu, matveb, joen, tinkerbelly, chanthaboune, kjellr, alexislloyd, melchoyce, mcsf, courtney0burton, Otto42, cathibosco, tobifjellner, helen, audrasjb, antpb, jjj, elrae, desrosj, azaozz, joemcgill, skithund, gziolo. Merges [43913], [43921-43922], [43937-43938], [43946-43947], [43952-43953], [43967-43969] into trunk. Fixes #45178. git-svn-id: https://develop.svn.wordpress.org/trunk@44264 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/about.php | 546 ++++++++++++------ src/wp-admin/credits.php | 2 +- src/wp-admin/css/about.css | 224 +++---- src/wp-admin/freedoms.php | 60 +- .../class-wp-plugin-install-list-table.php | 6 +- src/wp-admin/includes/upgrade.php | 7 + src/wp-includes/class-wp-block-parser.php | 85 ++- 7 files changed, 583 insertions(+), 347 deletions(-) diff --git a/src/wp-admin/about.php b/src/wp-admin/about.php index 8c415dc318..0e315b3a74 100644 --- a/src/wp-admin/about.php +++ b/src/wp-admin/about.php @@ -16,12 +16,43 @@ $title = _x( 'About', 'page title' ); list( $display_version ) = explode( '-', get_bloginfo( 'version' ) ); +wp_enqueue_style( 'wp-block-library' ); + include( ABSPATH . 'wp-admin/admin-header.php' ); ?>

-

+

+ + +
+ ', + '' + ); + ?> +
+ +

+ ℹ +

+ +

@@ -33,209 +64,378 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
-

- -

-

+

-
+
- - + + + +
-
-
-

-
- -
-
-
- -
-

-

-
-
-
- -
-

-

-
-
-
- -
-

-

-
-
-
- -
-

-

-
+
+
+

-
-
-

+
+
+
+ + + + +
+
- -
-
-
- -
-

-

-
-
-
- -
-

-

-
-
-
- -
-

-

-
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
-
-
-

-
- -
-
-
- -
-

-

-
-
-
- -
-

-

-
+
+
+

+

+ +

-
-
-

+
+
+
+ + + + +
+
- -
-
-
- -
-

-

-
-
-
- -
-

-

-
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
-
- - - - +
+
+

+

+ +
-
-

- -

-

- early tester or getting involved with the Gutenberg project? Contribute on GitHub.' ), - __( 'https://wordpress.org/plugins/gutenberg/' ), - 'https://github.com/WordPress/gutenberg' - ); - ?> -

+ +
+
+ +
+
+ + + +
+ +
+
+

+
+
+ +
+
+ + + + + + + +
+
+
+ +
+
+

+
+
+ +
+
+ + + + +

+

+
+
+ + + + +

+

+
+
+ +

+

+
+
+ + +
+
+ +
+
+ + +
+ +
+
+

+
+
+ +
+
+ + + + +

+

+
+
+ + + + +

+

+
+
+ + + + +

+

+
+
+ +
+
+ +
-
-

- -

- -
+ +
-

-

- Check out the full list.' ), - 'https://make.wordpress.org/core/2017/11/01/improvements-to-the-customize-js-api-in-4-9/' - ); - ?> -

-
-
-

-

-
-
-

-

-
-
-

-

+

-
-
+
+ + + + + + +
+ +
+
+

+

+

+ +
+ +
+ +
+
+ +
+
diff --git a/src/wp-admin/credits.php b/src/wp-admin/credits.php index 1b9646027f..be36bdb368 100644 --- a/src/wp-admin/credits.php +++ b/src/wp-admin/credits.php @@ -20,7 +20,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

-

+

diff --git a/src/wp-admin/css/about.css b/src/wp-admin/css/about.css index b1cfe3ab69..7b20cbce4f 100644 --- a/src/wp-admin/css/about.css +++ b/src/wp-admin/css/about.css @@ -40,17 +40,38 @@ .about-wrap hr { border: 0; height: 0; - margin: 0; + margin: 3em 0 0; border-top: 1px solid rgba(0, 0, 0, 0.1); } .about-wrap img { margin: 0; - max-width: 100%; + width: 100%; height: auto; vertical-align: middle; } +.about-wrap figure { + position: relative; + margin: 0; +} + +.about-wrap .feature-section figure img { + margin-bottom: 0; +} + +.about-wrap figcaption { + position: absolute; + bottom: 0; + width: 100%; + padding: 40px 10px 15px; + overflow: auto; + box-sizing: border-box; + background: linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 60%,transparent); + font-weight: 600; + text-shadow: 0px 0px 5px rgba(0,0,0,.75); +} + .about-wrap .jetpack-video-wrapper { margin-bottom: 0; } @@ -132,25 +153,19 @@ color: #23282d; } -.about-wrap .changelog h2 { - font-size: 1.4em; - font-weight: 600; - text-align: left; -} - -.about-wrap .changelog h3 { - margin: 1.33em 0; - font-size: 1em; - line-height: inherit; - color: #23282d; -} - .about-wrap code, .about-wrap ol li p { font-size: 14px; font-weight: 400; } +.about-wrap figcaption { + font-size: 13px; + text-align: center; + color: white; + text-overflow: ellipsis; +} + .about-wrap .about-description, .about-wrap .about-text { margin-top: 1.4em; @@ -161,7 +176,6 @@ .about-wrap .about-text { margin: 1em 200px 1em 0; - min-height: 60px; color: #555d66; } @@ -175,7 +189,7 @@ .about-wrap .feature-section.one-col { margin: 0 auto; - max-width: 700px; + max-width: 680px; } .about-wrap .inline-svg img { @@ -197,12 +211,35 @@ max-width: 47%; } +.about-wrap .three-col, +.about-wrap .four-col { + margin: auto; + max-width: 1020px; +} + .about-wrap .three-col .col { align-self: flex-start; min-width: 31%; max-width: 31%; } +.about-wrap .four-col .col { + align-self: flex-start; + min-width: 23%; + max-width: 23%; +} + +.about-wrap .feature-section.eight-col .col { + align-self: flex-start; + margin-top: 6px; + min-width: 12%; + max-width: 12%; +} + +.about-wrap .one-col img { + margin: 1em 0 2em; +} + .about-wrap .two-col img { margin-bottom: 1.5em; } @@ -215,6 +252,18 @@ background: transparent; /* Hide loading.gif */ } +.about-wrap video { + margin: 1.5em auto; +} + +.about-wrap .cta { + text-align: center; +} +.about-wrap .cta .button { + margin: 0 auto 5px; + font-weight: 600; +} + /* 1.3 - Point Releases */ .about-wrap .point-releases { @@ -255,9 +304,7 @@ } .about-wrap .two-col-text { - -webkit-column-count: 2; column-count: 2; - -webkit-column-gap: 40px; column-gap: 40px; } @@ -270,6 +317,10 @@ margin-bottom: 3em; } +.about-wrap .under-the-hood img + h3 { + margin-top: 1.25em; +} + /* 2.2 - Structure */ .about-wrap .headline-feature.feature-video { @@ -296,7 +347,6 @@ .about-wrap .feature-section { overflow: hidden; - padding: 0 0 40px; } .about-wrap .feature-section.no-heading { @@ -307,10 +357,6 @@ overflow: hidden; } -.about-wrap .feature-section img { - margin-bottom: 1em; -} - .about-wrap .embed-container { text-align: center; } @@ -348,84 +394,6 @@ padding: 0 5px; } -/* 2.3 Floating Header Layout */ - -.about-wrap .floating-header-section { - display: -ms-grid; - display: grid; - grid-gap: 0 60px; - -ms-grid-columns: 5fr 11fr; - grid-template-columns: 5fr 11fr; - max-width: 1020px; - margin: 0 auto 120px; -} - -.about-wrap .floating-header-section .section-header { - -ms-grid-column: 1; - grid-column: 1; - position: relative; - min-width: 230px; - max-width: 300px; -} - -.about-wrap .floating-header-section h2 { - margin: 0; - text-align: left; - position: absolute; -} - -.about-wrap .floating-header-section .section-content { - -ms-grid-column: 2; - grid-column: 2; - display: flex; - justify-content: space-between; - align-items: flex-start; - flex-flow: row wrap; - flex-grow: 2; - flex-shrink: 0; -} - -.about-wrap .floating-header-section .section-item { - flex-grow: 1; - max-width: calc(50% - 30px); -} - -.about-wrap .floating-header-section .section-item:nth-child(1), -.about-wrap .floating-header-section .section-item:nth-child(2) { - margin-bottom: 60px; -} - -.about-wrap .floating-header-section .section-item:nth-child(1):nth-last-child(2), -.about-wrap .floating-header-section .section-item:nth-child(2):nth-last-child(1) { - margin-bottom: 0; -} - -.about-wrap .floating-header-section.has-long-title { - display: block; -} - -.about-wrap .floating-header-section.has-long-title .section-header { - max-width: 100%; -} - -.about-wrap .floating-header-section.has-long-title h2 { - position: static; - margin-bottom: 60px; -} - -.about-wrap .floating-header-section.has-long-title .section-content { - justify-content: flex-start; -} - -.about-wrap .floating-header-section.has-long-title .section-item { - max-width: 300px; - margin-bottom: 0; -} - -.about-wrap .floating-header-section.has-long-title .section-item + .section-item { - margin-left: 60px; -} - /*------------------------------------------------------------------------------ 3.0 - Credits & Freedoms Pages ------------------------------------------------------------------------------*/ @@ -513,6 +481,21 @@ margin: 0.6em 0; } +.freedoms-php .about-wrap .col .freedoms-image { + background-image: url('https://s.w.org/wp-content/themes/pub/wporg-main/images/freedoms-2x.png'); + background-size: 100%; + padding-top: 100%; +} +.freedoms-php .about-wrap .col:nth-of-type(2) .freedoms-image { + background-position: 0 34%; +} +.freedoms-php .about-wrap .col:nth-of-type(3) .freedoms-image { + background-position: 0 66%; +} +.freedoms-php .about-wrap .col:nth-of-type(4) .freedoms-image { + background-position: 0 100%; +} + /*------------------------------------------------------------------------------ 4.0 - Media Queries ------------------------------------------------------------------------------*/ @@ -536,20 +519,36 @@ @media screen and (max-width: 782px) { .about-wrap .two-col-text { - -webkit-column-count: 1; column-count: 1; } .about-wrap .two-col .col, - .about-wrap .three-col .col { + .about-wrap .three-col .col, + .about-wrap .four-col .col { min-width: 48% !important; } - .about-wrap .three-col img { + .about-wrap .eight-col .col { + min-width: 24% !important; + } + + .about-wrap .three-col img, + .about-wrap .four-col img, + .about-wrap .eight-col img { display: block; margin: 0 auto; } + .about-wrap figcaption { + position: relative; + margin-top: 10px; + margin-bottom: 15px; + padding: 0; + background: none; + color: #40464D; + text-shadow: none; + } + .about-wrap .floating-header-section { display: block; } @@ -586,11 +585,21 @@ width: 100%; } + .about-wrap .feature-section .col { + margin-top: 1em; + } + .about-wrap .two-col .col, + .about-wrap .three-col .col, .about-wrap .three-col .col { min-width: 100% !important; } + .about-wrap .eight-col .col { + min-width: 48% !important; + } + + .about-wrap .under-the-hood.four-col .col, .about-wrap .under-the-hood.three-col .col, .about-wrap .under-the-hood.two-col .col, .about-wrap .under-the-hood.one-col .col { @@ -603,9 +612,8 @@ margin-top: 0; } - .about-wrap .under-the-hood:nth-of-type(2n) h3, - .about-wrap .under-the-hood:nth-of-type(3n) h3 { - margin-top: 0; + .about-wrap .under-the-hood img + h3 { + margin-top: 1.25em; } .about-wrap .floating-header-section { diff --git a/src/wp-admin/freedoms.php b/src/wp-admin/freedoms.php index ecf44a3ebc..6fe3e690ac 100644 --- a/src/wp-admin/freedoms.php +++ b/src/wp-admin/freedoms.php @@ -30,7 +30,7 @@ if ( $is_privacy_notice ) {

-

+

@@ -53,28 +53,52 @@ if ( $is_privacy_notice ) {
-

license, the GPL.' ), 'https://wordpress.org/about/license/' ); ?>

+
+
+

+

license, the GPL.' ), 'https://wordpress.org/about/license/' ); ?>

+
+
-
    -

    2. -

    3. -

    4. -

    5. -
+
+
+
+

+

+
+
+
+

+

+
+
+
+

+

+
+
+
+

+

+
+
-

check out our trademark guidelines first.' ), 'https://wordpressfoundation.org/trademark-policy/' ); ?>

+
+
+

check out our trademark guidelines first.' ), 'https://wordpressfoundation.org/trademark-policy/' ); ?>

-

- + plugins and themes there. If you get a plugin or theme from another source, make sure to ask them if it’s GPL first. If they don’t respect the WordPress license, we don’t recommend them.' ), $plugins_url, $themes_url, 'https://wordpress.org/about/license/' ); + ?> +

- printf( __( 'Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding plugins and themes there. If you get a plugin or theme from another source, make sure to ask them if it’s GPL first. If they don’t respect the WordPress license, we don’t recommend them.' ), $plugins_url, $themes_url, 'https://wordpress.org/about/license/' ); - ?> -

- -

Free Software Foundation.' ); ?>

+

Free Software Foundation.' ); ?>

+
+
diff --git a/src/wp-admin/includes/class-wp-plugin-install-list-table.php b/src/wp-admin/includes/class-wp-plugin-install-list-table.php index 58488aa16c..94a8fde67e 100644 --- a/src/wp-admin/includes/class-wp-plugin-install-list-table.php +++ b/src/wp-admin/includes/class-wp-plugin-install-list-table.php @@ -184,7 +184,11 @@ class WP_Plugin_Install_List_Table extends WP_List_Table { $action = 'save_wporg_username_' . get_current_user_id(); if ( isset( $_GET['_wpnonce'] ) && wp_verify_nonce( wp_unslash( $_GET['_wpnonce'] ), $action ) ) { $user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' ); - update_user_meta( get_current_user_id(), 'wporg_favorites', $user ); + + // If the save url parameter is passed with a falsey value, don't save the favorite user. + if ( ! isset( $_GET['save'] ) || $_GET['save'] ) { + update_user_meta( get_current_user_id(), 'wporg_favorites', $user ); + } } else { $user = get_user_option( 'wporg_favorites' ); } diff --git a/src/wp-admin/includes/upgrade.php b/src/wp-admin/includes/upgrade.php index 2cf2f5f3cb..fe438a1f3b 100644 --- a/src/wp-admin/includes/upgrade.php +++ b/src/wp-admin/includes/upgrade.php @@ -2106,6 +2106,13 @@ function upgrade_500() { if ( defined( 'GUTENBERG_USE_PLUGIN' ) && GUTENBERG_USE_PLUGIN ) { return; } + + $was_active = is_plugin_active( 'gutenberg/gutenberg.php' ); + if ( $was_active ) { + // FIXME: Leave until 501 or 510 to clean up. + update_site_option( 'upgrade_500_was_gutenberg_active', '1' ); + } + deactivate_plugins( array( 'gutenberg/gutenberg.php' ), true ); } } diff --git a/src/wp-includes/class-wp-block-parser.php b/src/wp-includes/class-wp-block-parser.php index 22a8a57a9a..c9fa5db1f3 100644 --- a/src/wp-includes/class-wp-block-parser.php +++ b/src/wp-includes/class-wp-block-parser.php @@ -63,10 +63,10 @@ class WP_Block_Parser_Block { public $innerContent; function __construct( $name, $attrs, $innerBlocks, $innerHTML, $innerContent ) { - $this->blockName = $name; - $this->attrs = $attrs; - $this->innerBlocks = $innerBlocks; - $this->innerHTML = $innerHTML; + $this->blockName = $name; + $this->attrs = $attrs; + $this->innerBlocks = $innerBlocks; + $this->innerHTML = $innerHTML; $this->innerContent = $innerContent; } } @@ -269,17 +269,15 @@ class WP_Block_Parser { */ if ( 0 === $stack_depth ) { if ( isset( $leading_html_start ) ) { - $this->output[] = (array) self::freeform( - substr( - $this->document, - $leading_html_start, - $start_offset - $leading_html_start - ) - ); + $this->output[] = (array) self::freeform( substr( + $this->document, + $leading_html_start, + $start_offset - $leading_html_start + ) ); } $this->output[] = (array) new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ); - $this->offset = $start_offset + $token_length; + $this->offset = $start_offset + $token_length; return true; } @@ -294,16 +292,13 @@ class WP_Block_Parser { case 'block-opener': // track all newly-opened blocks on the stack - array_push( - $this->stack, - new WP_Block_Parser_Frame( - new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ), - $start_offset, - $token_length, - $start_offset + $token_length, - $leading_html_start - ) - ); + array_push( $this->stack, new WP_Block_Parser_Frame( + new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ), + $start_offset, + $token_length, + $start_offset + $token_length, + $leading_html_start + ) ); $this->offset = $start_offset + $token_length; return true; @@ -334,11 +329,11 @@ class WP_Block_Parser { * otherwise we're nested and we have to close out the current * block and add it as a new innerBlock to the parent */ - $stack_top = array_pop( $this->stack ); - $html = substr( $this->document, $stack_top->prev_offset, $start_offset - $stack_top->prev_offset ); - $stack_top->block->innerHTML .= $html; + $stack_top = array_pop( $this->stack ); + $html = substr( $this->document, $stack_top->prev_offset, $start_offset - $stack_top->prev_offset ); + $stack_top->block->innerHTML .= $html; $stack_top->block->innerContent[] = $html; - $stack_top->prev_offset = $start_offset + $token_length; + $stack_top->prev_offset = $start_offset + $token_length; $this->add_inner_block( $stack_top->block, @@ -390,22 +385,22 @@ class WP_Block_Parser { return array( 'no-more-tokens', null, null, null, null ); } - list( $match, $started_at ) = $matches[0]; + list( $match, $started_at ) = $matches[ 0 ]; $length = strlen( $match ); - $is_closer = isset( $matches['closer'] ) && -1 !== $matches['closer'][1]; - $is_void = isset( $matches['void'] ) && -1 !== $matches['void'][1]; - $namespace = $matches['namespace']; - $namespace = ( isset( $namespace ) && -1 !== $namespace[1] ) ? $namespace[0] : 'core/'; - $name = $namespace . $matches['name'][0]; - $has_attrs = isset( $matches['attrs'] ) && -1 !== $matches['attrs'][1]; + $is_closer = isset( $matches[ 'closer' ] ) && -1 !== $matches[ 'closer' ][ 1 ]; + $is_void = isset( $matches[ 'void' ] ) && -1 !== $matches[ 'void' ][ 1 ]; + $namespace = $matches[ 'namespace' ]; + $namespace = ( isset( $namespace ) && -1 !== $namespace[ 1 ] ) ? $namespace[ 0 ] : 'core/'; + $name = $namespace . $matches[ 'name' ][ 0 ]; + $has_attrs = isset( $matches[ 'attrs' ] ) && -1 !== $matches[ 'attrs' ][ 1 ]; /* * Fun fact! It's not trivial in PHP to create "an empty associative array" since all arrays * are associative arrays. If we use `array()` we get a JSON `[]` */ $attrs = $has_attrs - ? json_decode( $matches['attrs'][0], /* as-associative */ true ) + ? json_decode( $matches[ 'attrs' ][ 0 ], /* as-associative */ true ) : $this->empty_attrs; /* @@ -470,17 +465,17 @@ class WP_Block_Parser { * @param int|null $last_offset last byte offset into document if continuing form earlier output */ function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) { - $parent = $this->stack[ count( $this->stack ) - 1 ]; + $parent = $this->stack[ count( $this->stack ) - 1 ]; $parent->block->innerBlocks[] = (array) $block; - $html = substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset ); + $html = substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset ); if ( ! empty( $html ) ) { - $parent->block->innerHTML .= $html; + $parent->block->innerHTML .= $html; $parent->block->innerContent[] = $html; } $parent->block->innerContent[] = null; - $parent->prev_offset = $last_offset ? $last_offset : $token_start + $token_length; + $parent->prev_offset = $last_offset ? $last_offset : $token_start + $token_length; } /** @@ -499,18 +494,16 @@ class WP_Block_Parser { : substr( $this->document, $prev_offset ); if ( ! empty( $html ) ) { - $stack_top->block->innerHTML .= $html; + $stack_top->block->innerHTML .= $html; $stack_top->block->innerContent[] = $html; } if ( isset( $stack_top->leading_html_start ) ) { - $this->output[] = (array) self::freeform( - substr( - $this->document, - $stack_top->leading_html_start, - $stack_top->token_start - $stack_top->leading_html_start - ) - ); + $this->output[] = (array) self::freeform( substr( + $this->document, + $stack_top->leading_html_start, + $stack_top->token_start - $stack_top->leading_html_start + ) ); } $this->output[] = (array) $stack_top->block;