Skip to:
Content

BuddyPress.org

Changeset 11048


Ignore:
Timestamp:
08/31/2016 01:21:12 PM (3 years ago)
Author:
boonebgorges
Message:

Templates: Move component directory search markup to 'common' template.

The new 'common' directory in the bp-legacy template pack will be a
storehouse for template parts that are shared between components. The
directory search form is the first implementation of this idea.

Props hnla, mercime.
See #6844.

Location:
trunk/src
Files:
3 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/bp-core/bp-core-functions.php

    r11021 r11048  
    851851 *
    852852 * @since 2.4.0
    853  *
    854  * @param string $component Component name.
     853 * @since 2.7.0 The `$component` parameter was made optional, with the current component
     854 *              as the fallback value.
     855 *
     856 * @param string $component Optional. Component name. Defaults to current component.
    855857 * @return string|bool Query argument on success. False on failure.
    856858 */
    857 function bp_core_get_component_search_query_arg( $component ) {
     859function bp_core_get_component_search_query_arg( $component = null ) {
     860    if ( ! $component ) {
     861        $component = bp_current_component();
     862    }
     863
    858864    $query_arg = false;
    859865    if ( isset( buddypress()->{$component}->search_query_arg ) ) {
  • trunk/src/bp-core/bp-core-template.php

    r10899 r11048  
    583583     */
    584584    return apply_filters( 'bp_search_form_type_select', $selection_box );
     585}
     586
     587/**
     588 * Output the 'name' attribute for search form input element.
     589 *
     590 * @since 2.7.0
     591 *
     592 * @param string $component See bp_get_search_input_name().
     593 */
     594function bp_search_input_name( $component = '' ) {
     595    echo esc_attr( bp_get_search_input_name( $component ) );
     596}
     597
     598/**
     599 * Get the 'name' attribute for the search form input element.
     600 *
     601 * @since 2.7.0
     602 *
     603 * @param string $component Component name. Defaults to current component.
     604 * @return string Text for the 'name' attribute.
     605 */
     606function bp_get_search_input_name( $component = '' ) {
     607    if ( ! $component ) {
     608        $component = bp_current_component();
     609    }
     610
     611    $bp = buddypress();
     612
     613    $name = '';
     614    if ( isset( $bp->{$component}->id ) ) {
     615        $name = $bp->{$component}->id . '_search';
     616    }
     617
     618    return $name;
     619}
     620
     621/**
     622 * Output the placeholder text for the search box for a given component.
     623 *
     624 * @since 2.7.0
     625 *
     626 * @param string $component See bp_get_search_placeholder().
     627 */
     628function bp_search_placeholder( $component = '' ) {
     629    echo esc_attr( bp_get_search_placeholder( $component ) );
     630}
     631
     632/**
     633 * Get the placeholder text for the search box for a given component.
     634 *
     635 * @since 2.7.0
     636 *
     637 * @param string $component Component name. Defaults to current component.
     638 * @return string Placeholder text for the search field.
     639 */
     640function bp_get_search_placeholder( $component = '' ) {
     641    $query_arg = bp_core_get_component_search_query_arg( $component );
     642
     643    if ( $query_arg && ! empty( $_REQUEST[ $query_arg ] ) ) {
     644        $placeholder = wp_unslash( $_REQUEST[ $query_arg ] );
     645    } else {
     646        $placeholder = bp_get_search_default_text( $component );
     647    }
     648
     649    return $placeholder;
    585650}
    586651
  • trunk/src/bp-templates/bp-legacy/buddypress/blogs/index.php

    r10265 r11048  
    3434    do_action( 'bp_before_directory_blogs_content' ); ?>
    3535
    36     <div id="blog-dir-search" class="dir-search" role="search">
    37         <?php bp_directory_blogs_search_form(); ?>
    38     </div><!-- #blog-dir-search -->
     36    <?php /* Backward compatibility for inline search form. Use template part instead. */ ?>
     37    <?php if ( has_filter( 'bp_directory_blogs_search_form' ) ) : ?>
     38
     39        <div id="blog-dir-search" class="dir-search" role="search">
     40            <?php bp_directory_blogs_search_form(); ?>
     41        </div><!-- #blog-dir-search -->
     42
     43    <?php else : ?>
     44
     45        <?php bp_get_template_part( 'common/search/dir-search-form' ); ?>
     46
     47    <?php endif; ?>
    3948
    4049    <?php
  • trunk/src/bp-templates/bp-legacy/buddypress/forums/index.php

    r10265 r11048  
    3030        do_action( 'bp_before_directory_forums_content' ); ?>
    3131
    32         <div id="forums-dir-search" class="dir-search" role="search">
    33 
    34             <?php bp_directory_forums_search_form(); ?>
    35 
    36         </div>
     32        <?php /* Backward compatibility for inline search form. Use template part instead. */ ?>
     33        <?php if ( has_filter( 'bp_directory_forums_search_form' ) ) : ?>
     34
     35            <div id="forums-dir-search" class="dir-search" role="search">
     36                <?php bp_directory_forums_search_form(); ?>
     37            </div>
     38
     39        <?php else: ?>
     40
     41            <?php bp_get_template_part( 'common/search/dir-search-form' ); ?>
     42
     43        <?php endif; ?>
     44
    3745    </form>
    3846
  • trunk/src/bp-templates/bp-legacy/buddypress/groups/index.php

    r10487 r11048  
    3434    do_action( 'bp_before_directory_groups_content' ); ?>
    3535
    36     <div id="group-dir-search" class="dir-search" role="search">
    37         <?php bp_directory_groups_search_form(); ?>
    38     </div><!-- #group-dir-search -->
     36    <?php /* Backward compatibility for inline search form. Use template part instead. */ ?>
     37    <?php if ( has_filter( 'bp_directory_groups_search_form' ) ) : ?>
     38
     39        <div id="group-dir-search" class="dir-search" role="search">
     40            <?php bp_directory_groups_search_form(); ?>
     41        </div><!-- #group-dir-search -->
     42
     43    <?php else: ?>
     44
     45        <?php bp_get_template_part( 'common/search/dir-search-form' ); ?>
     46
     47    <?php endif; ?>
    3948
    4049    <form action="" method="post" id="groups-directory-form" class="dir-form">
  • trunk/src/bp-templates/bp-legacy/buddypress/members/index.php

    r10487 r11048  
    3434    do_action( 'bp_before_directory_members_content' ); ?>
    3535
    36     <div id="members-dir-search" class="dir-search" role="search">
    37         <?php bp_directory_members_search_form(); ?>
    38     </div><!-- #members-dir-search -->
     36    <?php /* Backward compatibility for inline search form. Use template part instead. */ ?>
     37    <?php if ( has_filter( 'bp_directory_members_search_form' ) ) : ?>
     38
     39        <div id="members-dir-search" class="dir-search" role="search">
     40            <?php bp_directory_members_search_form(); ?>
     41        </div><!-- #members-dir-search -->
     42
     43    <?php else: ?>
     44
     45        <?php bp_get_template_part( 'common/search/dir-search-form' ); ?>
     46
     47    <?php endif; ?>
    3948
    4049    <?php
    41 
    4250    /**
    4351     * Fires before the display of the members list tabs.
Note: See TracChangeset for help on using the changeset viewer.