<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2448] trunk: Fixed missing forum tags.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2448</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-25 14:16:32 +0000 (Mon, 25 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixed missing forum tags.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpforumsbpforumstemplatetagsphp">trunk/bp-forums/bp-forums-templatetags.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incajaxphp">trunk/bp-themes/bp-default/_inc/ajax.php</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
<li><a href="#trunkbpthemesbpdefaultblogsindexphp">trunk/bp-themes/bp-default/blogs/index.php</a></li>
<li><a href="#trunkbpthemesbpdefaultforumsindexphp">trunk/bp-themes/bp-default/forums/index.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupsindexphp">trunk/bp-themes/bp-default/groups/index.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmembersindexphp">trunk/bp-themes/bp-default/members/index.php</a></li>
<li><a href="#trunkbpthemesbpdefaultsidebarphp">trunk/bp-themes/bp-default/sidebar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpforumsbpforumstemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-templatetags.php (2447 => 2448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-templatetags.php 2010-01-25 14:11:08 UTC (rev 2447)
+++ trunk/bp-forums/bp-forums-templatetags.php 2010-01-25 14:16:32 UTC (rev 2448)
</span><span class="lines">@@ -23,6 +23,8 @@
</span><span class="cx">
</span><span class="cx"> $this->pag_page = isset( $_REQUEST['p'] ) ? intval( $_REQUEST['p'] ) : $page;
</span><span class="cx"> $this->pag_num = isset( $_REQUEST['n'] ) ? intval( $_REQUEST['n'] ) : $per_page;
</span><ins>+ $this->type = $type;
+ $this->search_terms = $search_terms;
</ins><span class="cx">
</span><span class="cx"> /* Only show stickies if we are viewing a single group forum, otherwise we could end up with hundreds globally */
</span><span class="cx"> if ( $no_stickies )
</span><span class="lines">@@ -176,8 +178,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* If we're viewing a tag in the directory, let's auto set the filter to the tag name */
</span><del>- if ( $bp->is_directory && 'tag' == $type && !empty( $bp->action_variables[0] ) )
</del><ins>+ if ( 'tag' == $bp->current_action && !empty( $bp->action_variables[0] ) ) {
</ins><span class="cx"> $search_terms = $bp->action_variables[0];
</span><ins>+ $type = 'tags';
+ }
</ins><span class="cx">
</span><span class="cx"> /* If $_GET['fs'] is set, let's auto populate the search_terms var */
</span><span class="cx"> if ( $bp->is_directory && !empty( $_GET['fs'] ) )
</span><span class="lines">@@ -653,7 +657,11 @@
</span><span class="cx"> $to_num = bp_core_number_format( ( $from_num + ( $forum_template->pag_num - 1 ) > $forum_template->total_topic_count ) ? $forum_template->total_topic_count : $from_num + ( $forum_template->pag_num - 1 ) );
</span><span class="cx"> $total = bp_core_number_format( $forum_template->total_topic_count );
</span><span class="cx">
</span><del>- echo apply_filters( 'bp_forum_pagination_count', sprintf( __( 'Viewing topic %s to %s (%s total topics)', 'buddypress' ), $from_num, $to_num, $total ) );
</del><ins>+ $pag_filter = false;
+ if ( 'tags' == $forum_template->type && !empty( $forum_template->search_terms ) )
+ $pag_filter = sprintf( __( ' matching tag "%s"', 'buddypress' ), $forum_template->search_terms );
+
+ 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 ) );
</ins><span class="cx"> ?>
</span><span class="cx"> <span class="ajax-loader"></span>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/ajax.php (2447 => 2448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/ajax.php 2010-01-25 14:11:08 UTC (rev 2447)
+++ trunk/bp-themes/bp-default/_inc/ajax.php 2010-01-25 14:16:32 UTC (rev 2448)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> if ( !empty( $search_terms ) )
</span><span class="cx"> $bp->ajax_querystring .= '&search_terms=' . $search_terms;
</span><span class="cx">
</span><del>- if ( $scope != 'all' || $bp->displayed_user->id ) {
</del><ins>+ if ( $scope == 'personal' || $bp->displayed_user->id ) {
</ins><span class="cx"> $user_id = ( $bp->displayed_user->id ) ? $bp->displayed_user->id : $bp->loggedin_user->id;
</span><span class="cx"> $bp->ajax_querystring .= '&user_id=' . $user_id;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (2447 => 2448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2010-01-25 14:11:08 UTC (rev 2447)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2010-01-25 14:16:32 UTC (rev 2448)
</span><span class="lines">@@ -252,6 +252,12 @@
</span><span class="cx"> font-size: 11px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ div#sidebar div.tags div#tag-text {
+ font-size: 1.4em;
+ line-height: 140%;
+ padding-top: 10px;
+ }
+
</ins><span class="cx"> /* > Content
</span><span class="cx"> -------------------------------------------------------------- */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (2447 => 2448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2010-01-25 14:11:08 UTC (rev 2447)
+++ trunk/bp-themes/bp-default/_inc/global.js 2010-01-25 14:16:32 UTC (rev 2448)
</span><span class="lines">@@ -717,6 +717,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> });
</span><span class="cx">
</span><ins>+ /* Clicking a forum tag */
+ j('div#forum-directory-tags a').click( function() {
+ bp_filter_request( 'forums', 'tags', j.cookie('bp-forums-scope'), 'div.forums', j(this).html(), 1 );
+ return false;
+ });
+
</ins><span class="cx"> /** Invite Friends Interface ****************************************/
</span><span class="cx">
</span><span class="cx"> /* Select a user from the list of friends and add them to the invite list */
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultblogsindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/blogs/index.php (2447 => 2448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/blogs/index.php 2010-01-25 14:11:08 UTC (rev 2447)
+++ trunk/bp-themes/bp-default/blogs/index.php 2010-01-25 14:16:32 UTC (rev 2448)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> <li class="selected" id="blogs-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Blogs (%s)', 'buddypress' ), bp_get_total_blog_count() ) ?></a></li>
</span><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() && bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_blogs_directory_blog_types' ) ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultforumsindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/forums/index.php (2447 => 2448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/forums/index.php 2010-01-25 14:11:08 UTC (rev 2447)
+++ trunk/bp-themes/bp-default/forums/index.php 2010-01-25 14:16:32 UTC (rev 2448)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> <li class="selected" id="forums-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Topics (%s)', 'buddypress' ), bp_get_forum_topic_count() ) ?></a></li>
</span><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() && bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) : ?>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_members_directory_group_types' ) ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupsindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/index.php (2447 => 2448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/index.php 2010-01-25 14:11:08 UTC (rev 2447)
+++ trunk/bp-themes/bp-default/groups/index.php 2010-01-25 14:16:32 UTC (rev 2448)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> <li class="selected" id="groups-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Groups (%s)', 'buddypress' ), bp_get_total_group_count() ) ?></a></li>
</span><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() && bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_groups_directory_group_types' ) ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmembersindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/index.php (2447 => 2448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/index.php 2010-01-25 14:11:08 UTC (rev 2447)
+++ trunk/bp-themes/bp-default/members/index.php 2010-01-25 14:16:32 UTC (rev 2448)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> <li class="selected" id="members-all"><a href="<?php bp_root_domain() ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_member_count() ) ?></a></li>
</span><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_members_directory_member_types' ) ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultsidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/sidebar.php (2447 => 2448)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/sidebar.php 2010-01-25 14:11:08 UTC (rev 2447)
+++ trunk/bp-themes/bp-default/sidebar.php 2010-01-25 14:16:32 UTC (rev 2448)
</span><span class="lines">@@ -45,12 +45,19 @@
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><ins>+ <?php /* Show forum tags on the forums directory */
+ if ( BP_FORUMS_SLUG == bp_current_component() && bp_is_directory() ) : ?>
+ <div id="forum-directory-tags" class="widget tags">
</ins><span class="cx">
</span><del>- <?php if ( !dynamic_sidebar( 'sidebar' ) ) : ?>
</del><ins>+ <h3 class="widgettitle"><?php _e( 'Forum Topic Tags', 'buddypress' ) ?></h3>
+ <?php if ( function_exists('bp_forums_tag_heat_map') ) : ?>
+ <div id="tag-text"><?php bp_forums_tag_heat_map(); ?></div>
+ <?php endif; ?>
+ </div>
+ <?php endif; ?>
</ins><span class="cx">
</span><ins>+ <?php dynamic_sidebar( 'sidebar' ) ?>
</ins><span class="cx">
</span><del>- <?php endif; ?>
-
</del><span class="cx"> <?php do_action( 'bp_inside_after_sidebar' ) ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- .padder -->
</span></span></pre>
</div>
</div>
</body>
</html>