Skip to:
Content

BuddyPress.org

Changeset 2448


Ignore:
Timestamp:
01/25/2010 02:16:32 PM (15 years ago)
Author:
apeatling
Message:

Fixed missing forum tags.

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-forums/bp-forums-templatetags.php

    r2378 r2448  
    2424        $this->pag_page = isset( $_REQUEST['p'] ) ? intval( $_REQUEST['p'] ) : $page;
    2525        $this->pag_num = isset( $_REQUEST['n'] ) ? intval( $_REQUEST['n'] ) : $per_page;
     26        $this->type = $type;
     27        $this->search_terms = $search_terms;
    2628
    2729        /* Only show stickies if we are viewing a single group forum, otherwise we could end up with hundreds globally */
    … …  
    177179
    178180    /* If we're viewing a tag in the directory, let's auto set the filter to the tag name */
    179     if ( $bp->is_directory && 'tag' == $type && !empty( $bp->action_variables[0] ) )
     181    if ( 'tag' == $bp->current_action && !empty( $bp->action_variables[0] ) ) {
    180182        $search_terms = $bp->action_variables[0];
     183        $type = 'tags';
     184    }
    181185
    182186    /* If $_GET['fs'] is set, let's auto populate the search_terms var */
    … …  
    654658    $total = bp_core_number_format( $forum_template->total_topic_count );
    655659
    656     echo apply_filters( 'bp_forum_pagination_count', sprintf( __( 'Viewing topic %s to %s (%s total topics)', 'buddypress' ), $from_num, $to_num, $total ) );
     660    $pag_filter = false;
     661    if ( 'tags' == $forum_template->type && !empty( $forum_template->search_terms ) )
     662        $pag_filter = sprintf( __( ' matching tag "%s"', 'buddypress' ), $forum_template->search_terms );
     663
     664    echo apply_filters( 'bp_forum_pagination_count', sprintf( __( 'Viewing topic %s to %s (%s total topics%s)', 'buddypress' ), $from_num, $to_num, $total, $pag_filter ) );
    657665?>
    658666<span class="ajax-loader"></span>

  • trunk/bp-themes/bp-default/_inc/ajax.php

    r2424 r2448  
    3939        $bp->ajax_querystring .= '&search_terms=' . $search_terms;
    4040
    41     if ( $scope != 'all' || $bp->displayed_user->id ) {
     41    if ( $scope == 'personal' || $bp->displayed_user->id ) {
    4242        $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
    4343        $bp->ajax_querystring .= '&user_id=' . $user_id;

  • trunk/bp-themes/bp-default/_inc/css/default.css

    r2446 r2448  
    251251        margin-left: 38px;
    252252        font-size: 11px;
     253    }
     254
     255    div#sidebar div.tags div#tag-text {
     256        font-size: 1.4em;
     257        line-height: 140%;
     258        padding-top: 10px;
    253259    }
    254260

  • trunk/bp-themes/bp-default/_inc/global.js

    r2436 r2448  
    718718    });
    719719
     720    /* Clicking a forum tag */
     721    j('div#forum-directory-tags a').click( function() {
     722        bp_filter_request( 'forums', 'tags', j.cookie('bp-forums-scope'), 'div.forums', j(this).html(), 1 );
     723        return false;
     724    });
     725
    720726    /** Invite Friends Interface ****************************************/
    721727

  • trunk/bp-themes/bp-default/blogs/index.php

    r2428 r2448  
    1919
    2020                    <?php if ( is_user_logged_in() && bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?>
    21                         <li id="blogs-myblogs"><a href="<?php echo bp_loggedin_user_domain() . BP_BLOGS_SLUG . '/my-blogs/' ?>"><?php printf( __( 'My Blogs (%s)', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
     21                        <li id="blogs-personal"><a href="<?php echo bp_loggedin_user_domain() . BP_BLOGS_SLUG . '/my-blogs/' ?>"><?php printf( __( 'My Blogs (%s)', 'buddypress' ), bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
    2222                    <?php endif; ?>
    2323

  • trunk/bp-themes/bp-default/forums/index.php

    r2428 r2448  
    7373
    7474                    <?php if ( is_user_logged_in() && bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) : ?>
    75                         <li id="forums-mytopics"><a href="<?php echo bp_loggedin_user_domain() . BP_GROUPS_SLUG . '/' ?>"><?php printf( __( 'My Topics (%s)', 'buddypress' ), bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
     75                        <li id="forums-personal"><a href="<?php echo bp_loggedin_user_domain() . BP_GROUPS_SLUG . '/' ?>"><?php printf( __( 'My Topics (%s)', 'buddypress' ), bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
    7676                    <?php endif; ?>
    7777

  • trunk/bp-themes/bp-default/groups/index.php

    r2428 r2448  
    1818
    1919                    <?php if ( is_user_logged_in() && bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
    20                         <li id="groups-mygroups"><a href="<?php echo bp_loggedin_user_domain() . BP_GROUPS_SLUG . '/my-groups/' ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
     20                        <li id="groups-personal"><a href="<?php echo bp_loggedin_user_domain() . BP_GROUPS_SLUG . '/my-groups/' ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
    2121                    <?php endif; ?>
    2222

  • trunk/bp-themes/bp-default/members/index.php

    r2428 r2448  
    1919
    2020                    <?php if ( is_user_logged_in() && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
    21                         <li id="members-friends"><a href="<?php echo bp_loggedin_user_domain() . BP_FRIENDS_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
     21                        <li id="members-personal"><a href="<?php echo bp_loggedin_user_domain() . BP_FRIENDS_SLUG . '/my-friends/' ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
    2222                    <?php endif; ?>
    2323

  • trunk/bp-themes/bp-default/sidebar.php

    r2441 r2448  
    4646    <?php endif; ?>
    4747
     48    <?php /* Show forum tags on the forums directory */
     49    if ( BP_FORUMS_SLUG == bp_current_component() && bp_is_directory() ) : ?>
     50        <div id="forum-directory-tags" class="widget tags">
    4851
    49     <?php if ( !dynamic_sidebar( 'sidebar' ) ) : ?>
     52            <h3 class="widgettitle"><?php _e( 'Forum Topic Tags', 'buddypress' ) ?></h3>
     53            <?php if ( function_exists('bp_forums_tag_heat_map') ) : ?>
     54                <div id="tag-text"><?php bp_forums_tag_heat_map(); ?></div>
     55            <?php endif; ?>
     56        </div>
     57    <?php endif; ?>
    5058
    51 
    52     <?php endif; ?>
     59    <?php dynamic_sidebar( 'sidebar' ) ?>
    5360
    5461    <?php do_action( 'bp_inside_after_sidebar' ) ?>
Note: See TracChangeset for help on using the changeset viewer.