<!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] [1678] trunk:
Updates for bp-admin-bar support on other blogs and in admin-area.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1678</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-08-14 22:43:22 +0000 (Fri, 14 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updates for bp-admin-bar support on other blogs and in admin-area.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecssjsphp">trunk/bp-core/bp-core-cssjs.php</a></li>
<li><a href="#trunkbpcoredeprecatedjsgeneraljs">trunk/bp-core/deprecated/js/general.js</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssadminbarcss">trunk/bp-themes/bp-default/_inc/css/adminbar.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbpcorejsadminbarjs">trunk/bp-core/js/admin-bar.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorecssjsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-cssjs.php (1677 => 1678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-cssjs.php 2009-08-14 21:34:37 UTC (rev 1677)
+++ trunk/bp-core/bp-core-cssjs.php 2009-08-14 22:43:22 UTC (rev 1678)
</span><span class="lines">@@ -1,33 +1,50 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><del>- * bp_core_add_admin_css()
</del><ins>+ * bp_core_add_admin_bar_css()
</ins><span class="cx"> *
</span><del>- * Add the CSS needed for all components in the admin area.
</del><ins>+ * Add the CSS needed for the admin bar on blogs (other than the root) and in the admin area.
</ins><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><span class="cx"> * @uses get_option() Selects a site setting from the DB.
</span><span class="cx"> */
</span><del>-function bp_core_add_admin_css() {
</del><ins>+function bp_core_add_admin_bar_css() {
+ global $current_blog;
+
</ins><span class="cx"> if ( defined( 'BP_DISABLE_ADMIN_BAR') )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if ( BP_ROOT_BLOG == $current_blog->blog_id && !is_admin() )
+ return false;
+
</ins><span class="cx"> /* Fetch the admin bar css from the active theme location */
</span><del>- if ( $located_css = locate_template( array( '_inc/css/adminbar.css' ) ) ) {
- if ( false === strpos( TEMPLATEPATH, $located_css ) )
- $admin_bar_css = get_stylesheet_directory_uri() . '/_inc/css/adminbar.css';
- else
- $admin_bar_css = get_template_directory_uri() . '/_inc/css/adminbar.css';
-
- wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', $admin_bar_css ) );
- }
</del><ins>+ if ( file_exists( WP_CONTENT_DIR . '/themes/' . get_blog_option( BP_ROOT_BLOG, 'stylesheet' ) . '/_inc/css/adminbar.css' ) )
+ $admin_bar_css = WP_CONTENT_URL . '/themes/' . get_blog_option( BP_ROOT_BLOG, 'stylesheet' ) . '/_inc/css/adminbar.css';
+ else if ( file_exists( WP_CONTENT_DIR . '/' . get_blog_option( BP_ROOT_BLOG, 'template' ) . '/_inc/css/adminbar.css' ) )
+ $admin_bar_css = WP_CONTENT_URL . '/themes/' . get_blog_option( BP_ROOT_BLOG, 'template' ) . '/_inc/css/adminbar.css';
</ins><span class="cx"> else
</span><del>- wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', BP_PLUGIN_URL . '/bp-core/deprecated//css/admin-bar.css' ) );
</del><ins>+ $admin_bar_css = BP_PLUGIN_URL . '/bp-core/deprecated/css/admin-bar.css';
+
+ wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', $admin_bar_css ) );
</ins><span class="cx"> }
</span><del>-add_action( 'admin_menu', 'bp_core_add_admin_css' );
</del><ins>+add_action( 'admin_menu', 'bp_core_add_admin_bar_css' );
+add_action( 'template_redirect', 'bp_core_add_admin_bar_css' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * bp_core_add_admin_bar_css()
+ *
+ * Add the minor JS needed for the admin bar.
+ *
+ * @package BuddyPress Core
+ * @uses get_option() Selects a site setting from the DB.
+ */
+function bp_core_add_admin_bar_js() {
+ wp_enqueue_script( 'bp-admin-bar-js', BP_PLUGIN_URL . '/bp-core/js/admin-bar.js', array( 'jquery' ) );
+}
+add_action( 'admin_menu', 'bp_core_add_admin_bar_js' );
+add_action( 'template_redirect', 'bp_core_add_admin_bar_js' );
+
+/**
</ins><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="trunkbpcoredeprecatedjsgeneraljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/deprecated/js/general.js (1677 => 1678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/deprecated/js/general.js 2009-08-14 21:34:37 UTC (rev 1677)
+++ trunk/bp-core/deprecated/js/general.js 2009-08-14 22:43:22 UTC (rev 1678)
</span><span class="lines">@@ -87,7 +87,6 @@
</span><span class="cx"> }
</span><span class="cx"> );
</span><span class="cx">
</span><del>-
</del><span class="cx"> function clear(container) {
</span><span class="cx"> if(!document.getElementById(container)) return false;
</span><span class="cx">
</span><span class="lines">@@ -99,14 +98,3 @@
</span><span class="cx"> radioButtons[i].checked = false;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
-/* For admin-bar */
-jQuery(document).ready( function() {
- jQuery("#wp-admin-bar ul.main-nav li").mouseover( function() {
- jQuery(this).addClass('sfhover');
- });
-
- jQuery("#wp-admin-bar ul.main-nav li").mouseout( function() {
- jQuery(this).removeClass('sfhover');
- });
-});
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpcorejsadminbarjs"></a>
<div class="addfile"><h4>Added: trunk/bp-core/js/admin-bar.js (0 => 1678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/js/admin-bar.js (rev 0)
+++ trunk/bp-core/js/admin-bar.js 2009-08-14 22:43:22 UTC (rev 1678)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+jQuery(document).ready( function() {
+ jQuery("#wp-admin-bar ul.main-nav li").mouseover( function() {
+ jQuery(this).addClass('sfhover');
+ });
+
+ jQuery("#wp-admin-bar ul.main-nav li").mouseout( function() {
+ jQuery(this).removeClass('sfhover');
+ });
+});
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssadminbarcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/adminbar.css (1677 => 1678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/adminbar.css 2009-08-14 21:34:37 UTC (rev 1677)
+++ trunk/bp-themes/bp-default/_inc/css/adminbar.css 2009-08-14 22:43:22 UTC (rev 1678)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> }
</span><span class="cx"> #wp-admin-bar a {
</span><span class="cx"> text-decoration: none;
</span><ins>+ text-align: left !important;
</ins><span class="cx"> }
</span><span class="cx"> #wp-admin-bar a#admin-bar-logo {
</span><span class="cx"> color: #f0f0f0;
</span></span></pre>
</div>
</div>
</body>
</html>