diff --git a/Gruntfile.js b/Gruntfile.js index 3a4ef68e3..a28346519 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -23,7 +23,8 @@ module.exports = function( grunt ) { // SASS generated "Twenty*"" CSS files BP_SCSS_CSS_FILES = [ '!bp-templates/bp-legacy/css/twenty*.css', - '!bp-templates/bp-nouveau/css/buddypress.css' + '!bp-templates/bp-nouveau/css/buddypress.css', + '!bp-core/admin/css/hello.css' ], stylelintConfigCss = require('stylelint-config-wordpress/index.js'), @@ -89,7 +90,7 @@ module.exports = function( grunt ) { indentType: 'tab', indentWidth: '1' }, - styles: { + legacy: { cwd: SOURCE_DIR, extDot: 'last', expand: true, @@ -106,6 +107,15 @@ module.exports = function( grunt ) { flatten: true, src: ['bp-templates/bp-nouveau/sass/buddypress.scss'], dest: SOURCE_DIR + 'bp-templates/bp-nouveau/css/' + }, + admin: { + cwd: SOURCE_DIR, + extDot: 'last', + expand: true, + ext: '.css', + flatten: true, + src: ['bp-core/admin/sass/*.scss'], + dest: SOURCE_DIR + 'bp-core/admin/css/' } }, rtlcss: { @@ -227,7 +237,7 @@ module.exports = function( grunt ) { }, expand: true, cwd: SOURCE_DIR, - src: [ 'bp-templates/bp-legacy/css/*.scss' ] + src: [ '**/*.scss' ] } }, cssmin: { diff --git a/src/bp-core/admin/bp-core-admin-functions.php b/src/bp-core/admin/bp-core-admin-functions.php index 82f82e497..609453741 100644 --- a/src/bp-core/admin/bp-core-admin-functions.php +++ b/src/bp-core/admin/bp-core-admin-functions.php @@ -357,14 +357,14 @@ function bp_do_activation_redirect() { return; } - $query_args = array( 'page' => 'bp-about' ); + $query_args = array(); if ( get_transient( '_bp_is_new_install' ) ) { $query_args['is_new_install'] = '1'; delete_transient( '_bp_is_new_install' ); } - // Redirect to BuddyPress about page. - wp_safe_redirect( add_query_arg( $query_args, bp_get_admin_url( 'index.php' ) ) ); + // Redirect to dashboard and trigger the Hello screen. + wp_safe_redirect( add_query_arg( $query_args, bp_get_admin_url( '?hello=buddypress' ) ) ); } /** UI/Styling ****************************************************************/ @@ -421,13 +421,17 @@ function bp_core_get_admin_tabs( $active_tab = '' ) { 'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-components' ), 'admin.php' ) ), 'name' => __( 'Components', 'buddypress' ) ), + '2' => array( + 'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-settings' ), 'admin.php' ) ), + 'name' => __( 'Options', 'buddypress' ) + ), '1' => array( 'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings' ), 'admin.php' ) ), 'name' => __( 'Pages', 'buddypress' ) ), - '2' => array( - 'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-settings' ), 'admin.php' ) ), - 'name' => __( 'Options', 'buddypress' ) + '3' => array( + 'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-credits' ), 'admin.php' ) ), + 'name' => __( 'Credits', 'buddypress' ) ), ); diff --git a/src/bp-core/admin/css/common-rtl.css b/src/bp-core/admin/css/common-rtl.css index 8485c92c2..8df9db450 100644 --- a/src/bp-core/admin/css/common-rtl.css +++ b/src/bp-core/admin/css/common-rtl.css @@ -10,10 +10,8 @@ TABLE OF CONTENTS: -------------------------------------------------------------------------------- 1.0 Welcome Screen 1.1 Version Badge - 1.2 About Panel - 1.2.1 Headline Feature - 1.2.2 Features Section - 1.2.3 Changelog Section + 1.2 --- + 1.3 Credits Panel 2.0 Dashicons 2.1 Top level menus 2.2 Settings - Components @@ -43,398 +41,132 @@ TABLE OF CONTENTS: content: "\f448"; } -.about-wrap .bp-badge { - position: absolute; - top: 0; - left: 0; -} - -.index_page_bp-credits code, +.settings_page_bp-credits code, .index_page_bp-about code { background-color: #e0e0e0; color: #636363; font-size: 1em; } -@media only screen and (max-width: 500px) { - - .about-wrap .bp-badge { - position: relative; - margin: 10px auto; - top: auto; - left: auto; - } -} - /* - * 1.2 About Panel + * 1.3 Credits Panel + * + * Taken from WP 4.9.5. */ - -/* - * 1.2.1 Headline Feature - */ -.buddypress .bp-headline-feature { - margin-bottom: 2em; - margin-top: 3em; - padding: 2em 3em; -} - -.buddypress .bp-headline { - margin: 0 auto; - width: 45em; -} - -.buddypress .bp-headline span.dashicons { - background-color: #f1f1f1; - color: #d84800; - clear: right; - font-size: 100px; - float: right; - height: 100px; - line-height: 100px; - margin: 0 0 15px 15px; - text-align: center; - width: 100px; -} - -.buddypress .bp-headline-feature .headline-title { - font-size: 2.2em; - font-weight: 300; - line-height: 2; - margin: 0 0 1em; - text-align: center; -} - -.buddypress .bp-headline-feature p { - font-size: 1.15em; - margin: 1.15em 0 0.6em auto; +.bp-about-wrap { + position: relative; + max-width: 1050px; + font-size: 15px; } -/* - * 1.2.2 Features Section - */ -.buddypress .bp-features-section { - border-bottom: 1px solid #ccc; - clear: both; - margin-bottom: 3em; - margin-top: 2em; - overflow: hidden; - padding-bottom: 2em; +.bp-about-wrap img { + margin: 0; + max-width: 100%; + height: auto; + vertical-align: middle; } -.buddypress .bp-features-section p { - font-size: 14px; +.bp-about-wrap p { line-height: 1.5; + font-size: 14px; } -.buddypress .bp-features-section img { - margin-bottom: 20px; -} - -.buddypress .bp-features-section span.dashicons { - background-color: #fff; - border-radius: 50%; - clear: right; - color: #d84800; - font-size: 50px; - float: right; - height: 80px; - line-height: 80px; - margin: 0 0 15px 15px; - text-align: center; - width: 80px; -} - -.buddypress .bp-features-section .headline-title { - font-size: 2em; +.bp-about-wrap h2 { + margin: 40px 0 0.6em; + font-size: 2.7em; + line-height: 1.3; font-weight: 300; - line-height: 1.5; - margin: 1em auto 2em; text-align: center; } -.buddypress .bp-features-section .bp-feature-with-images { - border-bottom: 1px solid #ccc; - margin-bottom: 5em; - padding-bottom: 2em; -} - -.buddypress .bp-features-section .bp-feature, -.buddypress .bp-features-section .bp-feature-imaged { - float: right; - margin-bottom: 3em; - margin-left: 4.799999999%; - width: 47.6%; -} - -.buddypress .bp-features-section .bp-feature.opposite, -.buddypress .bp-features-section .bp-feature-imaged.anon { - margin-left: 0; -} - -.buddypress .bp-features-section .bp-feature code { - font-size: 0.95em; +.bp-about-wrap h3 { + margin: 1.25em 0 0.6em; + font-size: 1.4em; line-height: 1.5; } -.buddypress .bp-feature:after { - clear: both; - content: ""; - margin-bottom: 2em; +.bp-about-wrap code { + font-size: 14px; + font-weight: 400; } -.buddypress .bp-feature-imaged .feature-title { - color: #23282d; - font-size: 1.25em; - margin-bottom: 0.6em; - margin-top: 0; +.bp-about-wrap .about-description { + margin-top: 1.4em; + font-weight: 400; + line-height: 1.6; + font-size: 19px; } -.buddypress .bp-feature-imaged p { - clear: right; - font-size: 1.1em; +.bp-about-wrap h3.wp-people-group { + margin: 2.6em 0 1.33em; + padding: 0; + font-size: 16px; + line-height: inherit; } -.buddypress .bp-feature-imaged img { - clear: right; +.bp-about-wrap .wp-people-group { + padding: 0 5px; + margin: 0 -5px 0 -15px; } -.buddypress .bp-feature .feature-title { - font-size: 1em; - line-height: 1.5; +.bp-about-wrap .compact { margin-bottom: 0; - margin-right: 110px; - margin-top: 0; - text-align: right; } -.buddypress .bp-feature p { - margin-right: 110px; +.bp-about-wrap .wp-person { + display: inline-block; + vertical-align: top; + margin-left: 10px; + padding-bottom: 15px; + height: 70px; + width: 280px; } -/* - * 1.2.3 Changelog Section - */ -.buddypress .bp-changelog-section { - clear: both; - margin-bottom: 3em; - margin-top: 4em; +.bp-about-wrap .compact .wp-person { + height: auto; + width: 180px; padding-bottom: 0; + margin-bottom: 0; } -.buddypress .bp-changelog-section:after { - clear: both; - content: ""; - display: table; -} - -.buddypress .bp-changelog-section .changelog-title { - color: #23282d; - font-size: 1.25em; - line-height: 1.5; - margin: 0 auto 1.5em; -} - -.buddypress .bp-two-column div { - float: right; - margin-left: 4.799999999%; - position: relative; - width: 47.6%; -} - -.buddypress .bp-three-column .bp-column { +.bp-about-wrap .wp-person .gravatar { float: right; - margin-left: 5%; - position: relative; - width: 29.95%; + margin: 0 0 10px 10px; + padding: 1px; + width: 60px; + height: 60px; } -.buddypress .bp-two-column .bp-column:nth-of-type(2n), -.buddypress .bp-three-column .bp-column:nth-of-type(3n) { - margin-left: 0; +.bp-about-wrap .compact .wp-person .gravatar { + width: 30px; + height: 30px; } -.buddypress .bp-changelog { - margin-bottom: 3em; -} - -.buddypress .bp-changelog:after { - clear: both; - content: ""; - display: table; -} - -.buddypress .bp-changelog .title { - font-size: 14px; - margin-bottom: 0.75em; - margin-top: 0; +.bp-about-wrap .wp-person .web { + margin: 6px 0 2px; + font-size: 16px; + font-weight: 400; + line-height: 2; + text-decoration: none; } -.buddypress .bp-changelog p { - margin-bottom: 0; +.bp-about-wrap .wp-person .title { + display: block; } -.bp-changelog-url { - text-align: center; +.bp-about-wrap p.wp-credits-list a { + white-space: nowrap; } -.bp-assets { - clear: both; - margin-bottom: 3em; -} - -@media screen and ( max-width: 782px ) { +@media only screen and (max-width: 500px) { - .bp-headline-feature, - .bp-features-section, - .bp-changelog-section, - .bp-assets { - margin-right: 20px; + .bp-about-wrap { margin-left: 20px; + margin-right: 10px; } - .buddypress .bp-headline-feature { - padding: 0; - } - - .buddypress .bp-headline { - margin: 0; - width: 97%; - } - - .buddypress .bp-features-section { - clear: both; - margin-bottom: 0; - margin-top: 2em; - padding-bottom: 2em; - } - - .buddypress .bp-features-section .bp-feature-with-images { - margin-bottom: 2em; - } - - .buddypress .bp-features-section .headline-title { - margin-bottom: 1em; - } - - .buddypress .bp-changelog-section .changelog-title { - font-size: 1.25em; - line-height: 1.5; - margin-bottom: 0.5em; - margin-top: 0.5em; - } - - .buddypress .bp-features-section .feature-title, - .buddypress .bp-changelog-section .title { - font-size: 1.25em; - line-height: 1.25; - margin-top: 0.6em; - text-align: right; - } - - .buddypress .bp-features-section .bp-feature, - .buddypress .bp-features-section .bp-feature-imaged { - clear: both; - float: right; - margin-bottom: 1em; - margin-top: 1em; + .bp-about-wrap .bp-about-wrap h1 { margin-left: 0; - padding-left: 1em; - width: 100%; - } - - .buddypress .bp-features-section .bp-feature-imaged p { - font-size: 1em; - } - - .buddypress .bp-features-section .bp-feature span { - margin-top: 0.33em; - } - - .buddypress .bp-feature.opposite .feature-title, - .buddypress .bp-feature.opposite p { - float: none; - } - - .buddypress .bp-changelog-section { - clear: both; - margin-bottom: 2em; - margin-top: 2em; - } - - .buddypress .bp-changelog { - margin-bottom: 0; - } - - .buddypress .bp-changelog-section .changelog-title { - margin-bottom: 0.5em; - } - - .buddypress .bp-changelog .title { - font-size: 1em; - } - - .buddypress .bp-changelog p { - margin-bottom: 1em; - } - - .buddypress .bp-changelog-section .two-col > div, - .buddypress .bp-changelog-section .three-col .col { - margin-top: 0; - padding-bottom: 0.5em; - width: 100%; - } - - .buddypress .bp-three-column .bp-column { - width: 100%; - } -} - -@media screen and ( max-width: 360px ) { - - .buddypress .bp-headline { - text-align: center; - } - - .buddypress .bp-headline span.dashicons { - clear: none; - font-size: 80px; - float: none; - height: 80px; - line-height: 80px; - margin: 0 auto; - width: 80px; - } - - .buddypress .bp-headline-feature .headline-title, - .buddypress .bp-features-section .headline-title { - font-size: 1.5em; - line-height: 1.5; - text-align: right; - } - - .buddypress .bp-headline-feature .headline-title { - margin: 1em 0 0; - } - - .buddypress .bp-headline-feature p { - margin: 1.15em 0 0.6em auto; - text-align: right; - width: auto; - } - - .buddypress .bp-features-section .bp-feature { - text-align: center; - } - - .buddypress .bp-features-section span.dashicons { - float: none; - } - - .buddypress .bp-features-section .feature-title, - .buddypress .bp-features-section p { - margin-right: 0; - text-align: right; } } diff --git a/src/bp-core/admin/css/common.css b/src/bp-core/admin/css/common.css index ce7e31242..b1c8d945a 100644 --- a/src/bp-core/admin/css/common.css +++ b/src/bp-core/admin/css/common.css @@ -10,10 +10,8 @@ TABLE OF CONTENTS: -------------------------------------------------------------------------------- 1.0 Welcome Screen 1.1 Version Badge - 1.2 About Panel - 1.2.1 Headline Feature - 1.2.2 Features Section - 1.2.3 Changelog Section + 1.2 --- + 1.3 Credits Panel 2.0 Dashicons 2.1 Top level menus 2.2 Settings - Components @@ -43,398 +41,132 @@ TABLE OF CONTENTS: content: "\f448"; } -.about-wrap .bp-badge { - position: absolute; - top: 0; - right: 0; -} - -.index_page_bp-credits code, +.settings_page_bp-credits code, .index_page_bp-about code { background-color: #e0e0e0; color: #636363; font-size: 1em; } -@media only screen and (max-width: 500px) { - - .about-wrap .bp-badge { - position: relative; - margin: 10px auto; - top: auto; - right: auto; - } -} - /* - * 1.2 About Panel + * 1.3 Credits Panel + * + * Taken from WP 4.9.5. */ - -/* - * 1.2.1 Headline Feature - */ -.buddypress .bp-headline-feature { - margin-bottom: 2em; - margin-top: 3em; - padding: 2em 3em; -} - -.buddypress .bp-headline { - margin: 0 auto; - width: 45em; -} - -.buddypress .bp-headline span.dashicons { - background-color: #f1f1f1; - color: #d84800; - clear: left; - font-size: 100px; - float: left; - height: 100px; - line-height: 100px; - margin: 0 15px 15px 0; - text-align: center; - width: 100px; -} - -.buddypress .bp-headline-feature .headline-title { - font-size: 2.2em; - font-weight: 300; - line-height: 2; - margin: 0 0 1em; - text-align: center; -} - -.buddypress .bp-headline-feature p { - font-size: 1.15em; - margin: 1.15em auto 0.6em 0; +.bp-about-wrap { + position: relative; + max-width: 1050px; + font-size: 15px; } -/* - * 1.2.2 Features Section - */ -.buddypress .bp-features-section { - border-bottom: 1px solid #ccc; - clear: both; - margin-bottom: 3em; - margin-top: 2em; - overflow: hidden; - padding-bottom: 2em; +.bp-about-wrap img { + margin: 0; + max-width: 100%; + height: auto; + vertical-align: middle; } -.buddypress .bp-features-section p { - font-size: 14px; +.bp-about-wrap p { line-height: 1.5; + font-size: 14px; } -.buddypress .bp-features-section img { - margin-bottom: 20px; -} - -.buddypress .bp-features-section span.dashicons { - background-color: #fff; - border-radius: 50%; - clear: left; - color: #d84800; - font-size: 50px; - float: left; - height: 80px; - line-height: 80px; - margin: 0 15px 15px 0; - text-align: center; - width: 80px; -} - -.buddypress .bp-features-section .headline-title { - font-size: 2em; +.bp-about-wrap h2 { + margin: 40px 0 0.6em; + font-size: 2.7em; + line-height: 1.3; font-weight: 300; - line-height: 1.5; - margin: 1em auto 2em; text-align: center; } -.buddypress .bp-features-section .bp-feature-with-images { - border-bottom: 1px solid #ccc; - margin-bottom: 5em; - padding-bottom: 2em; -} - -.buddypress .bp-features-section .bp-feature, -.buddypress .bp-features-section .bp-feature-imaged { - float: left; - margin-bottom: 3em; - margin-right: 4.799999999%; - width: 47.6%; -} - -.buddypress .bp-features-section .bp-feature.opposite, -.buddypress .bp-features-section .bp-feature-imaged.anon { - margin-right: 0; -} - -.buddypress .bp-features-section .bp-feature code { - font-size: 0.95em; +.bp-about-wrap h3 { + margin: 1.25em 0 0.6em; + font-size: 1.4em; line-height: 1.5; } -.buddypress .bp-feature:after { - clear: both; - content: ""; - margin-bottom: 2em; +.bp-about-wrap code { + font-size: 14px; + font-weight: 400; } -.buddypress .bp-feature-imaged .feature-title { - color: #23282d; - font-size: 1.25em; - margin-bottom: 0.6em; - margin-top: 0; +.bp-about-wrap .about-description { + margin-top: 1.4em; + font-weight: 400; + line-height: 1.6; + font-size: 19px; } -.buddypress .bp-feature-imaged p { - clear: left; - font-size: 1.1em; +.bp-about-wrap h3.wp-people-group { + margin: 2.6em 0 1.33em; + padding: 0; + font-size: 16px; + line-height: inherit; } -.buddypress .bp-feature-imaged img { - clear: left; +.bp-about-wrap .wp-people-group { + padding: 0 5px; + margin: 0 -15px 0 -5px; } -.buddypress .bp-feature .feature-title { - font-size: 1em; - line-height: 1.5; +.bp-about-wrap .compact { margin-bottom: 0; - margin-left: 110px; - margin-top: 0; - text-align: left; } -.buddypress .bp-feature p { - margin-left: 110px; +.bp-about-wrap .wp-person { + display: inline-block; + vertical-align: top; + margin-right: 10px; + padding-bottom: 15px; + height: 70px; + width: 280px; } -/* - * 1.2.3 Changelog Section - */ -.buddypress .bp-changelog-section { - clear: both; - margin-bottom: 3em; - margin-top: 4em; +.bp-about-wrap .compact .wp-person { + height: auto; + width: 180px; padding-bottom: 0; + margin-bottom: 0; } -.buddypress .bp-changelog-section:after { - clear: both; - content: ""; - display: table; -} - -.buddypress .bp-changelog-section .changelog-title { - color: #23282d; - font-size: 1.25em; - line-height: 1.5; - margin: 0 auto 1.5em; -} - -.buddypress .bp-two-column div { - float: left; - margin-right: 4.799999999%; - position: relative; - width: 47.6%; -} - -.buddypress .bp-three-column .bp-column { +.bp-about-wrap .wp-person .gravatar { float: left; - margin-right: 5%; - position: relative; - width: 29.95%; + margin: 0 10px 10px 0; + padding: 1px; + width: 60px; + height: 60px; } -.buddypress .bp-two-column .bp-column:nth-of-type(2n), -.buddypress .bp-three-column .bp-column:nth-of-type(3n) { - margin-right: 0; +.bp-about-wrap .compact .wp-person .gravatar { + width: 30px; + height: 30px; } -.buddypress .bp-changelog { - margin-bottom: 3em; -} - -.buddypress .bp-changelog:after { - clear: both; - content: ""; - display: table; -} - -.buddypress .bp-changelog .title { - font-size: 14px; - margin-bottom: 0.75em; - margin-top: 0; +.bp-about-wrap .wp-person .web { + margin: 6px 0 2px; + font-size: 16px; + font-weight: 400; + line-height: 2; + text-decoration: none; } -.buddypress .bp-changelog p { - margin-bottom: 0; +.bp-about-wrap .wp-person .title { + display: block; } -.bp-changelog-url { - text-align: center; +.bp-about-wrap p.wp-credits-list a { + white-space: nowrap; } -.bp-assets { - clear: both; - margin-bottom: 3em; -} - -@media screen and ( max-width: 782px ) { +@media only screen and (max-width: 500px) { - .bp-headline-feature, - .bp-features-section, - .bp-changelog-section, - .bp-assets { - margin-left: 20px; + .bp-about-wrap { margin-right: 20px; + margin-left: 10px; } - .buddypress .bp-headline-feature { - padding: 0; - } - - .buddypress .bp-headline { - margin: 0; - width: 97%; - } - - .buddypress .bp-features-section { - clear: both; - margin-bottom: 0; - margin-top: 2em; - padding-bottom: 2em; - } - - .buddypress .bp-features-section .bp-feature-with-images { - margin-bottom: 2em; - } - - .buddypress .bp-features-section .headline-title { - margin-bottom: 1em; - } - - .buddypress .bp-changelog-section .changelog-title { - font-size: 1.25em; - line-height: 1.5; - margin-bottom: 0.5em; - margin-top: 0.5em; - } - - .buddypress .bp-features-section .feature-title, - .buddypress .bp-changelog-section .title { - font-size: 1.25em; - line-height: 1.25; - margin-top: 0.6em; - text-align: left; - } - - .buddypress .bp-features-section .bp-feature, - .buddypress .bp-features-section .bp-feature-imaged { - clear: both; - float: left; - margin-bottom: 1em; - margin-top: 1em; + .bp-about-wrap .bp-about-wrap h1 { margin-right: 0; - padding-right: 1em; - width: 100%; - } - - .buddypress .bp-features-section .bp-feature-imaged p { - font-size: 1em; - } - - .buddypress .bp-features-section .bp-feature span { - margin-top: 0.33em; - } - - .buddypress .bp-feature.opposite .feature-title, - .buddypress .bp-feature.opposite p { - float: none; - } - - .buddypress .bp-changelog-section { - clear: both; - margin-bottom: 2em; - margin-top: 2em; - } - - .buddypress .bp-changelog { - margin-bottom: 0; - } - - .buddypress .bp-changelog-section .changelog-title { - margin-bottom: 0.5em; - } - - .buddypress .bp-changelog .title { - font-size: 1em; - } - - .buddypress .bp-changelog p { - margin-bottom: 1em; - } - - .buddypress .bp-changelog-section .two-col > div, - .buddypress .bp-changelog-section .three-col .col { - margin-top: 0; - padding-bottom: 0.5em; - width: 100%; - } - - .buddypress .bp-three-column .bp-column { - width: 100%; - } -} - -@media screen and ( max-width: 360px ) { - - .buddypress .bp-headline { - text-align: center; - } - - .buddypress .bp-headline span.dashicons { - clear: none; - font-size: 80px; - float: none; - height: 80px; - line-height: 80px; - margin: 0 auto; - width: 80px; - } - - .buddypress .bp-headline-feature .headline-title, - .buddypress .bp-features-section .headline-title { - font-size: 1.5em; - line-height: 1.5; - text-align: left; - } - - .buddypress .bp-headline-feature .headline-title { - margin: 1em 0 0; - } - - .buddypress .bp-headline-feature p { - margin: 1.15em auto 0.6em 0; - text-align: left; - width: auto; - } - - .buddypress .bp-features-section .bp-feature { - text-align: center; - } - - .buddypress .bp-features-section span.dashicons { - float: none; - } - - .buddypress .bp-features-section .feature-title, - .buddypress .bp-features-section p { - margin-left: 0; - text-align: left; } } diff --git a/src/bp-core/admin/css/hello-rtl.css b/src/bp-core/admin/css/hello-rtl.css new file mode 100644 index 000000000..5c51a1b10 --- /dev/null +++ b/src/bp-core/admin/css/hello-rtl.css @@ -0,0 +1,318 @@ +/*------------------------------------------------------------------------------ +Loaded in wp-admin for query string `hello=buddypress`. + +@since 3.0.0 + +-------------------------------------------------------------------------------- +TABLE OF CONTENTS: +-------------------------------------------------------------------------------- +1.0 - Typography and colour +2.0 - Dashicons +3.0 - Elements + 3.1 - Backdrop and container + 3.2 - Modal footer + 3.3 - Modal header + 3.4 - Modal content +4.0 - Content styles + 4.1 - Backdrop and container + 4.2 - Footer content + 4.3 - Header content + 4.4 - Content content +5.0 - Media +6.0 - Media Queries + 6.1 - Desktop Medium + 6.2 - Desktop Large +------------------------------------------------------------------------------*/ +/*------------------------------------------------------------------------------ + * 1.0 - Typography and colour + *----------------------------------------------------------------------------*/ +:root { + --bp-hello-color-primary: #d34600; + --bp-hello-color-secondary: #e5e5e5; + --bp-hello-container-size: 15%; +} + +#bp-hello-container a { + color: var(--bp-hello-color-primary); +} + +#bp-hello-container a:hover { + transition: all 0.1s ease-in-out; + color: black; +} + +#bp-hello-container .bp-hello-header h1 { + line-height: 1.7; + font-size: 21px; + font-weight: 400; +} + +.bp-hello-content p { + font-size: 16px; +} + +/*------------------------------------------------------------------------------ + * 2.0 - Dashicons + *----------------------------------------------------------------------------*/ +.bp-hello-close a:hover:before { + transition: all 0.1s ease-in-out; + color: var(--bp-hello-color-primary); +} + +.bp-hello-close a.close-modal:before { + content: "\f158"; + color: #23282d; + /* wp toolbar */ + font: 400 35px/1 dashicons; + speak: none; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + background-image: none !important; +} + +.bp-hello-social li a:before { + color: #23282d; + /* wp toolbar */ + font: 400 30px/0.6 dashicons; + speak: none; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + background-image: none !important; +} + +.bp-hello-social li a:hover:before { + transition: all 0.1s ease-in-out; + color: var(--bp-hello-color-primary); +} + +.bp-hello-social li a.support:before { + content: "\f448"; +} + +.bp-hello-social li a.twitter:before { + content: "\f301"; +} + +/*------------------------------------------------------------------------------ + * 3.0 - Elements + *----------------------------------------------------------------------------*/ +/* + * 3.1 - Backdrop and container + */ +#bp-hello-backdrop { + position: fixed; + top: 0; + right: 0; + left: 0; + bottom: 0; + z-index: 9998; + display: none; +} + +#bp-hello-container { + position: fixed; + top: 0; + bottom: 80px; + z-index: 99999; +} + +.bp-disable-scroll { + overflow: hidden; +} + +/* + * 3.2 - Modal footer + */ +.bp-hello-footer { + display: flex; + flex-wrap: wrap; + height: 58px; + max-height: 58px; +} + +.bp-hello-social-cta, +.bp-hello-social-links { + flex-basis: 50%; +} + +.bp-hello-social-links ul { + display: inline-block; +} + +.bp-hello-social li { + position: relative; + bottom: -5px; + display: inline-block; + list-style-type: none; + margin-bottom: 0; +} + +.bp-hello-social li:last-child a { + margin-right: 4px; +} + +/* + * 3.3 - Modal header + */ +.bp-hello-header { + height: 58px; + max-height: 58px; +} + +/* + * 3.4 - Modal content + */ +.bp-hello-content { + padding: 0 25px; + height: calc(100% - 58px); + overflow-y: auto; + -webkit-overflow-scrolling: touch; +} + +/*------------------------------------------------------------------------------ + * 4.0 - Content styles + *----------------------------------------------------------------------------*/ +/* + * 4.1 - Backdrop and container + */ +#bp-hello-backdrop { + background-color: rgba(0, 0, 0, 0.8); + transition: opacity 0.15s ease-out; +} + +#bp-hello-container { + background-color: white; +} + +/* + * 4.2 - Footer content + */ +.bp-hello-footer { + border-radius: 0 0 3px 3px; + background-color: white; + border-top: 1px solid var(--bp-hello-color-secondary); + padding: 6px 25px; +} + +.bp-hello-footer p { + font-size: 15px; +} + +.bp-hello-social-cta { + text-align: right; +} + +.bp-hello-social-links { + text-align: left; +} + +.bp-hello-social li a { + text-decoration: none; +} + +/* + * 4.3 - Header content + */ +.bp-hello-header { + padding: 6px 25px; +} + +.bp-hello-header h1 { + width: calc(100% - 51px); +} + +#bp-hello-container .bp-hello-header { + border-bottom: 1px solid var(--bp-hello-color-secondary); +} + +.bp-hello-title { + text-align: right; +} + +.bp-hello-close { + position: absolute; + top: 20px; + left: 25px; + text-align: left; +} + +.bp-hello-close a { + text-decoration: none; +} + +/* + * 4.4 - Content content + */ +.bp-hello-content { + background-color: white; +} + +/*------------------------------------------------------------------------------ + * 5.0 - Media + *----------------------------------------------------------------------------*/ +.bp-hello-content img { + border-radius: 2px; + max-width: 100%; +} + +/*------------------------------------------------------------------------------ + * 6.0 - Media Queries + *----------------------------------------------------------------------------*/ +/* + * 6.1 - Desktop Medium + */ +@media only screen and (min-width: 1024px) { + #bp-hello-backdrop { + display: block; + } + #bp-hello-container { + position: fixed; + top: 60px; + right: var(--bp-hello-container-size); + left: var(--bp-hello-container-size); + bottom: 30px; + border-radius: 3px; + } + #bp-hello-container .bp-hello-header h1 { + line-height: inherit; + } + .bp-hello-header { + height: auto; + max-height: inherit; + padding: 6px 30px; + } + .bp-hello-close { + left: 30px; + } + .bp-hello-close a.close-modal:before { + line-height: 0.7; + } + .bp-hello-footer { + position: fixed; + right: var(--bp-hello-container-size); + left: var(--bp-hello-container-size); + bottom: 30px; + z-index: 10000; + height: auto; + max-height: inherit; + padding: 6px 30px; + } + .bp-hello-content { + height: calc(100% - 90px); + padding: 0 30px; + } + .bp-hello-content p { + font-size: 14px; + } +} + +/** + * 6.2 - Desktop Large + */ +@media screen and (min-width: 1280px) { + #bp-hello-container, + .bp-hello-footer { + right: calc((100% - 896px) / 2); + left: calc((100% - 896px) / 2); + } +} diff --git a/src/bp-core/admin/css/hello.css b/src/bp-core/admin/css/hello.css new file mode 100644 index 000000000..56b4681f6 --- /dev/null +++ b/src/bp-core/admin/css/hello.css @@ -0,0 +1,318 @@ +/*------------------------------------------------------------------------------ +Loaded in wp-admin for query string `hello=buddypress`. + +@since 3.0.0 + +-------------------------------------------------------------------------------- +TABLE OF CONTENTS: +-------------------------------------------------------------------------------- +1.0 - Typography and colour +2.0 - Dashicons +3.0 - Elements + 3.1 - Backdrop and container + 3.2 - Modal footer + 3.3 - Modal header + 3.4 - Modal content +4.0 - Content styles + 4.1 - Backdrop and container + 4.2 - Footer content + 4.3 - Header content + 4.4 - Content content +5.0 - Media +6.0 - Media Queries + 6.1 - Desktop Medium + 6.2 - Desktop Large +------------------------------------------------------------------------------*/ +/*------------------------------------------------------------------------------ + * 1.0 - Typography and colour + *----------------------------------------------------------------------------*/ +:root { + --bp-hello-color-primary: #d34600; + --bp-hello-color-secondary: #e5e5e5; + --bp-hello-container-size: 15%; +} + +#bp-hello-container a { + color: var(--bp-hello-color-primary); +} + +#bp-hello-container a:hover { + transition: all 0.1s ease-in-out; + color: black; +} + +#bp-hello-container .bp-hello-header h1 { + line-height: 1.7; + font-size: 21px; + font-weight: 400; +} + +.bp-hello-content p { + font-size: 16px; +} + +/*------------------------------------------------------------------------------ + * 2.0 - Dashicons + *----------------------------------------------------------------------------*/ +.bp-hello-close a:hover:before { + transition: all 0.1s ease-in-out; + color: var(--bp-hello-color-primary); +} + +.bp-hello-close a.close-modal:before { + content: "\f158"; + color: #23282d; + /* wp toolbar */ + font: 400 35px/1 dashicons; + speak: none; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + background-image: none !important; +} + +.bp-hello-social li a:before { + color: #23282d; + /* wp toolbar */ + font: 400 30px/0.6 dashicons; + speak: none; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + background-image: none !important; +} + +.bp-hello-social li a:hover:before { + transition: all 0.1s ease-in-out; + color: var(--bp-hello-color-primary); +} + +.bp-hello-social li a.support:before { + content: "\f448"; +} + +.bp-hello-social li a.twitter:before { + content: "\f301"; +} + +/*------------------------------------------------------------------------------ + * 3.0 - Elements + *----------------------------------------------------------------------------*/ +/* + * 3.1 - Backdrop and container + */ +#bp-hello-backdrop { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: 9998; + display: none; +} + +#bp-hello-container { + position: fixed; + top: 0; + bottom: 80px; + z-index: 99999; +} + +.bp-disable-scroll { + overflow: hidden; +} + +/* + * 3.2 - Modal footer + */ +.bp-hello-footer { + display: flex; + flex-wrap: wrap; + height: 58px; + max-height: 58px; +} + +.bp-hello-social-cta, +.bp-hello-social-links { + flex-basis: 50%; +} + +.bp-hello-social-links ul { + display: inline-block; +} + +.bp-hello-social li { + position: relative; + bottom: -5px; + display: inline-block; + list-style-type: none; + margin-bottom: 0; +} + +.bp-hello-social li:last-child a { + margin-left: 4px; +} + +/* + * 3.3 - Modal header + */ +.bp-hello-header { + height: 58px; + max-height: 58px; +} + +/* + * 3.4 - Modal content + */ +.bp-hello-content { + padding: 0 25px; + height: calc(100% - 58px); + overflow-y: auto; + -webkit-overflow-scrolling: touch; +} + +/*------------------------------------------------------------------------------ + * 4.0 - Content styles + *----------------------------------------------------------------------------*/ +/* + * 4.1 - Backdrop and container + */ +#bp-hello-backdrop { + background-color: rgba(0, 0, 0, 0.8); + transition: opacity 0.15s ease-out; +} + +#bp-hello-container { + background-color: white; +} + +/* + * 4.2 - Footer content + */ +.bp-hello-footer { + border-radius: 0 0 3px 3px; + background-color: white; + border-top: 1px solid var(--bp-hello-color-secondary); + padding: 6px 25px; +} + +.bp-hello-footer p { + font-size: 15px; +} + +.bp-hello-social-cta { + text-align: left; +} + +.bp-hello-social-links { + text-align: right; +} + +.bp-hello-social li a { + text-decoration: none; +} + +/* + * 4.3 - Header content + */ +.bp-hello-header { + padding: 6px 25px; +} + +.bp-hello-header h1 { + width: calc(100% - 51px); +} + +#bp-hello-container .bp-hello-header { + border-bottom: 1px solid var(--bp-hello-color-secondary); +} + +.bp-hello-title { + text-align: left; +} + +.bp-hello-close { + position: absolute; + top: 20px; + right: 25px; + text-align: right; +} + +.bp-hello-close a { + text-decoration: none; +} + +/* + * 4.4 - Content content + */ +.bp-hello-content { + background-color: white; +} + +/*------------------------------------------------------------------------------ + * 5.0 - Media + *----------------------------------------------------------------------------*/ +.bp-hello-content img { + border-radius: 2px; + max-width: 100%; +} + +/*------------------------------------------------------------------------------ + * 6.0 - Media Queries + *----------------------------------------------------------------------------*/ +/* + * 6.1 - Desktop Medium + */ +@media only screen and (min-width: 1024px) { + #bp-hello-backdrop { + display: block; + } + #bp-hello-container { + position: fixed; + top: 60px; + left: var(--bp-hello-container-size); + right: var(--bp-hello-container-size); + bottom: 30px; + border-radius: 3px; + } + #bp-hello-container .bp-hello-header h1 { + line-height: inherit; + } + .bp-hello-header { + height: auto; + max-height: inherit; + padding: 6px 30px; + } + .bp-hello-close { + right: 30px; + } + .bp-hello-close a.close-modal:before { + line-height: 0.7; + } + .bp-hello-footer { + position: fixed; + left: var(--bp-hello-container-size); + right: var(--bp-hello-container-size); + bottom: 30px; + z-index: 10000; + height: auto; + max-height: inherit; + padding: 6px 30px; + } + .bp-hello-content { + height: calc(100% - 90px); + padding: 0 30px; + } + .bp-hello-content p { + font-size: 14px; + } +} + +/** + * 6.2 - Desktop Large + */ +@media screen and (min-width: 1280px) { + #bp-hello-container, + .bp-hello-footer { + left: calc((100% - 896px) / 2); + right: calc((100% - 896px) / 2); + } +} diff --git a/src/bp-core/admin/js/hello.js b/src/bp-core/admin/js/hello.js new file mode 100644 index 000000000..26c5a0e0e --- /dev/null +++ b/src/bp-core/admin/js/hello.js @@ -0,0 +1,67 @@ +/** + * Loads for BuddyPress Hello in wp-admin for query string `hello=buddypress`. + * + * @since 3.0.0 + */ +(function() { + /** + * Open the BuddyPress Hello modal. + */ + var bp_hello_open_modal = function() { + document.body.classList.add( 'bp-disable-scroll' ); + + // Show. + document.getElementById( 'bp-hello-backdrop' ).style.display = ''; + document.getElementById( 'bp-hello-container' ).style.display = ''; + }; + + /** + * Close the BuddyPress Hello modal. + */ + var bp_hello_close_modal = function() { + var backdrop = document.getElementById( 'bp-hello-backdrop' ), + modal = document.getElementById( 'bp-hello-container' ); + + document.body.classList.remove( 'bp-disable-scroll' ); + + // Hide. + modal.parentNode.removeChild( modal ); + backdrop.parentNode.removeChild( backdrop ); + }; + + // Close modal if "X" or background is touched. + document.addEventListener( 'click', function( event ) { + var backdrop = document.getElementById( 'bp-hello-backdrop' ); + + if ( ! backdrop || ! document.getElementById( 'bp-hello-container' ) ) { + return; + } + + var backdrop_click = backdrop.contains( event.target ), + modal_close_click = event.target.classList.contains( 'close-modal' ); + + if ( ! modal_close_click && ! backdrop_click ) { + return; + } + + bp_hello_close_modal(); + }, false ); + + // Close modal if escape key is presssed. + document.addEventListener( 'keyup', function( event ) { + if ( event.keyCode === 27 ) { + if ( ! document.getElementById( 'bp-hello-backdrop' ) || ! document.getElementById( 'bp-hello-container' ) ) { + return; + } + + bp_hello_close_modal(); + } + }, false ); + + // Init modal after the screen's loaded. + if ( document.attachEvent ? document.readyState === 'complete' : document.readyState !== 'loading' ) { + bp_hello_open_modal(); + } else { + document.addEventListener( 'DOMContentLoaded', bp_hello_open_modal ); + } +}()); diff --git a/src/bp-core/admin/sass/hello.scss b/src/bp-core/admin/sass/hello.scss new file mode 100644 index 000000000..5ab1003f7 --- /dev/null +++ b/src/bp-core/admin/sass/hello.scss @@ -0,0 +1,385 @@ +/*------------------------------------------------------------------------------ +Loaded in wp-admin for query string `hello=buddypress`. + +@since 3.0.0 + +-------------------------------------------------------------------------------- +TABLE OF CONTENTS: +-------------------------------------------------------------------------------- +1.0 - Typography and colour +2.0 - Dashicons +3.0 - Elements + 3.1 - Backdrop and container + 3.2 - Modal footer + 3.3 - Modal header + 3.4 - Modal content +4.0 - Content styles + 4.1 - Backdrop and container + 4.2 - Footer content + 4.3 - Header content + 4.4 - Content content +5.0 - Media +6.0 - Media Queries + 6.1 - Desktop Medium + 6.2 - Desktop Large +------------------------------------------------------------------------------*/ + +/*------------------------------------------------------------------------------ + * 1.0 - Typography and colour + *----------------------------------------------------------------------------*/ +:root { + --bp-hello-color-primary: #d34600; + --bp-hello-color-secondary: #e5e5e5; + --bp-hello-container-size: 15%; +} + +#bp-hello-container { + + a { + color: var(--bp-hello-color-primary); + + &:hover { + transition: all 0.1s ease-in-out; + color: rgb(0, 0, 0); + } + } + + .bp-hello-header { + + h1 { + line-height: 1.7; + font-size: 21px; + font-weight: 400; + } + } +} + +.bp-hello-content { + + p { + font-size: 16px; + } +} + +/*------------------------------------------------------------------------------ + * 2.0 - Dashicons + *----------------------------------------------------------------------------*/ +.bp-hello-close { + + a { + + &:hover:before { + transition: all 0.1s ease-in-out; + color: var(--bp-hello-color-primary); + } + + &.close-modal:before { + content: "\f158"; + color: #23282d; /* wp toolbar */ + font: 400 35px/1 dashicons; + speak: none; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + background-image: none !important; + } + } +} + +.bp-hello-social { + + li a { + + &:before { + color: #23282d; /* wp toolbar */ + font: 400 30px/0.6 dashicons; + speak: none; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + background-image: none !important; + } + + &:hover:before { + transition: all 0.1s ease-in-out; + color: var(--bp-hello-color-primary); + } + + &.support:before { + content: "\f448"; + } + + &.twitter:before { + content: "\f301"; + } + } +} + +/*------------------------------------------------------------------------------ + * 3.0 - Elements + *----------------------------------------------------------------------------*/ + +/* + * 3.1 - Backdrop and container + */ +#bp-hello-backdrop { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: 9998; // >= 9990 for main menu + + display: none; +} + +#bp-hello-container { + position: fixed; + top: 0; + bottom: 80px; + z-index: 99999; // >= 99998 for toolbar +} + +.bp-disable-scroll { + overflow: hidden; +} + +/* + * 3.2 - Modal footer + */ +.bp-hello-footer { + display: flex; + flex-wrap: wrap; + + height: 58px; + max-height: 58px; +} + +.bp-hello-social-cta, +.bp-hello-social-links { + flex-basis: 50%; +} + +.bp-hello-social-links { + + ul { + display: inline-block; + } +} + +.bp-hello-social { + + li { + position: relative; + bottom: -5px; + display: inline-block; + list-style-type: none; + margin-bottom: 0; + + &:last-child a { + margin-left: 4px; + } + } +} + +/* + * 3.3 - Modal header + */ +.bp-hello-header { + height: 58px; + max-height: 58px; +} + +/* + * 3.4 - Modal content + */ +.bp-hello-content { + padding: 0 25px; + + // Force scrolling. + height: calc(100% - 58px); + overflow-y: auto; + -webkit-overflow-scrolling: touch; +} + +/*------------------------------------------------------------------------------ + * 4.0 - Content styles + *----------------------------------------------------------------------------*/ + +/* + * 4.1 - Backdrop and container + */ +#bp-hello-backdrop { + background-color: rgba(0, 0, 0, 0.8); + transition: opacity 0.15s ease-out; +} + +#bp-hello-container { + background-color: rgb(255, 255, 255); +} + +/* + * 4.2 - Footer content + */ +.bp-hello-footer { + border-radius: 0 0 3px 3px; + background-color: rgb(255, 255, 255); + border-top: 1px solid var(--bp-hello-color-secondary); + padding: 6px 25px; + + p { + font-size: 15px; + } +} + +.bp-hello-social-cta { + text-align: left; +} + +.bp-hello-social-links { + text-align: right; +} + +.bp-hello-social { + + li { + + a { + text-decoration: none; + } + } +} + +/* + * 4.3 - Header content + */ +.bp-hello-header { + padding: 6px 25px; + + h1 { + width: calc(100% - 51px); // Approx. width of "X" button block. + } +} + +#bp-hello-container { + + .bp-hello-header { + border-bottom: 1px solid var(--bp-hello-color-secondary); + } +} + +.bp-hello-title { + text-align: left; +} + +.bp-hello-close { + position: absolute; + top: 20px; + right: 25px; + text-align: right; + + a { + text-decoration: none; + } +} + +/* + * 4.4 - Content content + */ +.bp-hello-content { + background-color: rgb(255, 255, 255); +} + +/*------------------------------------------------------------------------------ + * 5.0 - Media + *----------------------------------------------------------------------------*/ +.bp-hello-content { + + img { + border-radius: 2px; + max-width: 100%; + } +} + +/*------------------------------------------------------------------------------ + * 6.0 - Media Queries + *----------------------------------------------------------------------------*/ + +/* + * 6.1 - Desktop Medium + */ +@media only screen and (min-width: 1024px) { + + #bp-hello-backdrop { + display: block; + } + + #bp-hello-container { + position: fixed; + top: 60px; + left: var(--bp-hello-container-size); + right: var(--bp-hello-container-size); + bottom: 30px; + + border-radius: 3px; + + .bp-hello-header { + + h1 { + line-height: inherit; + } + } + } + + .bp-hello-header { + height: auto; + max-height: inherit; + + padding: 6px 30px; + } + + .bp-hello-close { + right: 30px; + + a { + + &.close-modal:before { + line-height: 0.7; + } + } + } + + .bp-hello-footer { + position: fixed; // Fixed position above "content" div. + left: var(--bp-hello-container-size); + right: var(--bp-hello-container-size); + bottom: 30px; + z-index: 10000; // See #bp-hello-backdrop + + height: auto; + max-height: inherit; + + padding: 6px 30px; + } + + .bp-hello-content { + // Very very approx. height of header and footer. + height: calc(100% - 90px); + padding: 0 30px; + + p { + font-size: 14px; + } + } +} + +/** + * 6.2 - Desktop Large + */ +@media screen and (min-width: 1280px) { + + #bp-hello-container, + .bp-hello-footer { + // Approx. max-width of modal at Desktop Medium size. + left: calc((100% - 896px) / 2); + right: calc((100% - 896px) / 2); + } +} diff --git a/src/bp-core/classes/class-bp-admin.php b/src/bp-core/classes/class-bp-admin.php index 515b8903a..b47053704 100644 --- a/src/bp-core/classes/class-bp-admin.php +++ b/src/bp-core/classes/class-bp-admin.php @@ -155,8 +155,8 @@ class BP_Admin { // Add settings. add_action( 'bp_register_admin_settings', array( $this, 'register_admin_settings' ) ); - // Add a link to BuddyPress About page to the admin bar. - add_action( 'admin_bar_menu', array( $this, 'admin_bar_about_link' ), 15 ); + // Add a link to BuddyPress Hello in the admin bar. + add_action( 'admin_bar_menu', array( $this, 'admin_bar_about_link' ), 100 ); // Add a description of new BuddyPress tools in the available tools page. add_action( 'tool_box', 'bp_core_admin_available_tools_intro' ); @@ -169,6 +169,9 @@ class BP_Admin { add_filter( 'manage_' . bp_get_email_post_type() . '_posts_columns', array( $this, 'emails_register_situation_column' ) ); add_action( 'manage_' . bp_get_email_post_type() . '_posts_custom_column', array( $this, 'emails_display_situation_column_data' ), 10, 2 ); + // BuddyPress Hello. + add_action( 'admin_footer', array( $this, 'about_screen' ) ); + /* Filters ***********************************************************/ // Add link to settings page. @@ -197,24 +200,6 @@ class BP_Admin { return; } - // About. - add_dashboard_page( - __( 'Welcome to BuddyPress', 'buddypress' ), - __( 'Welcome to BuddyPress', 'buddypress' ), - 'manage_options', - 'bp-about', - array( $this, 'about_screen' ) - ); - - // Credits. - add_dashboard_page( - __( 'Welcome to BuddyPress', 'buddypress' ), - __( 'Welcome to BuddyPress', 'buddypress' ), - 'manage_options', - 'bp-credits', - array( $this, 'credits_screen' ) - ); - $hooks = array(); // Changed in BP 1.6 . See bp_core_admin_backpat_menu(). @@ -264,6 +249,16 @@ class BP_Admin { 'bp_core_admin_settings' ); + // Credits. + $hooks[] = add_submenu_page( + $this->settings_page, + __( 'BuddyPress Credits', 'buddypress' ), + __( 'BuddyPress Credits', 'buddypress' ), + $this->capability, + 'bp-credits', + array( $this, 'credits_screen' ) + ); + // For consistency with non-Multisite, we add a Tools menu in // the Network Admin as a home for our Tools panel. if ( is_multisite() && bp_core_do_network_admin() ) { @@ -464,21 +459,27 @@ class BP_Admin { } /** - * Add a link to BuddyPress About page to the admin bar. + * Add a link to BuddyPress Hello to the admin bar. * * @since 1.9.0 + * @since 3.0.0 Hooked at priority 100 (was 15). * - * @param WP_Admin_Bar $wp_admin_bar As passed to 'admin_bar_menu'. + * @param WP_Admin_Bar $wp_admin_bar */ public function admin_bar_about_link( $wp_admin_bar ) { - if ( is_user_logged_in() ) { - $wp_admin_bar->add_menu( array( - 'parent' => 'wp-logo', - 'id' => 'bp-about', - 'title' => esc_html__( 'About BuddyPress', 'buddypress' ), - 'href' => add_query_arg( array( 'page' => 'bp-about' ), bp_get_admin_url( 'index.php' ) ), - ) ); + if ( ! is_user_logged_in() ) { + return; } + + $wp_admin_bar->add_menu( array( + 'parent' => 'wp-logo', + 'id' => 'bp-about', + 'title' => esc_html_x( 'Hello, BuddyPress!', 'Colloquial alternative to "learn about BuddyPress"', 'buddypress' ), + 'href' => bp_get_admin_url( '?hello=buddypress' ), + 'meta' => array( + 'class' => 'say-hello-buddypress', + ), + ) ); } /** @@ -500,7 +501,7 @@ class BP_Admin { // Add a few links to the existing links array. return array_merge( $links, array( 'settings' => '' . esc_html__( 'Settings', 'buddypress' ) . '', - 'about' => '' . esc_html__( 'About', 'buddypress' ) . '' + 'about' => '' . esc_html_x( 'Hello, BuddyPress!', 'Colloquial alternative to "learn about BuddyPress"', 'buddypress' ) . '' ) ); } @@ -514,6 +515,7 @@ class BP_Admin { // Settings pages. remove_submenu_page( $this->settings_page, 'bp-page-settings' ); remove_submenu_page( $this->settings_page, 'bp-settings' ); + remove_submenu_page( $this->settings_page, 'bp-credits' ); // Network Admin Tools. remove_submenu_page( 'network-tools', 'network-tools' ); @@ -530,156 +532,154 @@ class BP_Admin { */ public function enqueue_scripts() { wp_enqueue_style( 'bp-admin-common-css' ); + + // BuddyPress Hello + if ( get_current_screen()->id === 'dashboard' && ! empty( $_GET['hello'] ) && $_GET['hello'] === 'buddypress' ) { + wp_enqueue_style( 'bp-hello-css' ); + wp_enqueue_script( 'bp-hello-js' ); + } } /** About *****************************************************************/ /** - * Output the about screen. + * Output the BuddyPress Hello template. * - * @since 1.7.0 + * @since 1.7.0 Screen content. + * @since 3.0.0 Now outputs BuddyPress Hello template. */ public function about_screen() { + if ( get_current_screen()->id !== 'dashboard' || empty( $_GET['hello'] ) || $_GET['hello'] !== 'buddypress' ) { + return; + } ?> -
- - - - - - - -
-
-

-
-
-

-
    -
  • ' . __( 'Set Up Components', 'buddypress' ) . '', esc_url( bp_get_admin_url( add_query_arg( array( 'page' => 'bp-components' ), $this->settings_page ) ) ) - ); ?>
    • -
  • ' . __( 'Assign Components to Pages', 'buddypress' ) . '', esc_url( bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings' ), $this->settings_page ) ) ) - ); ?>
    • -
  • ' . __( 'Customize Settings', 'buddypress' ) . '', esc_url( bp_get_admin_url( add_query_arg( array( 'page' => 'bp-settings' ), $this->settings_page ) ) ) - ); ?>
    • -
