<!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][4027] trunk: Enqueue buddybar's CSS in core rather than the theme to prevent unstyled mess when using third-party themes</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>4027</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-02-08 22:36:57 +0000 (Tue, 08 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enqueue buddybar's CSS in core rather than the theme to prevent unstyled mess when using third-party themes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorebuddybarphp">trunk/bp-core/bp-core-buddybar.php</a></li>
<li><a href="#trunkbpcorebpcorecssjsphp">trunk/bp-core/bp-core-cssjs.php</a></li>
<li><a href="#trunkbpthemesbpdefaultstylecss">trunk/bp-themes/bp-default/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorebuddybarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-buddybar.php (4026 => 4027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-buddybar.php 2011-02-08 20:30:30 UTC (rev 4026)
+++ trunk/bp-core/bp-core-buddybar.php 2011-02-08 22:36:57 UTC (rev 4027)
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx"> function bp_core_admin_bar() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
</del><ins>+ if ( defined( 'BP_DISABLE_ADMIN_BAR' ) && BP_DISABLE_ADMIN_BAR )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( (int)get_site_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() )
</span><span class="lines">@@ -449,10 +449,19 @@
</span><span class="cx"> if ( defined( 'BP_USE_WP_ADMIN_BAR' ) && BP_USE_WP_ADMIN_BAR && $wp_version >= 3.1 ) {
</span><span class="cx"> // TODO: Add BP support to WP admin bar
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> } elseif ( !defined( 'BP_DISABLE_ADMIN_BAR' ) || !BP_DISABLE_ADMIN_BAR ) {
</span><span class="cx"> // Keep the WP admin bar from loading
</span><span class="cx"> show_admin_bar( false );
</span><span class="cx">
</span><ins>+ // Admin bar styles
+ $stylesheet = get_blog_option( BP_ROOT_BLOG, 'stylesheet' );
+
+ if ( file_exists( WP_CONTENT_DIR . '/themes/' . $stylesheet . '/_inc/css/adminbar.css' ) )
+ wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', WP_CONTENT_URL . '/themes/' . $stylesheet . '/_inc/css/adminbar.css' ), array(), BP_VERSION );
+ else
+ wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', BP_PLUGIN_URL . '/bp-themes/bp-default/_inc/css/adminbar.css' ), array(), BP_VERSION );
+
</ins><span class="cx"> // Actions used to build the BP admin bar
</span><span class="cx"> add_action( 'bp_adminbar_logo', 'bp_adminbar_logo' );
</span><span class="cx"> add_action( 'bp_adminbar_menus', 'bp_adminbar_login_menu', 2 );
</span><span class="lines">@@ -466,4 +475,4 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><ins>+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpcorebpcorecssjsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-cssjs.php (4026 => 4027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-cssjs.php 2011-02-08 20:30:30 UTC (rev 4026)
+++ trunk/bp-core/bp-core-cssjs.php 2011-02-08 22:36:57 UTC (rev 4027)
</span><span class="lines">@@ -1,31 +1,5 @@
</span><span class="cx"> <?php
</span><del>-
</del><span class="cx"> /**
</span><del>- * bp_core_add_admin_bar_css()
- *
- * Add the CSS needed for the admin bar on blogs (other than the root) and in the admin area.
- *
- * @package BuddyPress Core
- * @uses get_option() Selects a site setting from the DB.
- */
-function bp_core_add_admin_bar_css() {
- global $bp, $current_blog;
-
- if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
- return false;
-
- if ( ( is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG ) || is_admin() ) {
- $stylesheet = get_blog_option( BP_ROOT_BLOG, 'stylesheet' );
-
- if ( file_exists( WP_CONTENT_DIR . '/themes/' . $stylesheet . '/_inc/css/adminbar.css' ) )
- wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', WP_CONTENT_URL . '/themes/' . $stylesheet . '/_inc/css/adminbar.css' ), array(), BP_VERSION );
- else
- wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', BP_PLUGIN_URL . '/bp-themes/bp-default/_inc/css/adminbar.css' ), array(), BP_VERSION );
- }
-}
-add_action( 'bp_init', 'bp_core_add_admin_bar_css' );
-
-/**
</del><span class="cx"> * bp_core_admin_menu_icon_css()
</span><span class="cx"> *
</span><span class="cx"> * Add a hover-able icon to the "BuddyPress" wp-admin area menu.
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultstylecss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/style.css (4026 => 4027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/style.css 2011-02-08 20:30:30 UTC (rev 4026)
+++ trunk/bp-themes/bp-default/style.css 2011-02-08 22:36:57 UTC (rev 4027)
</span><span class="lines">@@ -20,9 +20,4 @@
</span><span class="cx"> /***
</span><span class="cx"> * The default theme styles.
</span><span class="cx"> */
</span><del>-@import url( _inc/css/default.css );
-
-/***
- * The admin bar default styles
- */
-@import url( _inc/css/adminbar.css );
</del><span class="cx">\ No newline at end of file
</span><ins>+@import url( _inc/css/default.css );
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>