<!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" />
<title>[BuddyPress][3799] trunk/bp-themes/bp-default: No reason to duplicate efforts.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>3799</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-21 13:33:38 +0000 (Fri, 21 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>No reason to duplicate efforts. Use template pages as wrappers for their component indexes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefaultpageactivityphp">trunk/bp-themes/bp-default/page-activity.php</a></li>
<li><a href="#trunkbpthemesbpdefaultpageblogsphp">trunk/bp-themes/bp-default/page-blogs.php</a></li>
<li><a href="#trunkbpthemesbpdefaultpageforumsphp">trunk/bp-themes/bp-default/page-forums.php</a></li>
<li><a href="#trunkbpthemesbpdefaultpagegroupsphp">trunk/bp-themes/bp-default/page-groups.php</a></li>
<li><a href="#trunkbpthemesbpdefaultpagemembersphp">trunk/bp-themes/bp-default/page-members.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefaultpageactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/page-activity.php (3798 => 3799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/page-activity.php 2011-01-21 13:30:23 UTC (rev 3798)
+++ trunk/bp-themes/bp-default/page-activity.php 2011-01-21 13:33:38 UTC (rev 3799)
</span><span class="lines">@@ -7,141 +7,6 @@
</span><span class="cx"> * @subpackage Theme
</span><span class="cx"> */
</span><span class="cx">
</span><del>-?>
</del><ins>+locate_template( array( 'activity/index.php' ), true );
</ins><span class="cx">
</span><del>-<?php get_header() ?>
-
- <div id="content">
- <div class="padder">
-
- <?php if ( !is_user_logged_in() ) : ?>
-
- <h3><?php _e( 'Site Activity', 'buddypress' ) ?></h3>
-
- <?php endif; ?>
-
- <?php do_action( 'bp_before_directory_activity_content' ) ?>
-
- <?php if ( is_user_logged_in() ) : ?>
-
- <?php locate_template( array( 'activity/post-form.php'), true ) ?>
-
- <?php endif; ?>
-
- <?php do_action( 'template_notices' ) ?>
-
- <div class="item-list-tabs activity-type-tabs" role="navigation">
- <ul>
- <?php do_action( 'bp_before_activity_type_tab_all' ) ?>
-
- <li class="selected" id="activity-all"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' ?>" title="<?php _e( 'The public activity for everyone on this site.', 'buddypress' ) ?>"><?php printf( __( 'All Members (%s)', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>
-
- <?php if ( is_user_logged_in() ) : ?>
-
- <?php do_action( 'bp_before_activity_type_tab_friends' ) ?>
-
- <?php if ( bp_is_active( 'friends' ) ) : ?>
-
- <?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
-
- <li id="activity-friends"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/' ?>" title="<?php _e( 'The activity of my friends only.', 'buddypress' ) ?>"><?php printf( __( 'My Friends (%s)', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
-
- <?php endif; ?>
-
- <?php endif; ?>
-
- <?php do_action( 'bp_before_activity_type_tab_groups' ) ?>
-
- <?php if ( bp_is_active( 'groups' ) ) : ?>
-
- <?php if ( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
-
- <li id="activity-groups"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/' ?>" title="<?php _e( 'The activity of groups I am a member of.', 'buddypress' ) ?>"><?php printf( __( 'My Groups (%s)', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
-
- <?php endif; ?>
-
- <?php endif; ?>
-
- <?php do_action( 'bp_before_activity_type_tab_favorites' ) ?>
-
- <?php if ( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) : ?>
-
- <li id="activity-favorites"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/favorites/' ?>" title="<?php _e( "The activity I've marked as a favorite.", 'buddypress' ) ?>"><?php printf( __( 'My Favorites (<span>%s</span>)', 'buddypress' ), bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
-
- <?php endif; ?>
-
- <?php do_action( 'bp_before_activity_type_tab_mentions' ) ?>
-
- <li id="activity-mentions"><a href="<?php echo bp_loggedin_user_domain() . bp_get_activity_slug() . '/mentions/' ?>" title="<?php _e( 'Activity that I have been mentioned in.', 'buddypress' ) ?>"><?php printf( __( '@%s Mentions', 'buddypress' ), bp_get_loggedin_user_username() ) ?><?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?> <strong><?php printf( __( '(%s new)', 'buddypress' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) ?></strong><?php endif; ?></a></li>
-
- <?php endif; ?>
-
- <?php do_action( 'bp_activity_type_tabs' ) ?>
- </ul>
- </div><!-- .item-list-tabs -->
-
- <div class="item-list-tabs no-ajax" id="subnav" role="navigation">
- <ul>
- <li class="feed"><a href="<?php bp_sitewide_activity_feed_link() ?>" title="<?php _e( 'RSS Feed', 'buddypress' ); ?>"><?php _e( 'RSS', 'buddypress' ) ?></a></li>
-
- <?php do_action( 'bp_activity_syndication_options' ) ?>
-
- <li id="activity-filter-select" class="last">
- <select>
- <option value="-1"><?php _e( 'No Filter', 'buddypress' ) ?></option>
- <option value="activity_update"><?php _e( 'Show Updates', 'buddypress' ) ?></option>
-
- <?php if ( bp_is_active( 'blogs' ) ) : ?>
-
- <option value="new_blog_post"><?php _e( 'Show Blog Posts', 'buddypress' ) ?></option>
- <option value="new_blog_comment"><?php _e( 'Show Blog Comments', 'buddypress' ) ?></option>
-
- <?php endif; ?>
-
- <?php if ( bp_is_active( 'forums' ) ) : ?>
-
- <option value="new_forum_topic"><?php _e( 'Show New Forum Topics', 'buddypress' ); ?></option>
- <option value="new_forum_post"><?php _e( 'Show Forum Replies', 'buddypress' ); ?></option>
-
- <?php endif; ?>
-
- <?php if ( bp_is_active( 'groups' ) ) : ?>
-
- <option value="created_group"><?php _e( 'Show New Groups', 'buddypress' ); ?></option>
- <option value="joined_group"><?php _e( 'Show New Group Memberships', 'buddypress' ); ?></option>
-
- <?php endif; ?>
-
- <?php if ( bp_is_active( 'friends' ) ) : ?>
-
- <option value="friendship_accepted,friendship_created"><?php _e( 'Show Friendship Connections', 'buddypress' ); ?></option>
-
- <?php endif; ?>
-
- <option value="new_member"><?php _e( 'Show New Members', 'buddypress' ); ?></option>
-
- <?php do_action( 'bp_activity_filter_options' ); ?>
-
- </select>
- </li>
- </ul>
- </div><!-- .item-list-tabs -->
-
- <?php do_action( 'bp_before_directory_activity_list' ) ?>
-
- <div class="activity" role="main">
-
- <?php locate_template( array( 'activity/activity-loop.php' ), true ) ?>
-
- </div><!-- .activity -->
-
- <?php do_action( 'bp_directory_activity_content' ) ?>
-
- <?php do_action( 'bp_after_directory_activity_content' ) ?>
-
- </div><!-- .padder -->
- </div><!-- #content -->
-
-<?php get_sidebar() ?>
-
-<?php get_footer() ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultpageblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/page-blogs.php (3798 => 3799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/page-blogs.php 2011-01-21 13:30:23 UTC (rev 3798)
+++ trunk/bp-themes/bp-default/page-blogs.php 2011-01-21 13:33:38 UTC (rev 3799)
</span><span class="lines">@@ -7,72 +7,6 @@
</span><span class="cx"> * @subpackage bp-default
</span><span class="cx"> */
</span><span class="cx">
</span><del>-?>
</del><ins>+locate_template( array( 'blogs/index.php' ), true );
</ins><span class="cx">
</span><del>-<?php get_header() ?>
-
- <div id="content">
- <div class="padder">
-
- <form action="" method="post" id="blogs-directory-form" class="dir-form">
-
- <h3><?php _e( 'Blogs Directory', 'buddypress' ) ?><?php if ( is_user_logged_in() && bp_blog_signup_enabled() ) : ?> &nbsp;<a class="button" href="<?php echo bp_get_root_domain() . '/' . BP_BLOGS_SLUG . '/create/' ?>"><?php _e( 'Create a Blog', 'buddypress' ) ?></a><?php endif; ?></h3>
-
- <?php do_action( 'bp_before_directory_blogs_content' ) ?>
-
- <div id="blog-dir-search" class="dir-search" role="search">
-
- <?php bp_directory_blogs_search_form() ?>
-
- </div><!-- #blog-dir-search -->
-
- <div class="item-list-tabs" role="navigation">
- <ul>
- <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>
-
- <?php if ( is_user_logged_in() && bp_get_total_blog_count_for_user( bp_loggedin_user_id() ) ) : ?>
-
- <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>
-
- <?php endif; ?>
-
- <?php do_action( 'bp_blogs_directory_blog_types' ) ?>
-
- <li id="blogs-order-select" class="last filter">
-
- <?php _e( 'Order By:', 'buddypress' ) ?>
-
- <select>
- <option value="active"><?php _e( 'Last Active', 'buddypress' ) ?></option>
- <option value="newest"><?php _e( 'Newest', 'buddypress' ) ?></option>
- <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ) ?></option>
-
- <?php do_action( 'bp_blogs_directory_order_options' ) ?>
-
- </select>
- </li>
- </ul>
- </div><!-- .item-list-tabs -->
-
- <?php do_action( 'bp_before_directory_blogs_list' ) ?>
-
- <div id="blogs-dir-list" class="blogs dir-list">
-
- <?php locate_template( array( 'blogs/blogs-loop.php' ), true ) ?>
-
- </div><!-- #blogs-dir-list -->
-
- <?php do_action( 'bp_directory_blogs_content' ) ?>
-
- <?php wp_nonce_field( 'directory_blogs', '_wpnonce-blogs-filter' ) ?>
-
- <?php do_action( 'bp_after_directory_blogs_content' ) ?>
-
- </form><!-- #blogs-directory-form -->
-
- </div><!-- .padder -->
- </div><!-- #content -->
-
-<?php get_sidebar() ?>
-
-<?php get_footer() ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre></div>
<a id="trunkbpthemesbpdefaultpageforumsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/page-forums.php (3798 => 3799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/page-forums.php 2011-01-21 13:30:23 UTC (rev 3798)
+++ trunk/bp-themes/bp-default/page-forums.php 2011-01-21 13:33:38 UTC (rev 3799)
</span><span class="lines">@@ -7,139 +7,6 @@
</span><span class="cx"> * @subpackage Theme
</span><span class="cx"> */
</span><span class="cx">
</span><del>-?>
</del><ins>+locate_template( array( 'forums/index.php' ), true );
</ins><span class="cx">
</span><del>-<?php get_header() ?>
-
- <div id="content">
- <div class="padder">
-
- <?php do_action( 'bp_before_directory_forums' ) ?>
-
- <form action="" method="post" id="forums-search-form" class="dir-form">
-
- <h3><?php _e( 'Group Forums Directory', 'buddypress' ) ?><?php if ( is_user_logged_in() ) : ?> &nbsp;<a class="button" href="#new-topic" id="new-topic-button"><?php _e( 'New Topic', 'buddypress' ) ?></a><?php endif; ?></h3>
-
- <?php do_action( 'bp_before_directory_forums_content' ) ?>
-
- <div id="forums-dir-search" class="dir-search" role="search">
-
- <?php bp_directory_forums_search_form() ?>
-
- </div>
- </form>
-
- <div id="new-topic-post">
-
- <?php if ( is_user_logged_in() ) : ?>
-
- <?php if ( bp_has_groups( 'user_id=' . bp_loggedin_user_id() . '&type=alphabetical&max=100&per_page=100' ) ) : ?>
-
- <form action="" method="post" id="forum-topic-form" class="standard-form">
-
- <?php do_action( 'groups_forum_new_topic_before' ) ?>
-
- <a name="post-new"></a>
- <h5><?php _e( 'Post a New Topic:', 'buddypress' ) ?></h5>
-
- <label><?php _e( 'Title:', 'buddypress' ) ?></label>
- <input type="text" name="topic_title" id="topic_title" value="" />
-
- <label><?php _e( 'Content:', 'buddypress' ) ?></label>
- <textarea name="topic_text" id="topic_text"></textarea>
-
- <label><?php _e( 'Tags (comma separated):', 'buddypress' ) ?></label>
- <input type="text" name="topic_tags" id="topic_tags" value="" />
-
- <label><?php _e( 'Post In Group Forum:', 'buddypress' ) ?></label>
- <select id="topic_group_id" name="topic_group_id">
-
- <option value="">----</option>
-
- <?php while ( bp_groups() ) : bp_the_group(); ?>
-
- <?php if ( bp_group_is_forum_enabled() && 'public' == bp_get_group_status() ) : ?>
-
- <option value="<?php bp_group_id() ?>"><?php bp_group_name() ?></option>
-
- <?php endif; ?>
-
- <?php endwhile; ?>
-
- </select><!-- #topic_group_id -->
-
- <?php do_action( 'groups_forum_new_topic_after' ) ?>
-
- <div class="submit">
- <input type="submit" name="submit_topic" id="submit" value="<?php _e( 'Post Topic', 'buddypress' ) ?>" />
- <input type="button" name="submit_topic_cancel" id="submit_topic_cancel" value="<?php _e( 'Cancel', 'buddypress' ) ?>" />
- </div>
-
- <?php wp_nonce_field( 'bp_forums_new_topic' ) ?>
-
- </form><!-- #forum-topic-form -->
-
- <?php else : ?>
-
- <div id="message" class="info">
- <p><?php printf( __( "You are not a member of any groups so you don't have any group forums you can post in. To start posting, first find a group that matches the topic subject you'd like to start. If this group does not exist, why not <a href='%s'>create a new group</a>? Once you have joined or created the group you can post your topic in that group's forum.", 'buddypress' ), site_url( BP_GROUPS_SLUG . '/create/' ) ) ?></p>
- </div>
-
- <?php endif; ?>
-
- <?php endif; ?>
- </div><!-- #new-topic-post -->
-
- <form action="" method="post" id="forums-directory-form" class="dir-form">
-
- <div class="item-list-tabs" role="navigation">
- <ul>
- <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>
-
- <?php if ( is_user_logged_in() && bp_get_forum_topic_count_for_user( bp_loggedin_user_id() ) ) : ?>
-
- <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>
-
- <?php endif; ?>
-
- <?php do_action( 'bp_forums_directory_group_types' ) ?>
-
- <li id="forums-order-select" class="last filter">
-
- <?php _e( 'Order By:', 'buddypress' ) ?>
-
- <select>
- <option value="active"><?php _e( 'Last Active', 'buddypress' ) ?></option>
- <option value="popular"><?php _e( 'Most Posts', 'buddypress' ) ?></option>
- <option value="unreplied"><?php _e( 'Unreplied', 'buddypress' ) ?></option>
-
- <?php do_action( 'bp_forums_directory_order_options' ) ?>
-
- </select>
- </li>
- </ul>
- </div>
-
- <?php do_action( 'bp_before_directory_forums_list' ) ?>
-
- <div id="forums-dir-list" class="forums dir-list" role="main">
-
- <?php locate_template( array( 'forums/forums-loop.php' ), true ) ?>
-
- </div>
-
- <?php do_action( 'bp_directory_forums_content' ) ?>
-
- <?php wp_nonce_field( 'directory_forums', '_wpnonce-forums-filter' ) ?>
-
- <?php do_action( 'bp_after_directory_forums_content' ) ?>
-
- </form>
-
- <?php do_action( 'bp_after_directory_forums' ) ?>
-
- </div><!-- .padder -->
- </div><!-- #content -->
-
-<?php get_sidebar() ?>
-<?php get_footer() ?>
</del><ins>+?>
</ins></span></pre></div>
<a id="trunkbpthemesbpdefaultpagegroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/page-groups.php (3798 => 3799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/page-groups.php 2011-01-21 13:30:23 UTC (rev 3798)
+++ trunk/bp-themes/bp-default/page-groups.php 2011-01-21 13:33:38 UTC (rev 3799)
</span><span class="lines">@@ -7,68 +7,6 @@
</span><span class="cx"> * @subpackage bp-default
</span><span class="cx"> */
</span><span class="cx">
</span><del>-?>
</del><ins>+locate_template( array( 'groups/index.php' ), true );
</ins><span class="cx">
</span><del>-<?php get_header() ?>
-
- <div id="content">
- <div class="padder">
-
- <form action="" method="post" id="groups-directory-form" class="dir-form">
- <h3><?php _e( 'Groups Directory', 'buddypress' ) ?><?php if ( is_user_logged_in() ) : ?> &nbsp;<a class="button" href="<?php echo bp_get_root_domain() . '/' . bp_get_root_slug() . '/create/' ?>"><?php _e( 'Create a Group', 'buddypress' ) ?></a><?php endif; ?></h3>
-
- <?php do_action( 'bp_before_directory_groups_content' ) ?>
-
- <div id="group-dir-search" class="dir-search" role="search">
-
- <?php bp_directory_groups_search_form() ?>
-
- </div><!-- #group-dir-search -->
-
- <div class="item-list-tabs" role="navigation">
- <ul>
- <li class="selected" id="groups-all"><a href="<?php echo bp_get_root_domain() . '/' . BP_GROUPS_SLUG ?>"><?php printf( __( 'All Groups (%s)', 'buddypress' ), bp_get_total_group_count() ) ?></a></li>
-
- <?php if ( is_user_logged_in() && bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
-
- <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>
-
- <?php endif; ?>
-
- <?php do_action( 'bp_groups_directory_group_types' ) ?>
-
- <li id="groups-order-select" class="last filter">
-
- <?php _e( 'Order By:', 'buddypress' ) ?>
- <select>
- <option value="active"><?php _e( 'Last Active', 'buddypress' ) ?></option>
- <option value="popular"><?php _e( 'Most Members', 'buddypress' ) ?></option>
- <option value="newest"><?php _e( 'Newly Created', 'buddypress' ) ?></option>
- <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ) ?></option>
-
- <?php do_action( 'bp_groups_directory_order_options' ) ?>
- </select>
- </li>
- </ul>
- </div><!-- .item-list-tabs -->
-
- <div id="groups-dir-list" class="groups dir-list">
-
- <?php locate_template( array( 'groups/groups-loop.php' ), true ) ?>
-
- </div><!-- #groups-dir-list -->
-
- <?php do_action( 'bp_directory_groups_content' ) ?>
-
- <?php wp_nonce_field( 'directory_groups', '_wpnonce-groups-filter' ) ?>
-
- </form><!-- #groups-directory-form -->
-
- <?php do_action( 'bp_after_directory_groups_content' ) ?>
-
- </div><!-- .padder -->
- </div><!-- #content -->
-
-<?php get_sidebar() ?>
-
-<?php get_footer() ?>
</del><ins>+?>
</ins></span></pre></div>
<a id="trunkbpthemesbpdefaultpagemembersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/page-members.php (3798 => 3799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/page-members.php 2011-01-21 13:30:23 UTC (rev 3798)
+++ trunk/bp-themes/bp-default/page-members.php 2011-01-21 13:33:38 UTC (rev 3799)
</span><span class="lines">@@ -7,74 +7,6 @@
</span><span class="cx"> * @subpackage bp-default
</span><span class="cx"> */
</span><span class="cx">
</span><del>-?>
</del><ins>+locate_template( array( 'members/index.php' ), true );
</ins><span class="cx">
</span><del>-<?php get_header() ?>
-
- <div id="content">
- <div class="padder">
-
- <form action="" method="post" id="members-directory-form" class="dir-form">
-
- <h3><?php _e( 'Members Directory', 'buddypress' ) ?></h3>
-
- <?php do_action( 'bp_before_directory_members_content' ) ?>
-
- <div id="members-dir-search" class="dir-search" role="search">
-
- <?php bp_directory_members_search_form() ?>
-
- </div><!-- #members-dir-search -->
-
- <div class="item-list-tabs" role="navigation">
- <ul>
- <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>
-
- <?php if ( is_user_logged_in() && bp_is_active( 'friends' ) && bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
-
- <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>
-
- <?php endif; ?>
-
- <?php do_action( 'bp_members_directory_member_types' ) ?>
-
- <li id="members-order-select" class="last filter">
-
- <?php _e( 'Order By:', 'buddypress' ) ?>
- <select>
- <option value="active"><?php _e( 'Last Active', 'buddypress' ) ?></option>
- <option value="newest"><?php _e( 'Newest Registered', 'buddypress' ) ?></option>
-
- <?php if ( bp_is_active( 'profile' ) ) : ?>
-
- <option value="alphabetical"><?php _e( 'Alphabetical', 'buddypress' ) ?></option>
-
- <?php endif; ?>
-
- <?php do_action( 'bp_members_directory_order_options' ) ?>
-
- </select>
- </li>
- </ul>
- </div><!-- .item-list-tabs -->
-
- <div id="members-dir-list" class="members dir-list">
-
- <?php locate_template( array( 'members/members-loop.php' ), true ) ?>
-
- </div><!-- #members-dir-list -->
-
- <?php do_action( 'bp_directory_members_content' ) ?>
-
- <?php wp_nonce_field( 'directory_members', '_wpnonce-member-filter' ) ?>
-
- <?php do_action( 'bp_after_directory_members_content' ) ?>
-
- </form><!-- #members-directory-form -->
-
- </div><!-- .padder -->
- </div><!-- #content -->
-
- <?php get_sidebar() ?>
-
-<?php get_footer() ?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre>
</div>
</div>
</body>
</html>