<!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][3763] trunk/bp-blogs: More clean-up to the blogs component.</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>3763</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-20 11:59:39 +0000 (Thu, 20 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>More clean-up to the blogs component. Remove more copy pasta from previous refactors.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsbpblogsloaderphp">trunk/bp-blogs/bp-blogs-loader.php</a></li>
<li><a href="#trunkbpblogsbpblogsscreensphp">trunk/bp-blogs/bp-blogs-screens.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsbpblogsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-loader.php (3762 => 3763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-loader.php 2011-01-20 11:50:14 UTC (rev 3762)
+++ trunk/bp-blogs/bp-blogs-loader.php 2011-01-20 11:59:39 UTC (rev 3763)
</span><span class="lines">@@ -77,93 +77,39 @@
</span><span class="cx"> function _setup_nav() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ /**
+ * Blog/post/comment menus should not appear on single WordPress setups.
+ * Although comments and posts made by users will still show on their
+ * activity stream.
+ */
+ if ( !is_multisite() )
+ return false;
+
</ins><span class="cx"> // Add 'Blogs' to the main navigation
</span><span class="cx"> bp_core_new_nav_item( array(
</span><del>- 'name' => __( 'Blogs', 'buddypress' ),
</del><ins>+ 'name' => sprintf( __( 'Blogs <span>(%d)</span>', 'buddypress' ), bp_blogs_total_blogs_for_user() ),
</ins><span class="cx"> 'slug' => $bp->blogs->slug,
</span><del>- 'position' => 10,
</del><ins>+ 'position' => 30,
</ins><span class="cx"> 'screen_function' => 'bp_blogs_screen_my_blogs',
</span><del>- 'default_subnav_slug' => 'just-me',
- 'item_css_id' => $bp->blogs->id )
- );
-
- // Stop if there is no user displayed or logged in
- if ( !is_user_logged_in() && !isset( $bp->displayed_user->id ) )
- return;
-
- // User links
- $user_domain = ( isset( $bp->displayed_user->domain ) ) ? $bp->displayed_user->domain : $bp->loggedin_user->domain;
- $user_login = ( isset( $bp->displayed_user->userdata->user_login ) ) ? $bp->displayed_user->userdata->user_login : $bp->loggedin_user->userdata->user_login;
- $blogs_link = $user_domain . $bp->blogs->slug . '/';
-
- // Add the subnav items to the blogs nav item if we are using a theme that supports this
- bp_core_new_subnav_item( array(
- 'name' => __( 'Personal', 'buddypress' ),
- 'slug' => 'just-me',
- 'parent_url' => $blogs_link,
- 'parent_slug' => $bp->blogs->slug,
- 'screen_function' => 'bp_blogs_screen_my_blogs',
- 'position' => 10
</del><ins>+ 'default_subnav_slug' => 'my-blogs',
+ 'item_css_id' => $bp->blogs->id
</ins><span class="cx"> ) );
</span><span class="cx">
</span><del>- // Additional menu if friends is active
- if ( bp_is_active( 'friends' ) ) {
- bp_core_new_subnav_item( array(
- 'name' => __( 'Friends', 'buddypress' ),
- 'slug' => BP_FRIENDS_SLUG,
- 'parent_url' => $blogs_link,
- 'parent_slug' => $bp->blogs->slug,
- 'screen_function' => 'bp_blogs_screen_friends',
- 'position' => 20,
- 'item_css_id' => 'blogs-friends'
- ) );
- }
-
- // Additional menu if groups is active
- if ( bp_is_active( 'groups' ) ) {
- bp_core_new_subnav_item( array(
- 'name' => __( 'Groups', 'buddypress' ),
- 'slug' => BP_GROUPS_SLUG,
- 'parent_url' => $blogs_link,
- 'parent_slug' => $bp->blogs->slug,
- 'screen_function' => 'bp_blogs_screen_groups',
- 'position' => 30,
- 'item_css_id' => 'blogs-groups'
- ) );
- }
-
- // Favorite blogs items
- bp_core_new_subnav_item( array(
- 'name' => __( 'Favorites', 'buddypress' ),
- 'slug' => 'favorites',
- 'parent_url' => $blogs_link,
- 'parent_slug' => $bp->blogs->slug,
- 'screen_function' => 'bp_blogs_screen_favorites',
- 'position' => 40,
- 'item_css_id' => 'blogs-favs'
- ) );
-
- // @ mentions
- bp_core_new_subnav_item( array(
- 'name' => sprintf( __( '@%s Mentions', 'buddypress' ), $user_login ),
- 'slug' => 'mentions',
- 'parent_url' => $blogs_link,
- 'parent_slug' => $bp->blogs->slug,
- 'screen_function' => 'bp_blogs_screen_mentions',
- 'position' => 50,
- 'item_css_id' => 'blogs-mentions'
- ) );
-
- // Adjust title based on view
- if ( bp_is_blogs_component() ) {
</del><ins>+ // Set up the component options navigation for Blog
+ if ( $bp->blogs->slug == $bp->current_component ) {
</ins><span class="cx"> if ( bp_is_my_profile() ) {
</span><del>- $bp->bp_options_title = __( 'My Blogs', 'buddypress' );
</del><ins>+ if ( function_exists('xprofile_setup_nav') ) {
+ $bp->bp_options_title = __( 'My Blogs', 'buddypress' );
+ }
+
+ // If we are not viewing the logged in user, set up the current
+ // users avatar and name
</ins><span class="cx"> } else {
</span><span class="cx"> $bp->bp_options_avatar = bp_core_fetch_avatar( array(
</span><span class="cx"> 'item_id' => $bp->displayed_user->id,
</span><span class="cx"> 'type' => 'thumb'
</span><span class="cx"> ) );
</span><del>- $bp->bp_options_title = $bp->displayed_user->fullname;
</del><ins>+ $bp->bp_options_title = $bp->displayed_user->fullname;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -172,95 +118,3 @@
</span><span class="cx"> $bp->blogs = new BP_Blogs_Component();
</span><span class="cx">
</span><span class="cx"> ?>
</span><del>-
-
-
-<?php
-
-function bp_blogs_setup_globals() {
- global $bp, $wpdb;
-
- if ( !defined( 'BP_BLOGS_SLUG' ) && isset( $bp->pages->blogs->slug ) )
- define ( 'BP_BLOGS_SLUG', bp_core_component_slug_from_root_slug( $bp->pages->blogs->slug ) );
- else if ( !defined( 'BP_BLOGS_SLUG' ) )
- define ( 'BP_BLOGS_SLUG', 'blogs' );
-
- // For internal identification
- $bp->blogs->id = 'blogs';
- $bp->blogs->name = !empty( $bp->pages->blogs->name ) ? $bp->pages->blogs->name : 'blogs';
-
- // Slugs
- $bp->blogs->slug = BP_BLOGS_SLUG;
- $bp->blogs->root_slug = !empty( $bp->pages->blogs->slug ) ? $bp->pages->blogs->slug : BP_BLOGS_SLUG;
-
- // Tables
- $bp->blogs->table_name = $bp->table_prefix . 'bp_user_blogs';
- $bp->blogs->table_name_blogmeta = $bp->table_prefix . 'bp_user_blogs_blogmeta';
-
- // Notifications
- $bp->blogs->notification_callback = 'bp_blogs_format_notifications';
-
- // Register this in the active components array
- $bp->active_components[$bp->blogs->slug] = $bp->blogs->id;
-
- // The default text for the blogs directory search box
- $bp->default_search_strings[$bp->blogs->slug] = __( 'Search Blogs...', 'buddypress' );
-
- do_action( 'bp_blogs_setup_globals' );
-}
-add_action( 'bp_setup_globals', 'bp_blogs_setup_globals' );
-
-/**
- * Adds "Blog" to the navigation arrays for the current and logged in user.
- *
- * @package BuddyPress Blogs
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @uses bp_is_my_profile() Checks to see if the current user being viewed is the logged in user
- */
-function bp_blogs_setup_nav() {
- global $bp;
-
- /**
- * Blog/post/comment menus should not appear on single WordPress setups.
- * Although comments and posts made by users will still show on their
- * activity stream.
- */
- if ( !is_multisite() )
- return false;
-
- // Add 'Blogs' to the main navigation
- bp_core_new_nav_item( array( 'name' => sprintf( __( 'Blogs <span>(%d)</span>', 'buddypress' ), bp_blogs_total_blogs_for_user() ), 'slug' => $bp->blogs->slug, 'position' => 30, 'screen_function' => 'bp_blogs_screen_my_blogs', 'default_subnav_slug' => 'my-blogs', 'item_css_id' => $bp->blogs->id ) );
-
- $blogs_link = $bp->loggedin_user->domain . $bp->blogs->slug . '/';
-
- // Set up the component options navigation for Blog
- if ( $bp->blogs->slug == $bp->current_component ) {
- if ( bp_is_my_profile() ) {
- if ( function_exists('xprofile_setup_nav') ) {
- $bp->bp_options_title = __('My Blogs', 'buddypress');
- }
- } else {
- // If we are not viewing the logged in user, set up the current
- // users avatar and name
- $bp->bp_options_avatar = bp_core_fetch_avatar( array( 'item_id' => $bp->displayed_user->id, 'type' => 'thumb' ) );
- $bp->bp_options_title = $bp->displayed_user->fullname;
- }
- }
-
- do_action( 'bp_blogs_setup_nav' );
-}
-add_action( 'bp_setup_nav', 'bp_blogs_setup_nav' );
-
-function bp_blogs_directory_blogs_setup() {
- global $bp;
-
- if ( is_multisite() && $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
- $bp->is_directory = true;
-
- do_action( 'bp_blogs_directory_blogs_setup' );
- bp_core_load_template( apply_filters( 'bp_blogs_template_directory_blogs_setup', 'blogs/index' ) );
- }
-}
-add_action( 'wp', 'bp_blogs_directory_blogs_setup', 2 );
-
-?>
</del></span></pre></div>
<a id="trunkbpblogsbpblogsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-screens.php (3762 => 3763)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-screens.php 2011-01-20 11:50:14 UTC (rev 3762)
+++ trunk/bp-blogs/bp-blogs-screens.php 2011-01-20 11:59:39 UTC (rev 3763)
</span><span class="lines">@@ -32,4 +32,17 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp', 'bp_blogs_screen_create_a_blog', 3 );
</span><span class="cx">
</span><ins>+function bp_blogs_screen_index() {
+ global $bp;
+
+ if ( is_multisite() && $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
+ $bp->is_directory = true;
+
+ do_action( 'bp_blogs_screen_index' );
+
+ bp_core_load_template( apply_filters( 'bp_blogs_screen_index', 'blogs/index' ) );
+ }
+}
+add_action( 'wp', 'bp_blogs_screen_index', 2 );
+
</ins><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>