<!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] [3069] branches/1.2: Fixes #2465</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3069</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-06-27 00:29:31 +0000 (Sun, 27 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2465</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpactivityphp">branches/1.2/bp-activity.php</a></li>
<li><a href="#branches12bpfriendsphp">branches/1.2/bp-friends.php</a></li>
<li><a href="#branches12bpgroupsphp">branches/1.2/bp-groups.php</a></li>
<li><a href="#branches12bpmessagesphp">branches/1.2/bp-messages.php</a></li>
<li><a href="#branches12bpthemesbpdefault_incglobaljs">branches/1.2/bp-themes/bp-default/_inc/global.js</a></li>
<li><a href="#branches12bpthemesbpdefaultforumsforumsloopphp">branches/1.2/bp-themes/bp-default/forums/forums-loop.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpactivityphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-activity.php (3068 => 3069)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-activity.php 2010-06-26 23:30:43 UTC (rev 3068)
+++ branches/1.2/bp-activity.php 2010-06-27 00:29:31 UTC (rev 3069)
</span><span class="lines">@@ -262,27 +262,31 @@
</span><span class="cx"> function bp_activity_screen_notification_settings() {
</span><span class="cx"> global $bp; ?>
</span><span class="cx"> <table class="notification-settings" id="activity-notification-settings">
</span><del>- <tr>
- <th class="icon"></th>
- <th class="title"><?php _e( 'Activity', 'buddypress' ) ?></th>
- <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
- <th class="no"><?php _e( 'No', 'buddypress' )?></th>
- </tr>
</del><ins>+ <thead>
+ <tr>
+ <th class="icon"></th>
+ <th class="title"><?php _e( 'Activity', 'buddypress' ) ?></th>
+ <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
+ <th class="no"><?php _e( 'No', 'buddypress' )?></th>
+ </tr>
+ </thead>
</ins><span class="cx">
</span><del>- <tr>
- <td></td>
- <td><?php printf( __( 'A member mentions you in an update using "@%s"', 'buddypress' ), bp_core_get_username( $bp->loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login ) ) ?></td>
- <td class="yes"><input type="radio" name="notifications[notification_activity_new_mention]" value="yes" <?php if ( !get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_mention' ) || 'yes' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_mention' ) ) { ?>checked="checked" <?php } ?>/></td>
- <td class="no"><input type="radio" name="notifications[notification_activity_new_mention]" value="no" <?php if ( 'no' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_mention' ) ) { ?>checked="checked" <?php } ?>/></td>
- </tr>
- <tr>
- <td></td>
- <td><?php printf( __( "A member replies to an update or comment you've posted", 'buddypress' ), $current_user->user_login ) ?></td>
- <td class="yes"><input type="radio" name="notifications[notification_activity_new_reply]" value="yes" <?php if ( !get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) || 'yes' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) ) { ?>checked="checked" <?php } ?>/></td>
- <td class="no"><input type="radio" name="notifications[notification_activity_new_reply]" value="no" <?php if ( 'no' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) ) { ?>checked="checked" <?php } ?>/></td>
- </tr>
</del><ins>+ <tbody>
+ <tr>
+ <td></td>
+ <td><?php printf( __( 'A member mentions you in an update using "@%s"', 'buddypress' ), bp_core_get_username( $bp->loggedin_user->id, $bp->loggedin_user->userdata->user_nicename, $bp->loggedin_user->userdata->user_login ) ) ?></td>
+ <td class="yes"><input type="radio" name="notifications[notification_activity_new_mention]" value="yes" <?php if ( !get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_mention' ) || 'yes' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_mention' ) ) { ?>checked="checked" <?php } ?>/></td>
+ <td class="no"><input type="radio" name="notifications[notification_activity_new_mention]" value="no" <?php if ( 'no' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_mention' ) ) { ?>checked="checked" <?php } ?>/></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td><?php printf( __( "A member replies to an update or comment you've posted", 'buddypress' ), $current_user->user_login ) ?></td>
+ <td class="yes"><input type="radio" name="notifications[notification_activity_new_reply]" value="yes" <?php if ( !get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) || 'yes' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) ) { ?>checked="checked" <?php } ?>/></td>
+ <td class="no"><input type="radio" name="notifications[notification_activity_new_reply]" value="no" <?php if ( 'no' == get_usermeta( $bp->loggedin_user->id, 'notification_activity_new_reply' ) ) { ?>checked="checked" <?php } ?>/></td>
+ </tr>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_activity_screen_notification_settings' ) ?>
</del><ins>+ <?php do_action( 'bp_activity_screen_notification_settings' ) ?>
+ </tbody>
</ins><span class="cx"> </table>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="branches12bpfriendsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-friends.php (3068 => 3069)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-friends.php 2010-06-26 23:30:43 UTC (rev 3068)
+++ branches/1.2/bp-friends.php 2010-06-27 00:29:31 UTC (rev 3069)
</span><span class="lines">@@ -142,26 +142,31 @@
</span><span class="cx"> function friends_screen_notification_settings() {
</span><span class="cx"> global $current_user; ?>
</span><span class="cx"> <table class="notification-settings" id="friends-notification-settings">
</span><del>- <tr>
- <th class="icon"></th>
- <th class="title"><?php _e( 'Friends', 'buddypress' ) ?></th>
- <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
- <th class="no"><?php _e( 'No', 'buddypress' )?></th>
- </tr>
- <tr>
- <td></td>
- <td><?php _e( 'A member sends you a friendship request', 'buddypress' ) ?></td>
- <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" value="yes" <?php if ( !get_usermeta( $current_user->id,'notification_friends_friendship_request') || 'yes' == get_usermeta( $current_user->id,'notification_friends_friendship_request') ) { ?>checked="checked" <?php } ?>/></td>
- <td class="no"><input type="radio" name="notifications[notification_friends_friendship_request]" value="no" <?php if ( get_usermeta( $current_user->id,'notification_friends_friendship_request') == 'no' ) { ?>checked="checked" <?php } ?>/></td>
- </tr>
- <tr>
- <td></td>
- <td><?php _e( 'A member accepts your friendship request', 'buddypress' ) ?></td>
- <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="yes" <?php if ( !get_usermeta( $current_user->id,'notification_friends_friendship_accepted') || 'yes' == get_usermeta( $current_user->id,'notification_friends_friendship_accepted') ) { ?>checked="checked" <?php } ?>/></td>
- <td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id,'notification_friends_friendship_accepted') ) { ?>checked="checked" <?php } ?>/></td>
- </tr>
</del><ins>+ <thead>
+ <tr>
+ <th class="icon"></th>
+ <th class="title"><?php _e( 'Friends', 'buddypress' ) ?></th>
+ <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
+ <th class="no"><?php _e( 'No', 'buddypress' )?></th>
+ </tr>
+ </thead>
</ins><span class="cx">
</span><del>- <?php do_action( 'friends_screen_notification_settings' ); ?>
</del><ins>+ <tbody>
+ <tr>
+ <td></td>
+ <td><?php _e( 'A member sends you a friendship request', 'buddypress' ) ?></td>
+ <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" value="yes" <?php if ( !get_usermeta( $current_user->id,'notification_friends_friendship_request') || 'yes' == get_usermeta( $current_user->id,'notification_friends_friendship_request') ) { ?>checked="checked" <?php } ?>/></td>
+ <td class="no"><input type="radio" name="notifications[notification_friends_friendship_request]" value="no" <?php if ( get_usermeta( $current_user->id,'notification_friends_friendship_request') == 'no' ) { ?>checked="checked" <?php } ?>/></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td><?php _e( 'A member accepts your friendship request', 'buddypress' ) ?></td>
+ <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="yes" <?php if ( !get_usermeta( $current_user->id,'notification_friends_friendship_accepted') || 'yes' == get_usermeta( $current_user->id,'notification_friends_friendship_accepted') ) { ?>checked="checked" <?php } ?>/></td>
+ <td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id,'notification_friends_friendship_accepted') ) { ?>checked="checked" <?php } ?>/></td>
+ </tr>
+
+ <?php do_action( 'friends_screen_notification_settings' ); ?>
+ </tbody>
</ins><span class="cx"> </table>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="branches12bpgroupsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-groups.php (3068 => 3069)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-groups.php 2010-06-26 23:30:43 UTC (rev 3068)
+++ branches/1.2/bp-groups.php 2010-06-27 00:29:31 UTC (rev 3069)
</span><span class="lines">@@ -961,38 +961,43 @@
</span><span class="cx"> function groups_screen_notification_settings() {
</span><span class="cx"> global $current_user; ?>
</span><span class="cx"> <table class="notification-settings" id="groups-notification-settings">
</span><del>- <tr>
- <th class="icon"></th>
- <th class="title"><?php _e( 'Groups', 'buddypress' ) ?></th>
- <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
- <th class="no"><?php _e( 'No', 'buddypress' )?></th>
- </tr>
- <tr>
- <td></td>
- <td><?php _e( 'A member invites you to join a group', 'buddypress' ) ?></td>
- <td class="yes"><input type="radio" name="notifications[notification_groups_invite]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_invite') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_invite') ) { ?>checked="checked" <?php } ?>/></td>
- <td class="no"><input type="radio" name="notifications[notification_groups_invite]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_invite') ) { ?>checked="checked" <?php } ?>/></td>
- </tr>
- <tr>
- <td></td>
- <td><?php _e( 'Group information is updated', 'buddypress' ) ?></td>
- <td class="yes"><input type="radio" name="notifications[notification_groups_group_updated]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_group_updated') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_group_updated') ) { ?>checked="checked" <?php } ?>/></td>
- <td class="no"><input type="radio" name="notifications[notification_groups_group_updated]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_group_updated') ) { ?>checked="checked" <?php } ?>/></td>
- </tr>
- <tr>
- <td></td>
- <td><?php _e( 'You are promoted to a group administrator or moderator', 'buddypress' ) ?></td>
- <td class="yes"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_admin_promotion') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_admin_promotion') ) { ?>checked="checked" <?php } ?>/></td>
- <td class="no"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_admin_promotion') ) { ?>checked="checked" <?php } ?>/></td>
- </tr>
- <tr>
- <td></td>
- <td><?php _e( 'A member requests to join a private group for which you are an admin', 'buddypress' ) ?></td>
- <td class="yes"><input type="radio" name="notifications[notification_groups_membership_request]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_membership_request') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_membership_request') ) { ?>checked="checked" <?php } ?>/></td>
- <td class="no"><input type="radio" name="notifications[notification_groups_membership_request]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_membership_request') ) { ?>checked="checked" <?php } ?>/></td>
- </tr>
</del><ins>+ <thead>
+ <tr>
+ <th class="icon"></th>
+ <th class="title"><?php _e( 'Groups', 'buddypress' ) ?></th>
+ <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
+ <th class="no"><?php _e( 'No', 'buddypress' )?></th>
+ </tr>
+ </thead>
</ins><span class="cx">
</span><del>- <?php do_action( 'groups_screen_notification_settings' ); ?>
</del><ins>+ <tbody>
+ <tr>
+ <td></td>
+ <td><?php _e( 'A member invites you to join a group', 'buddypress' ) ?></td>
+ <td class="yes"><input type="radio" name="notifications[notification_groups_invite]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_invite') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_invite') ) { ?>checked="checked" <?php } ?>/></td>
+ <td class="no"><input type="radio" name="notifications[notification_groups_invite]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_invite') ) { ?>checked="checked" <?php } ?>/></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td><?php _e( 'Group information is updated', 'buddypress' ) ?></td>
+ <td class="yes"><input type="radio" name="notifications[notification_groups_group_updated]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_group_updated') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_group_updated') ) { ?>checked="checked" <?php } ?>/></td>
+ <td class="no"><input type="radio" name="notifications[notification_groups_group_updated]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_group_updated') ) { ?>checked="checked" <?php } ?>/></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td><?php _e( 'You are promoted to a group administrator or moderator', 'buddypress' ) ?></td>
+ <td class="yes"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_admin_promotion') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_admin_promotion') ) { ?>checked="checked" <?php } ?>/></td>
+ <td class="no"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_admin_promotion') ) { ?>checked="checked" <?php } ?>/></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td><?php _e( 'A member requests to join a private group for which you are an admin', 'buddypress' ) ?></td>
+ <td class="yes"><input type="radio" name="notifications[notification_groups_membership_request]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_membership_request') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_membership_request') ) { ?>checked="checked" <?php } ?>/></td>
+ <td class="no"><input type="radio" name="notifications[notification_groups_membership_request]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_membership_request') ) { ?>checked="checked" <?php } ?>/></td>
+ </tr>
+
+ <?php do_action( 'groups_screen_notification_settings' ); ?>
+ </tbody>
</ins><span class="cx"> </table>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="branches12bpmessagesphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-messages.php (3068 => 3069)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-messages.php 2010-06-26 23:30:43 UTC (rev 3068)
+++ branches/1.2/bp-messages.php 2010-06-27 00:29:31 UTC (rev 3069)
</span><span class="lines">@@ -236,26 +236,31 @@
</span><span class="cx"> function messages_screen_notification_settings() {
</span><span class="cx"> global $current_user; ?>
</span><span class="cx"> <table class="notification-settings" id="messages-notification-settings">
</span><del>- <tr>
- <th class="icon"></th>
- <th class="title"><?php _e( 'Messages', 'buddypress' ) ?></th>
- <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
- <th class="no"><?php _e( 'No', 'buddypress' )?></th>
- </tr>
- <tr>
- <td></td>
- <td><?php _e( 'A member sends you a new message', 'buddypress' ) ?></td>
- <td class="yes"><input type="radio" name="notifications[notification_messages_new_message]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_messages_new_message' ) || 'yes' == get_usermeta( $current_user->id, 'notification_messages_new_message' ) ) { ?>checked="checked" <?php } ?>/></td>
- <td class="no"><input type="radio" name="notifications[notification_messages_new_message]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_messages_new_message' ) ) { ?>checked="checked" <?php } ?>/></td>
- </tr>
- <tr>
- <td></td>
- <td><?php _e( 'A new site notice is posted', 'buddypress' ) ?></td>
- <td class="yes"><input type="radio" name="notifications[notification_messages_new_notice]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_messages_new_notice' ) || 'yes' == get_usermeta( $current_user->id, 'notification_messages_new_notice' ) ) { ?>checked="checked" <?php } ?>/></td>
- <td class="no"><input type="radio" name="notifications[notification_messages_new_notice]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_messages_new_notice' ) ) { ?>checked="checked" <?php } ?>/></td>
- </tr>
</del><ins>+ <thead>
+ <tr>
+ <th class="icon"></th>
+ <th class="title"><?php _e( 'Messages', 'buddypress' ) ?></th>
+ <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
+ <th class="no"><?php _e( 'No', 'buddypress' )?></th>
+ </tr>
+ </thead>
</ins><span class="cx">
</span><del>- <?php do_action( 'messages_screen_notification_settings' ) ?>
</del><ins>+ <tbody>
+ <tr>
+ <td></td>
+ <td><?php _e( 'A member sends you a new message', 'buddypress' ) ?></td>
+ <td class="yes"><input type="radio" name="notifications[notification_messages_new_message]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_messages_new_message' ) || 'yes' == get_usermeta( $current_user->id, 'notification_messages_new_message' ) ) { ?>checked="checked" <?php } ?>/></td>
+ <td class="no"><input type="radio" name="notifications[notification_messages_new_message]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_messages_new_message' ) ) { ?>checked="checked" <?php } ?>/></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td><?php _e( 'A new site notice is posted', 'buddypress' ) ?></td>
+ <td class="yes"><input type="radio" name="notifications[notification_messages_new_notice]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_messages_new_notice' ) || 'yes' == get_usermeta( $current_user->id, 'notification_messages_new_notice' ) ) { ?>checked="checked" <?php } ?>/></td>
+ <td class="no"><input type="radio" name="notifications[notification_messages_new_notice]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_messages_new_notice' ) ) { ?>checked="checked" <?php } ?>/></td>
+ </tr>
+
+ <?php do_action( 'messages_screen_notification_settings' ) ?>
+ </tbody>
</ins><span class="cx"> </table>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="branches12bpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/_inc/global.js (3068 => 3069)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/_inc/global.js 2010-06-26 23:30:43 UTC (rev 3068)
+++ branches/1.2/bp-themes/bp-default/_inc/global.js 2010-06-27 00:29:31 UTC (rev 3069)
</span><span class="lines">@@ -819,7 +819,7 @@
</span><span class="cx">
</span><span class="cx"> /** Alternate Highlighting ******************************************/
</span><span class="cx">
</span><del>- jq('table tr, div.message-box').each( function(i) {
</del><ins>+ jq('body#bp-default table tbody tr, div.message-box').each( function(i) {
</ins><span class="cx"> if ( i % 2 != 1 )
</span><span class="cx"> jq(this).addClass('alt');
</span><span class="cx"> });
</span></span></pre></div>
<a id="branches12bpthemesbpdefaultforumsforumsloopphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/forums/forums-loop.php (3068 => 3069)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/forums/forums-loop.php 2010-06-26 23:30:43 UTC (rev 3068)
+++ branches/1.2/bp-themes/bp-default/forums/forums-loop.php 2010-06-27 00:29:31 UTC (rev 3069)
</span><span class="lines">@@ -19,56 +19,60 @@
</span><span class="cx"> <?php do_action( 'bp_before_directory_forums_list' ) ?>
</span><span class="cx">
</span><span class="cx"> <table class="forum">
</span><ins>+ <thead>
+ <tr>
+ <th id="th-title"><?php _e( 'Topic Title', 'buddypress' ) ?></th>
+ <th id="th-poster"><?php _e( 'Latest Poster', 'buddypress' ) ?></th>
</ins><span class="cx">
</span><del>- <tr>
- <th id="th-title"><?php _e( 'Topic Title', 'buddypress' ) ?></th>
- <th id="th-poster"><?php _e( 'Latest Poster', 'buddypress' ) ?></th>
</del><ins>+ <?php if ( !bp_is_group_forum() ) : ?>
+ <th id="th-group"><?php _e( 'Posted In Group', 'buddypress' ) ?></th>
+ <?php endif; ?>
</ins><span class="cx">
</span><del>- <?php if ( !bp_is_group_forum() ) : ?>
- <th id="th-group"><?php _e( 'Posted In Group', 'buddypress' ) ?></th>
- <?php endif; ?>
</del><ins>+ <th id="th-postcount"><?php _e( 'Posts', 'buddypress' ) ?></th>
+ <th id="th-freshness"><?php _e( 'Freshness', 'buddypress' ) ?></th>
</ins><span class="cx">
</span><del>- <th id="th-postcount"><?php _e( 'Posts', 'buddypress' ) ?></th>
- <th id="th-freshness"><?php _e( 'Freshness', 'buddypress' ) ?></th>
</del><ins>+ <?php do_action( 'bp_directory_forums_extra_cell_head' ) ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_directory_forums_extra_cell_head' ) ?>
</del><ins>+ </tr>
+ </thead>
</ins><span class="cx">
</span><del>- </tr>
</del><ins>+ <tbody>
</ins><span class="cx">
</span><del>- <?php while ( bp_forum_topics() ) : bp_the_forum_topic(); ?>
</del><ins>+ <?php while ( bp_forum_topics() ) : bp_the_forum_topic(); ?>
</ins><span class="cx">
</span><del>- <tr class="<?php bp_the_topic_css_class() ?>">
- <td class="td-title">
- <a class="topic-title" href="<?php bp_the_topic_permalink() ?>" title="<?php bp_the_topic_title() ?> - <?php _e( 'Permalink', 'buddypress' ) ?>">
- <?php bp_the_topic_title() ?>
- </a>
- </td>
- <td class="td-poster">
- <a href="<?php bp_the_topic_permalink() ?>"><?php bp_the_topic_last_poster_avatar( 'type=thumb&width=20&height=20' ) ?></a>
- <div class="poster-name"><?php bp_the_topic_last_poster_name() ?></div>
- </td>
</del><ins>+ <tr class="<?php bp_the_topic_css_class() ?>">
+ <td class="td-title">
+ <a class="topic-title" href="<?php bp_the_topic_permalink() ?>" title="<?php bp_the_topic_title() ?> - <?php _e( 'Permalink', 'buddypress' ) ?>">
+ <?php bp_the_topic_title() ?>
+ </a>
+ </td>
+ <td class="td-poster">
+ <a href="<?php bp_the_topic_permalink() ?>"><?php bp_the_topic_last_poster_avatar( 'type=thumb&width=20&height=20' ) ?></a>
+ <div class="poster-name"><?php bp_the_topic_last_poster_name() ?></div>
+ </td>
</ins><span class="cx">
</span><del>- <?php if ( !bp_is_group_forum() ) : ?>
- <td class="td-group">
- <a href="<?php bp_the_topic_object_permalink() ?>"><?php bp_the_topic_object_avatar( 'type=thumb&width=20&height=20' ) ?></a>
- <div class="object-name"><a href="<?php bp_the_topic_object_permalink() ?>" title="<?php bp_the_topic_object_name() ?>"><?php bp_the_topic_object_name() ?></a></div>
</del><ins>+ <?php if ( !bp_is_group_forum() ) : ?>
+ <td class="td-group">
+ <a href="<?php bp_the_topic_object_permalink() ?>"><?php bp_the_topic_object_avatar( 'type=thumb&width=20&height=20' ) ?></a>
+ <div class="object-name"><a href="<?php bp_the_topic_object_permalink() ?>" title="<?php bp_the_topic_object_name() ?>"><?php bp_the_topic_object_name() ?></a></div>
+ </td>
+ <?php endif; ?>
+
+ <td class="td-postcount">
+ <?php bp_the_topic_total_posts() ?>
</ins><span class="cx"> </td>
</span><del>- <?php endif; ?>
</del><ins>+ <td class="td-freshness">
+ <?php bp_the_topic_time_since_last_post() ?>
+ </td>
</ins><span class="cx">
</span><del>- <td class="td-postcount">
- <?php bp_the_topic_total_posts() ?>
- </td>
- <td class="td-freshness">
- <?php bp_the_topic_time_since_last_post() ?>
- </td>
</del><ins>+ <?php do_action( 'bp_directory_forums_extra_cell' ) ?>
+ </tr>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_directory_forums_extra_cell' ) ?>
- </tr>
</del><ins>+ <?php do_action( 'bp_directory_forums_extra_row' ) ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_directory_forums_extra_row' ) ?>
</del><ins>+ <?php endwhile; ?>
</ins><span class="cx">
</span><del>- <?php endwhile; ?>
-
</del><ins>+ </tbody>
</ins><span class="cx"> </table>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_directory_forums_list' ) ?>
</span></span></pre>
</div>
</div>
</body>
</html>