<!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][4994] trunk/bp-themes/bp-default: Normalize index actions in bp-default.</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><a href="http://buddypress.trac.wordpress.org/changeset/4994">4994</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-08-17 20:34:53 +0000 (Wed, 17 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Normalize index actions in bp-default. Fixes regression from 1.2.9. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3484">#3484</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefaultactivityindexphp">trunk/bp-themes/bp-default/activity/index.php</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefaultactivityindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/activity/index.php (4993 => 4994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/activity/index.php 2011-08-16 21:30:55 UTC (rev 4993)
+++ trunk/bp-themes/bp-default/activity/index.php 2011-08-17 20:34:53 UTC (rev 4994)
</span><span class="lines">@@ -9,32 +9,36 @@
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>-<?php get_header( 'buddypress' ) ?>
</del><ins>+<?php get_header( 'buddypress' ); ?>
</ins><span class="cx">
</span><ins>+ <?php do_action( 'bp_before_directory_activity_page' ); ?>
+
</ins><span class="cx"> <div id="content">
</span><span class="cx"> <div class="padder">
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_before_directory_activity' ); ?>
+
</ins><span class="cx"> <?php if ( !is_user_logged_in() ) : ?>
</span><span class="cx">
</span><del>- <h3><?php _e( 'Site Activity', 'buddypress' ) ?></h3>
</del><ins>+ <h3><?php _e( 'Site Activity', 'buddypress' ); ?></h3>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_before_directory_activity_content' ) ?>
</del><ins>+ <?php do_action( 'bp_before_directory_activity_content' ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() ) : ?>
</span><span class="cx">
</span><del>- <?php locate_template( array( 'activity/post-form.php'), true ) ?>
</del><ins>+ <?php locate_template( array( 'activity/post-form.php'), true ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php do_action( 'template_notices' ) ?>
</del><ins>+ <?php do_action( 'template_notices' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div class="item-list-tabs activity-type-tabs" role="navigation">
</span><span class="cx"> <ul>
</span><del>- <?php do_action( 'bp_before_activity_type_tab_all' ) ?>
</del><ins>+ <?php do_action( 'bp_before_activity_type_tab_all' ); ?>
</ins><span class="cx">
</span><del>- <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 <span>%s</span>', 'buddypress' ), bp_get_total_site_member_count() ) ?></a></li>
</del><ins>+ <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 <span>%s</span>', 'buddypress' ), bp_get_total_site_member_count() ); ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() ) : ?>
</span><span class="cx">
</span><span class="lines">@@ -44,7 +48,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_get_total_friend_count( bp_loggedin_user_id() ) ) : ?>
</span><span class="cx">
</span><del>- <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 <span>%s</span>', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ) ?></a></li>
</del><ins>+ <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 <span>%s</span>', 'buddypress' ), bp_get_total_friend_count( bp_loggedin_user_id() ) ); ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="lines">@@ -56,46 +60,46 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) : ?>
</span><span class="cx">
</span><del>- <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 <span>%s</span>', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ) ?></a></li>
</del><ins>+ <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 <span>%s</span>', 'buddypress' ), bp_get_total_group_count_for_user( bp_loggedin_user_id() ) ); ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_before_activity_type_tab_favorites' ) ?>
</del><ins>+ <?php do_action( 'bp_before_activity_type_tab_favorites' ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( bp_get_total_favorite_count_for_user( bp_loggedin_user_id() ) ) : ?>
</span><span class="cx">
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_before_activity_type_tab_mentions' ) ?>
</del><ins>+ <?php do_action( 'bp_before_activity_type_tab_mentions' ); ?>
</ins><span class="cx">
</span><del>- <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 _e( 'Public Mentions', 'buddypress' ); ?><?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?> <strong><?php printf( __( '<span>%s new</span>', 'buddypress' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) ?></strong><?php endif; ?></a></li>
</del><ins>+ <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 _e( 'Public Mentions', 'buddypress' ); ?><?php if ( bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ) : ?> <strong><?php printf( __( '<span>%s new</span>', 'buddypress' ), bp_get_total_mention_count_for_user( bp_loggedin_user_id() ) ); ?></strong><?php endif; ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_activity_type_tabs' ) ?>
</del><ins>+ <?php do_action( 'bp_activity_type_tabs' ); ?>
</ins><span class="cx"> </ul>
</span><span class="cx"> </div><!-- .item-list-tabs -->
</span><span class="cx">
</span><span class="cx"> <div class="item-list-tabs no-ajax" id="subnav" role="navigation">
</span><span class="cx"> <ul>
</span><del>- <li class="feed"><a href="<?php bp_sitewide_activity_feed_link() ?>" title="<?php _e( 'RSS Feed', 'buddypress' ); ?>"><?php _e( 'RSS', 'buddypress' ) ?></a></li>
</del><ins>+ <li class="feed"><a href="<?php bp_sitewide_activity_feed_link() ?>" title="<?php _e( 'RSS Feed', 'buddypress' ); ?>"><?php _e( 'RSS', 'buddypress' ); ?></a></li>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_activity_syndication_options' ) ?>
</del><ins>+ <?php do_action( 'bp_activity_syndication_options' ); ?>
</ins><span class="cx">
</span><span class="cx"> <li id="activity-filter-select" class="last">
</span><span class="cx"> <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label>
</span><span class="cx"> <select id="activity-filter-by">
</span><del>- <option value="-1"><?php _e( 'Everything', 'buddypress' ) ?></option>
- <option value="activity_update"><?php _e( 'Updates', 'buddypress' ) ?></option>
</del><ins>+ <option value="-1"><?php _e( 'Everything', 'buddypress' ); ?></option>
+ <option value="activity_update"><?php _e( 'Updates', 'buddypress' ); ?></option>
</ins><span class="cx">
</span><span class="cx"> <?php if ( bp_is_active( 'blogs' ) ) : ?>
</span><span class="cx">
</span><del>- <option value="new_blog_post"><?php _e( 'Posts', 'buddypress' ) ?></option>
- <option value="new_blog_comment"><?php _e( 'Comments', 'buddypress' ) ?></option>
</del><ins>+ <option value="new_blog_post"><?php _e( 'Posts', 'buddypress' ); ?></option>
+ <option value="new_blog_comment"><?php _e( 'Comments', 'buddypress' ); ?></option>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="lines">@@ -128,21 +132,26 @@
</span><span class="cx"> </ul>
</span><span class="cx"> </div><!-- .item-list-tabs -->
</span><span class="cx">
</span><del>- <?php do_action( 'bp_before_directory_activity_list' ) ?>
</del><ins>+ <?php do_action( 'bp_before_directory_activity_list' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div class="activity" role="main">
</span><span class="cx">
</span><del>- <?php locate_template( array( 'activity/activity-loop.php' ), true ) ?>
</del><ins>+ <?php locate_template( array( 'activity/activity-loop.php' ), true ); ?>
</ins><span class="cx">
</span><span class="cx"> </div><!-- .activity -->
</span><span class="cx">
</span><del>- <?php do_action( 'bp_directory_activity_content' ) ?>
</del><ins>+ <?php do_action( 'bp_after_directory_activity_list' ); ?>
</ins><span class="cx">
</span><del>- <?php do_action( 'bp_after_directory_activity_content' ) ?>
</del><ins>+ <?php do_action( 'bp_directory_activity_content' ); ?>
</ins><span class="cx">
</span><ins>+ <?php do_action( 'bp_after_directory_activity_content' ); ?>
+
+ <?php do_action( 'bp_after_directory_activity' ); ?>
+
</ins><span class="cx"> </div><!-- .padder -->
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx">
</span><del>-<?php get_sidebar( 'buddypress' ) ?>
</del><ins>+ <?php do_action( 'bp_after_directory_activity_page' ); ?>
</ins><span class="cx">
</span><del>-<?php get_footer( 'buddypress' ) ?>
</del><ins>+<?php get_sidebar( 'buddypress' ); ?>
+<?php get_footer( 'buddypress' ); ?>
</ins></span></pre></div>
<a id="trunkbpthemesbpdefaultblogsindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/blogs/index.php (4993 => 4994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/blogs/index.php 2011-08-16 21:30:55 UTC (rev 4993)
+++ trunk/bp-themes/bp-default/blogs/index.php 2011-08-17 20:34:53 UTC (rev 4994)
</span><span class="lines">@@ -11,15 +11,19 @@
</span><span class="cx">
</span><span class="cx"> <?php get_header( 'buddypress' ); ?>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_before_directory_blogs_content' ); ?>
</del><ins>+ <?php do_action( 'bp_before_directory_blogs_page' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div id="content">
</span><span class="cx"> <div class="padder">
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_before_directory_blogs' ); ?>
+
</ins><span class="cx"> <form action="" method="post" id="blogs-directory-form" class="dir-form">
</span><span class="cx">
</span><span class="cx"> <h3><?php _e( 'Site Directory', 'buddypress' ); ?><?php if ( is_user_logged_in() && bp_blog_signup_enabled() ) : ?> &nbsp;<a class="button" href="<?php echo bp_get_root_domain() . '/' . bp_get_blogs_slug() . '/create/' ?>"><?php _e( 'Create a Site', 'buddypress' ); ?></a><?php endif; ?></h3>
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_before_directory_blogs_content' ); ?>
+
</ins><span class="cx"> <div id="blog-dir-search" class="dir-search" role="search">
</span><span class="cx">
</span><span class="cx"> <?php bp_directory_blogs_search_form(); ?>
</span><span class="lines">@@ -70,13 +74,17 @@
</span><span class="cx"> <?php do_action( 'bp_directory_blogs_content' ); ?>
</span><span class="cx">
</span><span class="cx"> <?php wp_nonce_field( 'directory_blogs', '_wpnonce-blogs-filter' ); ?>
</span><ins>+
+ <?php do_action( 'bp_after_directory_blogs_content' ); ?>
</ins><span class="cx">
</span><span class="cx"> </form><!-- #blogs-directory-form -->
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_after_directory_blogs' ); ?>
+
</ins><span class="cx"> </div><!-- .padder -->
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx">
</span><del>- <?php do_action( 'bp_after_directory_blogs_content' ); ?>
</del><ins>+ <?php do_action( 'bp_after_directory_blogs_page' ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php get_sidebar( 'buddypress' ); ?>
</span><span class="cx"> <?php get_footer( 'buddypress' ); ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultforumsindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/forums/index.php (4993 => 4994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/forums/index.php 2011-08-16 21:30:55 UTC (rev 4993)
+++ trunk/bp-themes/bp-default/forums/index.php 2011-08-17 20:34:53 UTC (rev 4994)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx">
</span><span class="cx"> <?php get_header( 'buddypress' ); ?>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_before_directory_forums_content' ); ?>
</del><ins>+ <?php do_action( 'bp_before_directory_forums_page' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div id="content">
</span><span class="cx"> <div class="padder">
</span><span class="lines">@@ -22,6 +22,8 @@
</span><span class="cx">
</span><span class="cx"> <h3><?php _e( 'Forums Directory', 'buddypress' ); ?><?php if ( is_user_logged_in() ) : ?> &nbsp;<a class="button show-hide-new" href="#new-topic" id="new-topic-button"><?php _e( 'New Topic', 'buddypress' ); ?></a><?php endif; ?></h3>
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_before_directory_forums_content' ); ?>
+
</ins><span class="cx"> <div id="forums-dir-search" class="dir-search" role="search">
</span><span class="cx">
</span><span class="cx"> <?php bp_directory_forums_search_form(); ?>
</span><span class="lines">@@ -148,10 +150,15 @@
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div><!-- #new-topic-post -->
</span><ins>+
+ <?php do_action( 'bp_after_new_topic_form' ); ?>
+
+ <?php do_action( 'bp_after_directory_forums_content' ); ?>
+
</ins><span class="cx"> </div><!-- .padder -->
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx">
</span><del>- <?php do_action( 'bp_after_directory_forums_content' ); ?>
</del><ins>+ <?php do_action( 'bp_after_directory_forums_page' ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php get_sidebar( 'buddypress' ); ?>
</span><span class="cx"> <?php get_footer( 'buddypress' ); ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupsindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/index.php (4993 => 4994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/index.php 2011-08-16 21:30:55 UTC (rev 4993)
+++ trunk/bp-themes/bp-default/groups/index.php 2011-08-17 20:34:53 UTC (rev 4994)
</span><span class="lines">@@ -11,15 +11,19 @@
</span><span class="cx">
</span><span class="cx"> <?php get_header( 'buddypress' ); ?>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_before_directory_groups_content' ); ?>
</del><ins>+ <?php do_action( 'bp_before_directory_groups_page' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div id="content">
</span><span class="cx"> <div class="padder">
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_before_directory_groups' ); ?>
+
</ins><span class="cx"> <form action="" method="post" id="groups-directory-form" class="dir-form">
</span><span class="cx">
</span><span class="cx"> <h3><?php _e( 'Groups Directory', 'buddypress' ); ?><?php if ( is_user_logged_in() && bp_user_can_create_groups() ) : ?> &nbsp;<a class="button" href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/create' ); ?>"><?php _e( 'Create a Group', 'buddypress' ); ?></a><?php endif; ?></h3>
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_before_directory_groups_content' ); ?>
+
</ins><span class="cx"> <div id="group-dir-search" class="dir-search" role="search">
</span><span class="cx">
</span><span class="cx"> <?php bp_directory_groups_search_form() ?>
</span><span class="lines">@@ -74,12 +78,16 @@
</span><span class="cx">
</span><span class="cx"> <?php wp_nonce_field( 'directory_groups', '_wpnonce-groups-filter' ); ?>
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_after_directory_groups_content' ); ?>
+
</ins><span class="cx"> </form><!-- #groups-directory-form -->
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_after_directory_groups' ); ?>
+
</ins><span class="cx"> </div><!-- .padder -->
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx">
</span><del>- <?php do_action( 'bp_after_directory_groups_content' ); ?>
</del><ins>+ <?php do_action( 'bp_after_directory_groups_page' ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php get_sidebar( 'buddypress' ); ?>
</span><span class="cx"> <?php get_footer( 'buddypress' ); ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmembersindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/index.php (4993 => 4994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/index.php 2011-08-16 21:30:55 UTC (rev 4993)
+++ trunk/bp-themes/bp-default/members/index.php 2011-08-17 20:34:53 UTC (rev 4994)
</span><span class="lines">@@ -11,15 +11,19 @@
</span><span class="cx">
</span><span class="cx"> <?php get_header( 'buddypress' ); ?>
</span><span class="cx">
</span><del>- <?php do_action( 'bp_before_directory_members_content' ); ?>
</del><ins>+ <?php do_action( 'bp_before_directory_members_page' ); ?>
</ins><span class="cx">
</span><span class="cx"> <div id="content">
</span><span class="cx"> <div class="padder">
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_before_directory_members' ); ?>
+
</ins><span class="cx"> <form action="" method="post" id="members-directory-form" class="dir-form">
</span><span class="cx">
</span><span class="cx"> <h3><?php _e( 'Members Directory', 'buddypress' ); ?></h3>
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_before_directory_members_content' ); ?>
+
</ins><span class="cx"> <div id="members-dir-search" class="dir-search" role="search">
</span><span class="cx">
</span><span class="cx"> <?php bp_directory_members_search_form(); ?>
</span><span class="lines">@@ -76,12 +80,16 @@
</span><span class="cx">
</span><span class="cx"> <?php wp_nonce_field( 'directory_members', '_wpnonce-member-filter' ); ?>
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_after_directory_members_content' ); ?>
+
</ins><span class="cx"> </form><!-- #members-directory-form -->
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_after_directory_members' ); ?>
+
</ins><span class="cx"> </div><!-- .padder -->
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx">
</span><del>- <?php do_action( 'bp_after_directory_members_content' ); ?>
</del><ins>+ <?php do_action( 'bp_after_directory_members_page' ); ?>
</ins><span class="cx">
</span><span class="cx"> <?php get_sidebar( 'buddypress' ); ?>
</span><span class="cx"> <?php get_footer( 'buddypress' ); ?>
</span></span></pre>
</div>
</div>
</body>
</html>