'status' ) ) ); ?>
+ + ++ %2$s', + bp_core_get_iso8601_date( bp_get_group_last_active( 0, array( 'relative' => false ) ) ), + esc_html( bp_get_group_last_active() ) + ) + ); + ?> +
-status ); ?>
-__( 'Group Types', 'buddypress' ), + 'list_element' => 'span', + ) + ); ?> -
- group_type_list; ?> - + - - + - + -status ); ?>
+ +'status' ) ) ); ?>
+ -+
%2$s', + bp_core_get_iso8601_date( bp_get_group_last_active( 0, array( 'relative' => false ) ) ), + esc_html( bp_get_group_last_active() ) + ) + ); ?>
+ __( 'Group Types', 'buddypress' ), + 'list_element' => 'span', + ) + ); + ?> + diff --git src/bp-templates/bp-nouveau/common-styles/_bp_group_header.scss src/bp-templates/bp-nouveau/common-styles/_bp_group_header.scss index a60670fba..56b13dedd 100644 --- src/bp-templates/bp-nouveau/common-styles/_bp_group_header.scss +++ src/bp-templates/bp-nouveau/common-styles/_bp_group_header.scss @@ -1,10 +1,20 @@ // BP Single Group Header Styles. -// @version 3.0.0 +// @since 3.0.0 +// @version 7.0.0 .groups-header { .bp-group-type-list { + + @include font-size(18); margin: 0; + color: $black; + display: flex; + + strong { + padding-right: $pad-med; + white-space: nowrap; + } } .bp-feedback { diff --git src/bp-templates/bp-nouveau/css/buddypress-rtl.css src/bp-templates/bp-nouveau/css/buddypress-rtl.css index d69e995d1..abe37caa7 100644 --- src/bp-templates/bp-nouveau/css/buddypress-rtl.css +++ src/bp-templates/bp-nouveau/css/buddypress-rtl.css @@ -1,7 +1,8 @@ /*-------------------------------------------------------------- Hello, this is the BuddyPress Nouveau stylesheet. -@version 4.0.0 +@since 3.0.0 +@version 7.0.0 ---------------------------------------------------------------- >>> TABLE OF CONTENTS: @@ -2301,7 +2302,15 @@ body.no-js .single-item-header .js-self-profile-button { *----------------------------------------------------- */ .groups-header .bp-group-type-list { + font-size: 18px; margin: 0; + color: #333; + display: flex; +} + +.groups-header .bp-group-type-list strong { + padding-left: 1em; + white-space: nowrap; } .groups-header .bp-feedback { diff --git src/bp-templates/bp-nouveau/css/buddypress.css src/bp-templates/bp-nouveau/css/buddypress.css index c80c057ce..b3df10a7e 100644 --- src/bp-templates/bp-nouveau/css/buddypress.css +++ src/bp-templates/bp-nouveau/css/buddypress.css @@ -1,7 +1,8 @@ /*-------------------------------------------------------------- Hello, this is the BuddyPress Nouveau stylesheet. -@version 4.0.0 +@since 3.0.0 +@version 7.0.0 ---------------------------------------------------------------- >>> TABLE OF CONTENTS: @@ -2301,7 +2302,15 @@ body.no-js .single-item-header .js-self-profile-button { *----------------------------------------------------- */ .groups-header .bp-group-type-list { + font-size: 18px; margin: 0; + color: #333; + display: flex; +} + +.groups-header .bp-group-type-list strong { + padding-right: 1em; + white-space: nowrap; } .groups-header .bp-feedback { diff --git src/bp-templates/bp-nouveau/includes/groups/classes.php src/bp-templates/bp-nouveau/includes/groups/classes.php index 3b68f8003..f57e81f87 100644 --- src/bp-templates/bp-nouveau/includes/groups/classes.php +++ src/bp-templates/bp-nouveau/includes/groups/classes.php @@ -3,7 +3,7 @@ * Groups classes * * @since 3.0.0 - * @version 3.0.0 + * @version 7.0.0 */ // Exit if accessed directly. @@ -376,3 +376,46 @@ class BP_Nouveau_Customizer_Group_Nav extends BP_Core_Nav { return $this->get_secondary( array( 'parent_slug' => $this->group->slug ) ); } } + +/** + * Group template meta backwards compatibility class. + * + * @since 7.0.0 + */ +class BP_Nouveau_Group_Meta { + /** + * Used to get the template meta used in Groups loop. + * + * @since 7.0.0 + * @var string $meta The template meta used in Groups loop. + */ + public $meta = ''; + + /** + * Magic getter. + * + * This exists specifically for supporting deprecated object vars. + * + * @since 7.0.0 + * + * @param string $key + * @return string + */ + public function __get( $key = '' ) { + /* translators: %s is the name of the function to use instead of the deprecated one */ + _doing_it_wrong( 'bp_nouveau_group_meta', sprintf( __( 'Please use %s instead', 'buddypress' ), 'bp_nouveau_the_group_meta( array( \'keys\' => \'' . $key . '\' ) )' ) , '7.0.0' ); + + // Backwards compatibility. + return bp_nouveau_the_group_meta( array( 'keys' => $key, 'echo' => false ) ); + } + + /** + * Constructor + * + * @since 7.0.0 + */ + public function __construct() { + // Backwards compatibility. + $this->meta = bp_nouveau_the_group_meta( array( 'echo' => false ) ); + } +} diff --git src/bp-templates/bp-nouveau/includes/groups/template-tags.php src/bp-templates/bp-nouveau/includes/groups/template-tags.php index 03a9f4255..4e2028956 100644 --- src/bp-templates/bp-nouveau/includes/groups/template-tags.php +++ src/bp-templates/bp-nouveau/includes/groups/template-tags.php @@ -1067,13 +1067,16 @@ function bp_nouveau_groups_manage_members_buttons( $args = array() ) { * @return bool True if the group has meta. False otherwise. */ function bp_nouveau_group_has_meta( $meta_key = '' ) { - $group_meta = bp_nouveau_get_group_meta(); - if ( ! $meta_key ) { - return (bool) $group_meta; + $meta_keys = array( 'status', 'count' ); + } else { + $meta_keys = array( $meta_key ); } - return ! empty( $group_meta[ $meta_key ] ); + $group_meta = bp_nouveau_get_group_meta( $meta_keys ); + $group_meta = array_filter( $group_meta ); + + return ! empty( $group_meta ); } /** @@ -1084,95 +1087,140 @@ function bp_nouveau_group_has_meta( $meta_key = '' ) { * @return bool True if the group has meta. False otherwise. */ function bp_nouveau_group_has_meta_extra() { - return (bool) bp_nouveau_get_hooked_group_meta(); + return false !== bp_nouveau_get_hooked_group_meta(); } /** * Display the group meta. * * @since 3.0.0 + * @deprecated 7.0.0 Use bp_nouveau_the_group_meta() + * @see bp_nouveau_the_group_meta() * * @return string HTML Output. */ function bp_nouveau_group_meta() { - $meta = bp_nouveau_get_group_meta(); + _deprecated_function( __FUNCTION__, '7.0.0', 'bp_nouveau_the_group_meta()' ); + $group_meta = new BP_Nouveau_Group_Meta(); if ( ! bp_is_group() ) { - echo join( ' / ', array_map( 'esc_html', (array) $meta ) ); + echo $group_meta->meta; } else { + return $group_meta; + } +} - /* - * Lets return an object not echo an array here for the single groups, - * more flexible for the template!!?? ~hnla - * - * @todo Paul says that a function that prints and/or returns a value, - * depending on global state, is madness. This needs changing. - */ - return (object) bp_nouveau_get_group_meta(); +/** + * Outputs or returns the group meta(s). + * + * @since 7.0.0 + * + * @param array $args { + * Optional. An array of arguments. + * + * @type array $keys The list of template meta keys. + * @type string $delimeter The delimeter to use in case there is more than + * one key to output. + * @type boolean $echo True to output the template meta value. False otherwise. + * } + * @return string HTML Output. + */ +function bp_nouveau_the_group_meta( $args = array() ) { + $r = bp_parse_args( $args, array( + 'keys' => array(), + 'delimeter' => '/', + 'echo' => true, + ), 'nouveau_the_group_meta' ); + + $group_meta = (array) bp_nouveau_get_group_meta( $r['keys'] ); + + if ( ! $group_meta ) { + return; } + + $meta = ''; + if ( 1 < count( $group_meta ) ) { + $group_meta = array_filter( $group_meta ); + $meta = join( ' ' . $r['delimeter'] . ' ', array_map( 'esc_html', $group_meta ) ); + } else { + $meta = reset( $group_meta ); + } + + if ( ! $r['echo'] ) { + return $meta; + } + + echo $meta; } /** - * Get the group meta. + * Get the group template meta. * * @since 3.0.0 + * @since 7.0.0 Adds the `$keys` parameter. * - * @return array The group meta. + * @param array $keys One or more template meta keys to populate with their values. + * Possible keys are `status`, `count`, `group_type_list`, `description`, `extra`. + * @return array The corresponding group template meta values. */ - function bp_nouveau_get_group_meta() { - /* - * @todo For brevity required approapriate markup is added here as strings - * this needs to be either filterable or the function needs to be able to accept - * & parse args! - */ - $meta = array(); - $is_group = bp_is_group(); + function bp_nouveau_get_group_meta( $keys = array() ) { + $keys = (array) $keys; + $group = false; + $group_meta = array(); + $is_group = bp_is_group(); - if ( ! empty( $GLOBALS['groups_template']->group ) ) { + if ( isset( $GLOBALS['groups_template']->group ) ) { $group = $GLOBALS['groups_template']->group; + } else { + $group = groups_get_current_group(); } - if ( empty( $group->id ) ) { - return $meta; + if ( ! $group ) { + return ''; } - if ( empty( $group->template_meta ) ) { - // It's a single group - if ( $is_group ) { - $meta = array( - 'status' => bp_get_group_type(), - 'group_type_list' => bp_get_group_type_list(), - 'description' => bp_get_group_description(), - ); + if ( ! $keys && ! $is_group ) { + $keys = array( 'status', 'count' ); + } - // Make sure to include hooked meta. - $extra_meta = bp_nouveau_get_hooked_group_meta(); + foreach ( $keys as $key ) { + switch ( $key ) { + case 'status' : + $group_meta['status'] = bp_get_group_type( $group ); + break; - if ( $extra_meta ) { - $meta['extra'] = $extra_meta; - } + case 'count' : + $group_meta['count'] = bp_get_group_member_count( $group ); + break; - // We're in the groups loop - } else { - $meta = array( - 'status' => bp_get_group_type(), - 'count' => bp_get_group_member_count(), - ); - } + case 'group_type_list' : + $group_meta['group_type_list'] = bp_get_group_type_list( $group->id ); + break; - /** - * Filter to add/remove Group meta. - * - * @since 3.0.0 - * - * @param array $meta The list of meta to output. - * @param object $group The current Group of the loop object. - * @param bool $is_group True if a single group is displayed. False otherwise. - */ - $group->template_meta = apply_filters( 'bp_nouveau_get_group_meta', $meta, $group, $is_group ); + case 'description' : + $group_meta['description'] = bp_get_group_description( $group ); + break; + + case 'extra' : + $group_meta['extra'] = ''; + + if ( $is_group ) { + $group_meta['extra'] = bp_nouveau_get_hooked_group_meta(); + } + break; + } } - return $group->template_meta; + /** + * Filter to add/remove Group template meta. + * + * @since 3.0.0 + * + * @param array $group_meta The list of meta to output. + * @param object $group The current Group of the loop object. + * @param bool $is_group True if a single group is displayed. False otherwise. + */ + return apply_filters( 'bp_nouveau_get_group_meta', $group_meta, $group, $is_group ); } /** diff --git src/bp-templates/bp-nouveau/sass/buddypress.scss src/bp-templates/bp-nouveau/sass/buddypress.scss index 8eaa6305a..c6b005608 100644 --- src/bp-templates/bp-nouveau/sass/buddypress.scss +++ src/bp-templates/bp-nouveau/sass/buddypress.scss @@ -26,7 +26,8 @@ /*-------------------------------------------------------------- Hello, this is the BuddyPress Nouveau stylesheet. -@version 4.0.0 +@since 3.0.0 +@version 7.0.0 ---------------------------------------------------------------- >>> TABLE OF CONTENTS: