<!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] [2184] trunk: Added styles for "updated" messages.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2184</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-12-15 15:03:18 +0000 (Tue, 15 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added styles for "updated" messages. Fixed navigation tab highlighting when viewing a group and member.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssingleadminphp">trunk/bp-themes/bp-default/groups/single/admin.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssingleforumphp">trunk/bp-themes/bp-default/groups/single/forum.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssinglerequestmembershipphp">trunk/bp-themes/bp-default/groups/single/request-membership.php</a></li>
<li><a href="#trunkbpthemesbpdefaultheaderphp">trunk/bp-themes/bp-default/header.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglehomephp">trunk/bp-themes/bp-default/members/single/home.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglememberheaderphp">trunk/bp-themes/bp-default/members/single/member-header.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssinglemessagescomposephp">trunk/bp-themes/bp-default/members/single/messages/compose.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmemberssingleprofilechangeavatarphp">trunk/bp-themes/bp-default/members/single/profile/change-avatar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (2183 => 2184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2009-12-15 15:01:41 UTC (rev 2183)
+++ trunk/bp-core/bp-core-templatetags.php 2009-12-15 15:03:18 UTC (rev 2184)
</span><span class="lines">@@ -1376,6 +1376,15 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_is_member() {
+ global $bp;
+
+ if ( $bp->displayed_user->id )
+ return true;
+
+ return false;
+}
+
</ins><span class="cx"> function bp_is_user_activity() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="lines">@@ -1448,6 +1457,15 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_is_group() {
+ global $bp;
+
+ if ( BP_GROUPS_SLUG == $bp->current_component && $bp->groups->current_group )
+ return true;
+
+ return false;
+}
+
</ins><span class="cx"> function bp_is_group_home() {
</span><span class="cx"> global $bp;
</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 (2183 => 2184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2009-12-15 15:01:41 UTC (rev 2183)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2009-12-15 15:03:18 UTC (rev 2184)
</span><span class="lines">@@ -585,6 +585,12 @@
</span><span class="cx"> border-color: #a71a1a;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ div#message.updated p {
+ background: #dffcd9;
+ color: #1a9b00;
+ border-color: #c4e9bd;
+ }
+
</ins><span class="cx"> form.standard-form#signup_form div div.error {
</span><span class="cx"> color: white;
</span><span class="cx"> background: red;
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssingleadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/admin.php (2183 => 2184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/admin.php 2009-12-15 15:01:41 UTC (rev 2183)
+++ trunk/bp-themes/bp-default/groups/single/admin.php 2009-12-15 15:03:18 UTC (rev 2184)
</span><span class="lines">@@ -8,8 +8,6 @@
</span><span class="cx">
</span><span class="cx"> <form action="<?php bp_group_admin_form_action() ?>" name="group-settings-form" id="group-settings-form" class="standard-form" method="post" enctype="multipart/form-data">
</span><span class="cx">
</span><del>-<?php do_action( 'template_notices' ) ?>
-
</del><span class="cx"> <?php /* Edit Group Details */ ?>
</span><span class="cx"> <?php if ( bp_is_group_admin_screen( 'edit-details' ) ) : ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssingleforumphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/forum.php (2183 => 2184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/forum.php 2009-12-15 15:01:41 UTC (rev 2183)
+++ trunk/bp-themes/bp-default/groups/single/forum.php 2009-12-15 15:03:18 UTC (rev 2184)
</span><span class="lines">@@ -1,5 +1,3 @@
</span><del>-<?php do_action( 'template_notices' ) ?>
-
</del><span class="cx"> <?php if ( bp_is_group_forum_topic() ) : ?>
</span><span class="cx">
</span><span class="cx"> <?php locate_template( array( 'groups/single/forum/topic.php' ), true ) ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssinglerequestmembershipphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/request-membership.php (2183 => 2184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/request-membership.php 2009-12-15 15:01:41 UTC (rev 2183)
+++ trunk/bp-themes/bp-default/groups/single/request-membership.php 2009-12-15 15:03:18 UTC (rev 2184)
</span><span class="lines">@@ -1,7 +1,5 @@
</span><span class="cx"> <?php do_action( 'bp_before_group_request_membership_content' ) ?>
</span><span class="cx">
</span><del>-<?php do_action( 'template_notices' ) // (error/success feedback) ?>
-
</del><span class="cx"> <?php if ( !bp_group_has_requested_membership() ) : ?>
</span><span class="cx"> <p><?php printf( __( "You are requesting to become a member of the group '%s'.", "buddypress" ), bp_group_name( false, false ) ); ?></p>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/header.php (2183 => 2184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/header.php 2009-12-15 15:01:41 UTC (rev 2183)
+++ trunk/bp-themes/bp-default/header.php 2009-12-15 15:03:18 UTC (rev 2184)
</span><span class="lines">@@ -38,10 +38,10 @@
</span><span class="cx"> <ul id="nav">
</span><span class="cx"> <li<?php if ( bp_is_page( 'home' ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a></li>
</span><span class="cx"> <li<?php if ( bp_is_page( BP_HOME_BLOG_SLUG ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_HOME_BLOG_SLUG ?>" title="<?php _e( 'Blog', 'buddypress' ) ?>"><?php _e( 'Blog', 'buddypress' ) ?></a></li>
</span><del>- <li<?php if ( bp_is_page( BP_MEMBERS_SLUG ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_MEMBERS_SLUG ?>" title="<?php _e( 'Members', 'buddypress' ) ?>"><?php _e( 'Members', 'buddypress' ) ?></a></li>
</del><ins>+ <li<?php if ( bp_is_page( BP_MEMBERS_SLUG ) || bp_is_member() ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_MEMBERS_SLUG ?>" title="<?php _e( 'Members', 'buddypress' ) ?>"><?php _e( 'Members', 'buddypress' ) ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php if ( function_exists( 'groups_install' ) ) : ?>
</span><del>- <li<?php if ( bp_is_page( BP_GROUPS_SLUG ) ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_GROUPS_SLUG ?>" title="<?php _e( 'Groups', 'buddypress' ) ?>"><?php _e( 'Groups', 'buddypress' ) ?></a></li>
</del><ins>+ <li<?php if ( bp_is_page( BP_GROUPS_SLUG ) || bp_is_group() ) : ?> class="selected"<?php endif; ?>><a href="<?php echo get_option('home') ?>/<?php echo BP_GROUPS_SLUG ?>" title="<?php _e( 'Groups', 'buddypress' ) ?>"><?php _e( 'Groups', 'buddypress' ) ?></a></li>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( function_exists( 'groups_install' ) && ( function_exists( 'bp_forums_setup' ) && !(int) get_site_option( 'bp-disable-forum-directory' ) ) ) : ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglehomephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/home.php (2183 => 2184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/home.php 2009-12-15 15:01:41 UTC (rev 2183)
+++ trunk/bp-themes/bp-default/members/single/home.php 2009-12-15 15:03:18 UTC (rev 2184)
</span><span class="lines">@@ -10,7 +10,6 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="item-body">
</span><del>-
</del><span class="cx"> <?php if ( 'home' == bp_current_component() || 'activity' == bp_current_component() || !bp_current_component() ) : ?>
</span><span class="cx"> <?php locate_template( array( 'members/single/activity.php' ), true ) ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglememberheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/member-header.php (2183 => 2184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/member-header.php 2009-12-15 15:01:41 UTC (rev 2183)
+++ trunk/bp-themes/bp-default/members/single/member-header.php 2009-12-15 15:03:18 UTC (rev 2184)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span><ins>+<?php do_action( 'template_notices' ) ?>
+
</ins><span class="cx"> <div class="item-list-tabs no-ajax" id="user-nav">
</span><span class="cx"> <ul>
</span><span class="cx"> <?php bp_get_user_nav() ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssinglemessagescomposephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/messages/compose.php (2183 => 2184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/messages/compose.php 2009-12-15 15:01:41 UTC (rev 2183)
+++ trunk/bp-themes/bp-default/members/single/messages/compose.php 2009-12-15 15:03:18 UTC (rev 2184)
</span><span class="lines">@@ -1,5 +1,3 @@
</span><del>-<?php do_action( 'template_notices' ) ?>
-
</del><span class="cx"> <form action="<?php bp_messages_form_action('compose') ?>" method="post" id="send_message_form" class="standard-form">
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_messages_compose_content' ) ?>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmemberssingleprofilechangeavatarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/single/profile/change-avatar.php (2183 => 2184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/single/profile/change-avatar.php 2009-12-15 15:01:41 UTC (rev 2183)
+++ trunk/bp-themes/bp-default/members/single/profile/change-avatar.php 2009-12-15 15:03:18 UTC (rev 2184)
</span><span class="lines">@@ -1,7 +1,5 @@
</span><span class="cx"> <h3><?php _e( 'Change Avatar', 'buddypress' ) ?></h3>
</span><span class="cx">
</span><del>-<?php do_action( 'template_notices' ) ?>
-
</del><span class="cx"> <?php do_action( 'bp_before_profile_avatar_upload_content' ) ?>
</span><span class="cx">
</span><span class="cx"> <p><?php _e( 'Your avatar will be used on your profile and throughout the site. If there is a <a href="http://gravatar.com">Gravatar</a> associated with your account email we will use that, or you can upload an image from your computer.', 'buddypress') ?></p>
</span></span></pre>
</div>
</div>
</body>
</html>