<!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][3600] trunk: Tidies up default theme's header.php -- removes duplicated generator line and the hardcoded activity feed links and attaches them to bp_head.</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>3600</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-12-28 15:36:33 +0000 (Tue, 28 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tidies up default theme's header.php -- removes duplicated generator line and the hardcoded activity feed links and attaches them to bp_head. Fixes #2975, props r-a-y</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
<li><a href="#trunkbpthemesbpdefaultheaderphp">trunk/bp-themes/bp-default/header.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (3599 => 3600)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2010-12-28 15:30:22 UTC (rev 3599)
+++ trunk/bp-activity/bp-activity-templatetags.php 2010-12-28 15:36:33 UTC (rev 3600)
</span><span class="lines">@@ -1138,4 +1138,43 @@
</span><span class="cx"> return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $content ) ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Template tag so we can hook activity feed to <head>
+ *
+ * @since 1.3
+ */
+function bp_dtheme_sitewide_feed() {
+?>
+<link rel="alternate" type="application/rss+xml" title="<?php bloginfo( 'name' ) ?> | <?php _e( 'Site Wide Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_sitewide_activity_feed_link() ?>" />
+<?php
+}
+add_action( 'bp_head', 'bp_dtheme_sitewide_feed' );
+
+/**
+ * Template tag so we can hook member activity feed to <head>
+ *
+ * @since 1.3
+ */
+function bp_dtheme_member_feed() {
+ if ( !bp_is_member() )
+ return;
+?>
+ <link rel="alternate" type="application/rss+xml" title="<?php bloginfo( 'name' ) ?> | <?php bp_displayed_user_fullname() ?> | <?php _e( 'Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_member_activity_feed_link() ?>" />
+<?php
+}
+add_action( 'bp_head', 'bp_dtheme_member_feed' );
+
+/**
+ * Template tag so we can hook group activity feed to <head>
+ *
+ * @since 1.3
+ */
+function bp_dtheme_group_feed() {
+ if ( !bp_is_active( 'groups' ) || !bp_is_group() )
+ return;
+?>
+ <link rel="alternate" type="application/rss+xml" title="<?php bloginfo( 'name' ) ?> | <?php bp_current_group_name() ?> | <?php _e( 'Group Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_group_activity_feed_link() ?>" />
+<?php
+}
+add_action( 'bp_head', 'bp_dtheme_group_feed' );
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/header.php (3599 => 3600)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/header.php 2010-12-28 15:30:22 UTC (rev 3599)
+++ trunk/bp-themes/bp-default/header.php 2010-12-28 15:36:33 UTC (rev 3600)
</span><span class="lines">@@ -1,35 +1,16 @@
</span><span class="cx"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
</span><span class="cx">
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
</span><del>-
</del><span class="cx"> <head profile="http://gmpg.org/xfn/11">
</span><del>-
- <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
-
</del><ins>+ <meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ) ?>; charset=<?php bloginfo( 'charset' ) ?>" />
</ins><span class="cx"> <title><?php bp_page_title() ?></title>
</span><ins>+ <link rel="stylesheet" href="<?php bloginfo( 'stylesheet_url') ?>" type="text/css" media="screen" />
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_head' ) ?>
</span><span class="cx">
</span><del>- <meta name="generator" content="WordPress <?php bloginfo('version'); ?>" /> <!-- leave this for stats -->
</del><ins>+ <link rel="pingback" href="<?php bloginfo( 'pingback_url' ) ?>" />
</ins><span class="cx">
</span><del>- <link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" />
-
- <?php if ( function_exists( 'bp_sitewide_activity_feed_link' ) ) : ?>
- <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> | <?php _e('Site Wide Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_sitewide_activity_feed_link() ?>" />
- <?php endif; ?>
-
- <?php if ( function_exists( 'bp_member_activity_feed_link' ) && bp_is_member() ) : ?>
- <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> | <?php bp_displayed_user_fullname() ?> | <?php _e( 'Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_member_activity_feed_link() ?>" />
- <?php endif; ?>
-
- <?php if ( function_exists( 'bp_group_activity_feed_link' ) && bp_is_group() ) : ?>
- <link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> | <?php bp_current_group_name() ?> | <?php _e( 'Group Activity RSS Feed', 'buddypress' ) ?>" href="<?php bp_group_activity_feed_link() ?>" />
- <?php endif; ?>
-
- <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
-
</del><span class="cx"> <?php wp_head(); ?>
</span><del>-
</del><span class="cx"> </head>
</span><span class="cx">
</span><span class="cx"> <body <?php body_class() ?> id="bp-default">
</span><span class="lines">@@ -37,7 +18,6 @@
</span><span class="cx"> <?php do_action( 'bp_before_header' ) ?>
</span><span class="cx">
</span><span class="cx"> <div id="header">
</span><del>-
</del><span class="cx"> <h1 id="logo" role="banner"><a href="<?php echo home_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php bp_site_name() ?></a></h1>
</span><span class="cx">
</span><span class="cx"> <div id="navigation" role="navigation">
</span><span class="lines">@@ -48,7 +28,6 @@
</span><span class="cx"> <div class="padder">
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_search_form_enabled() ) : ?>
</span><del>-
</del><span class="cx"> <form action="<?php echo bp_search_form_action() ?>" method="post" id="search-form">
</span><span class="cx"> <input type="text" id="search-terms" name="search-terms" value="" />
</span><span class="cx"> <?php echo bp_search_form_type_select() ?>
</span><span class="lines">@@ -56,7 +35,6 @@
</span><span class="cx"> <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
</span><span class="cx"> <?php wp_nonce_field( 'bp_search_form' ) ?>
</span><span class="cx"> </form><!-- #search-form -->
</span><del>-
</del><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_search_login_bar' ) ?>
</span></span></pre>
</div>
</div>
</body>
</html>