<!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][4454] trunk/bp-themes/bp-default: Add label to activity stream filters; rename those items to fit labels.</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>4454</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-06-04 22:33:40 +0000 (Sat, 04 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add label to activity stream filters; rename those items to fit labels. See #3264</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefaultactivityindexphp">trunk/bp-themes/bp-default/activity/index.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssingleactivityphp">trunk/bp-themes/bp-default/groups/single/activity.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssingleactivityphp">trunk/bp-themes/bp-default/members/single/activity.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 (4453 => 4454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/activity/index.php 2011-06-04 22:30:19 UTC (rev 4453)
+++ trunk/bp-themes/bp-default/activity/index.php 2011-06-04 22:33:40 UTC (rev 4454)
</span><span class="lines">@@ -87,38 +87,39 @@
</span><span class="cx"> <?php do_action( 'bp_activity_syndication_options' ) ?>
</span><span class="cx">
</span><span class="cx"> <li id="activity-filter-select" class="last">
</span><del>- <select>
- <option value="-1"><?php _e( 'No Filter', 'buddypress' ) ?></option>
- <option value="activity_update"><?php _e( 'Show Updates', 'buddypress' ) ?></option>
</del><ins>+ <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label>
+ <select id="activity-filter-by">
+ <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( 'Show Blog Posts', 'buddypress' ) ?></option>
- <option value="new_blog_comment"><?php _e( 'Show Blog Comments', 'buddypress' ) ?></option>
</del><ins>+ <option value="new_blog_post"><?php _e( 'Blog Posts', 'buddypress' ) ?></option>
+ <option value="new_blog_comment"><?php _e( 'Blog Comments', 'buddypress' ) ?></option>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_is_active( 'forums' ) ) : ?>
</span><span class="cx">
</span><del>- <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>
</del><ins>+ <option value="new_forum_topic"><?php _e( 'Forum Topics', 'buddypress' ); ?></option>
+ <option value="new_forum_post"><?php _e( 'Forum Replies', 'buddypress' ); ?></option>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_is_active( 'groups' ) ) : ?>
</span><span class="cx">
</span><del>- <option value="created_group"><?php _e( 'Show New Groups', 'buddypress' ); ?></option>
- <option value="joined_group"><?php _e( 'Show New Group Memberships', 'buddypress' ); ?></option>
</del><ins>+ <option value="created_group"><?php _e( 'New Groups', 'buddypress' ); ?></option>
+ <option value="joined_group"><?php _e( 'Group Memberships', 'buddypress' ); ?></option>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_is_active( 'friends' ) ) : ?>
</span><span class="cx">
</span><del>- <option value="friendship_accepted,friendship_created"><?php _e( 'Show Friendship Connections', 'buddypress' ); ?></option>
</del><ins>+ <option value="friendship_accepted,friendship_created"><?php _e( 'Friendships', 'buddypress' ); ?></option>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <option value="new_member"><?php _e( 'Show New Members', 'buddypress' ); ?></option>
</del><ins>+ <option value="new_member"><?php _e( 'New Members', 'buddypress' ); ?></option>
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_activity_filter_options' ); ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssingleactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/activity.php (4453 => 4454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/activity.php 2011-06-04 22:30:19 UTC (rev 4453)
+++ trunk/bp-themes/bp-default/groups/single/activity.php 2011-06-04 22:33:40 UTC (rev 4454)
</span><span class="lines">@@ -5,16 +5,17 @@
</span><span class="cx"> <?php do_action( 'bp_group_activity_syndication_options' ) ?>
</span><span class="cx">
</span><span class="cx"> <li id="activity-filter-select" class="last">
</span><del>- <select>
- <option value="-1"><?php _e( 'No Filter', 'buddypress' ) ?></option>
- <option value="activity_update"><?php _e( 'Show Updates', 'buddypress' ) ?></option>
</del><ins>+ <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label>
+ <select id="activity-filter-by">
+ <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( 'forums' ) ) : ?>
</span><del>- <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>
</del><ins>+ <option value="new_forum_topic"><?php _e( 'Forum Topics', 'buddypress' ) ?></option>
+ <option value="new_forum_post"><?php _e( 'Forum Replies', 'buddypress' ) ?></option>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <option value="joined_group"><?php _e( 'Show New Group Memberships', 'buddypress' ) ?></option>
</del><ins>+ <option value="joined_group"><?php _e( 'Group Memberships', 'buddypress' ) ?></option>
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_group_activity_filter_options' ) ?>
</span><span class="cx"> </select>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssingleactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/activity.php (4453 => 4454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/activity.php 2011-06-04 22:30:19 UTC (rev 4453)
+++ trunk/bp-themes/bp-default/members/single/activity.php 2011-06-04 22:33:40 UTC (rev 4454)
</span><span class="lines">@@ -15,23 +15,24 @@
</span><span class="cx"> <?php bp_get_options_nav() ?>
</span><span class="cx">
</span><span class="cx"> <li id="activity-filter-select" class="last">
</span><del>- <select>
- <option value="-1"><?php _e( 'No Filter', 'buddypress' ) ?></option>
- <option value="activity_update"><?php _e( 'Show Updates', 'buddypress' ) ?></option>
</del><ins>+ <label for="activity-filter-by"><?php _e( 'Show:', 'buddypress' ); ?></label>
+ <select id="activity-filter-by">
+ <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
</span><span class="cx"> if ( !bp_is_current_action( 'groups' ) ) :
</span><span class="cx"> if ( bp_is_active( 'blogs' ) ) : ?>
</span><span class="cx">
</span><del>- <option value="new_blog_post"><?php _e( 'Show Blog Posts', 'buddypress' ) ?></option>
- <option value="new_blog_comment"><?php _e( 'Show Blog Comments', 'buddypress' ) ?></option>
</del><ins>+ <option value="new_blog_post"><?php _e( 'Blog Posts', 'buddypress' ) ?></option>
+ <option value="new_blog_comment"><?php _e( 'Blog Comments', 'buddypress' ) ?></option>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> endif;
</span><span class="cx">
</span><span class="cx"> if ( bp_is_active( 'friends' ) ) : ?>
</span><span class="cx">
</span><del>- <option value="friendship_accepted,friendship_created"><?php _e( 'Show Friendship Connections', 'buddypress' ) ?></option>
</del><ins>+ <option value="friendship_accepted,friendship_created"><?php _e( 'Friendships', 'buddypress' ) ?></option>
</ins><span class="cx">
</span><span class="cx"> <?php endif;
</span><span class="cx">
</span><span class="lines">@@ -39,15 +40,15 @@
</span><span class="cx">
</span><span class="cx"> if ( bp_is_active( 'forums' ) ) : ?>
</span><span class="cx">
</span><del>- <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>
</del><ins>+ <option value="new_forum_topic"><?php _e( 'Forum Topics', 'buddypress' ) ?></option>
+ <option value="new_forum_post"><?php _e( 'Forum Replies', 'buddypress' ) ?></option>
</ins><span class="cx">
</span><span class="cx"> <?php endif;
</span><span class="cx">
</span><span class="cx"> if ( bp_is_active( 'groups' ) ) : ?>
</span><span class="cx">
</span><del>- <option value="created_group"><?php _e( 'Show New Groups', 'buddypress' ) ?></option>
- <option value="joined_group"><?php _e( 'Show New Group Memberships', 'buddypress' ) ?></option>
</del><ins>+ <option value="created_group"><?php _e( 'New Groups', 'buddypress' ) ?></option>
+ <option value="joined_group"><?php _e( 'Group Memberships', 'buddypress' ) ?></option>
</ins><span class="cx">
</span><span class="cx"> <?php endif;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>