<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][9429] trunk/src/bp-core/bp-core-admin.php: Ensure both "About" admin screens always have the same descriptive text and navigation.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/9429">9429</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/9429","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnjamesjacoby</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-02-04 14:38:10 +0000 (Wed, 04 Feb 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Ensure both "About" admin screens always have the same descriptive text and navigation.
Introduces static and helper methods for:
* Determining `is_new_install`
* Getting user-friendly version number
* Outputting welcome text
* Outputting tab navigation
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/6182">#6182</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoreadminphp">trunk/src/bp-core/bp-core-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoreadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-admin.php 2015-02-04 13:53:42 UTC (rev 9428)
+++ trunk/src/bp-core/bp-core-admin.php 2015-02-04 14:38:10 UTC (rev 9429)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,8 +187,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function admin_menus() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bail if user cannot moderate
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! bp_current_user_can( 'manage_options' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! bp_current_user_can( 'manage_options' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // About
</span><span class="cx" style="display: block; padding: 0 10px"> add_dashboard_page(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,8 +351,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the main section
</span><span class="cx" style="display: block; padding: 0 10px"> add_settings_section( 'bp_groups', __( 'Groups Settings', 'buddypress' ), 'bp_admin_setting_callback_groups_section', 'buddypress' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $avatar_setting ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $avatar_setting ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $avatar_setting = 'bp_groups';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Allow subscriptions setting
</span><span class="cx" style="display: block; padding: 0 10px"> add_settings_field( 'bp_restrict_group_creation', __( 'Group Creation', 'buddypress' ), 'bp_admin_setting_callback_group_creation', 'buddypress', 'bp_groups' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,8 +433,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function modify_plugin_action_links( $links, $file ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Return normal links if not BuddyPress
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( plugin_basename( buddypress()->basename ) != $file )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( plugin_basename( buddypress()->basename ) != $file ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $links;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a few links to the existing links array
</span><span class="cx" style="display: block; padding: 0 10px"> return array_merge( $links, array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -486,30 +489,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (1.7.0)
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function about_screen() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_new_install = ! empty( $_GET['is_new_install'] );
- $welcome_text = ( $is_new_install )
- ? __( 'Thank you for installing BuddyPress! BuddyPress %s gives you the components you need to turn your WordPress powered site into a thriving membership community.', 'buddypress' )
- : __( 'BuddyPress %s comes with a bunch of great improvements we think you’re really going to like.', 'buddypress' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- list( $display_version ) = explode( '-', bp_get_version() ); ?>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap about-wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1><?php printf( __( 'Welcome to BuddyPress %s', 'buddypress' ), $display_version ); ?></h1>
- <div class="about-text">
- <?php printf( $welcome_text, $display_version ); ?>
- </div>
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="bp-badge"></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php self::welcome_text(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 class="nav-tab-wrapper">
- <a class="nav-tab nav-tab-active" href="<?php echo esc_url( bp_get_admin_url( add_query_arg( array( 'page' => 'bp-about' ), 'index.php' ) ) ); ?>">
- <?php _e( 'What’s New', 'buddypress' ); ?>
- </a><a class="nav-tab" href="<?php echo esc_url( bp_get_admin_url( add_query_arg( array( 'page' => 'bp-credits' ), 'index.php' ) ) ); ?>">
- <?php _e( 'Credits', 'buddypress' ); ?>
- </a>
- </h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php self::tab_navigation( __METHOD__ ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $is_new_install ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( self::is_new_install() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="welcome-panel" class="welcome-panel">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="welcome-panel-content">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -643,32 +631,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since BuddyPress (1.7.0)
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function credits_screen() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_new_install = ! empty( $_GET['is_new_install'] );
-
- list( $display_version ) = explode( '-', bp_get_version() ); ?>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap about-wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1><?php printf( __( 'Welcome to BuddyPress %s', 'buddypress' ), $display_version ); ?></h1>
- <div class="about-text">
- <?php if ( $is_new_install ) : ?>
- <?php printf( __( 'Thank you for installing BuddyPress! BuddyPress %s is our most streamlined and easy-to-use release to date, and we think you’re going to love it.', 'buddypress' ), $display_version ); ?>
- <?php else : ?>
- <?php printf( __( 'Howdy. BuddyPress %s is our most streamlined and easy-to-use release to date, and we think you’re going to love it.', 'buddypress' ), $display_version ); ?>
- <?php endif; ?>
- </div>
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="bp-badge"></div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php self::welcome_text(); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2 class="nav-tab-wrapper">
- <a class="nav-tab" href="<?php echo esc_url( bp_get_admin_url( add_query_arg( array( 'page' => 'bp-about' ), 'index.php' ) ) ); ?>">
- <?php _e( 'What’s New', 'buddypress' ); ?>
- </a><a class="nav-tab nav-tab-active" href="<?php echo esc_url( bp_get_admin_url( add_query_arg( array( 'page' => 'bp-credits' ), 'index.php' ) ) ); ?>">
- <?php _e( 'Credits', 'buddypress' ); ?>
- </a>
- </h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php self::tab_navigation( __METHOD__ ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="about-description"><?php _e( 'BuddyPress is created by a worldwide network of friendly folks.', 'buddypress' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="about-description"><?php _e( 'BuddyPress is created by a worldwide network of friendly folks like these.', 'buddypress' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h4 class="wp-people-group"><?php _e( 'Project Leaders', 'buddypress' ); ?></h4>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul class="wp-people-group " id="wp-people-group-project-leaders">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -742,7 +713,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h4 class="wp-people-group"><?php printf( __( 'Contributors to BuddyPress %s', 'buddypress' ), $display_version ); ?></h4>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h4 class="wp-people-group"><?php printf( esc_html__( 'Contributors to BuddyPress %s', 'buddypress' ), self::display_version() ); ?></h4>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="wp-credits-list">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="https://profiles.wordpress.org/andemann/">andemann</a>,
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="https://profiles.wordpress.org/dontdream/">Andrea Tarantini (dontdream)</a>,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -802,6 +773,94 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Output welcome text and badge for What's New and Credits pages
+ *
+ * @since BuddyPress (2.2.0)
+ */
+ public static function welcome_text() {
+
+ // Switch welcome text based on whether this is a new installation or not
+ $welcome_text = ( self::is_new_install() )
+ ? __( 'Thank you for installing BuddyPress! BuddyPress %s gives you the components you need to turn your WordPress powered site into a thriving membership community.', 'buddypress' )
+ : __( 'BuddyPress %s comes with a bunch of great improvements we think you’re really going to like.', 'buddypress' );
+
+ ?>
+
+ <h1><?php printf( esc_html__( 'Welcome to BuddyPress %s', 'buddypress' ), self::display_version() ); ?></h1>
+ <div class="about-text">
+ <?php printf( $welcome_text, self::display_version() ); ?>
+ </div>
+
+ <div class="bp-badge"></div>
+
+ <?php
+ }
+
+ /**
+ * Output tab navigation for `What's New` and `Credits` pages
+ *
+ * @since BuddyPress (2.2.0)
+ * @param string $tab
+ */
+ public static function tab_navigation( $tab = 'whats_new' ) {
+ ?>
+
+ <h2 class="nav-tab-wrapper">
+ <a class="nav-tab <?php if ( 'BP_Admin::about_screen' === $tab ) : ?>nav-tab-active<?php endif; ?>" href="<?php echo esc_url( bp_get_admin_url( add_query_arg( array( 'page' => 'bp-about' ), 'index.php' ) ) ); ?>">
+ <?php esc_html_e( 'What’s New', 'buddypress' ); ?>
+ </a><a class="nav-tab <?php if ( 'BP_Admin::credits_screen' === $tab ) : ?>nav-tab-active<?php endif; ?>" href="<?php echo esc_url( bp_get_admin_url( add_query_arg( array( 'page' => 'bp-credits' ), 'index.php' ) ) ); ?>">
+ <?php esc_html_e( 'Credits', 'buddypress' ); ?>
+ </a>
+ </h2>
+
+ <?php
+ }
+
+ /** Helpers ***************************************************************/
+
+ /**
+ * Return true/false based on whether a query argument is set
+ *
+ * @see bp_do_activation_redirect()
+ *
+ * @since BuddyPress (2.2.0)
+ * @return bool
+ */
+ public static function is_new_install() {
+ return (bool) isset( $_GET['is_new_install'] );
+ }
+
+ /**
+ * Return a user-friendly version-number string, for use in translations
+ *
+ * @since BuddyPress (2.2.0)
+ * @return string
+ */
+ public static function display_version() {
+
+ // Use static variable to prevent recalculations
+ static $display = '';
+
+ // Only calculate on first run
+ if ( '' === $display ) {
+
+ // Get current version
+ $version = bp_get_version();
+
+ // Check for prerelease hyphen
+ $pre = strpos( $version, '-' );
+
+ // Strip prerelease suffix
+ $display = ( false !== $pre )
+ ? substr( $version, 0, $pre )
+ : $version;
+ }
+
+ // Done!
+ return $display;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // class_exists check
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>