- -
-
-

-
    - -
  • ' . __( 'Add User Profile Fields', 'buddypress' ) . '', esc_url( add_query_arg( array( 'page' => 'bp-profile-setup' ), bp_get_admin_url( 'users.php' ) ) ) ); ?>
    • - -
  • ' . __( 'Manage User Signups', 'buddypress' ) . '', esc_url( add_query_arg( array( 'page' => 'bp-signups' ), bp_get_admin_url( 'users.php' ) ) ) ); ?>
    • - -
  • ' . __( 'Moderate Activity Streams', 'buddypress' ) . '', esc_url( add_query_arg( array( 'page' => 'bp-activity' ), bp_get_admin_url( 'admin.php' ) ) ) ); ?>
    • - - -
  • ' . __( 'Manage Groups', 'buddypress' ) . '', esc_url( add_query_arg( array( 'page' => 'bp-groups' ), bp_get_admin_url( 'admin.php' ) ) ) ); ?>
    • - -
  • ' . __( 'Repair Data', 'buddypress' ) . '', esc_url( add_query_arg( array( 'page' => 'bp-tools' ), bp_get_admin_url( 'tools.php' ) ) ) ); ?> -
    • -
-
-
-

-

BuddyPress Codex has you covered.', 'buddypress' ) ?>

-

our support forums, where active BuddyPress users and developers are waiting to share tips and more.', 'buddypress' ) ?>

-
-
-
-
- - - -
- -

- -
- -

-

-
- -
- -

-

-
+ -
- -

-

+