<!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][4976] trunk/bp-core: Fix loading of admin/buddy bar RTL stylesheets.</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><a href="http://buddypress.trac.wordpress.org/changeset/4976">4976</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-08-14 12:53:55 +0000 (Sun, 14 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix loading of admin/buddy bar RTL stylesheets.
Stop buddybar CSS loading when using admin bar.
Add RTL files for BP's tweaks to the admin bar.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3479">#3479</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreadminbarphp">trunk/bp-core/bp-core-adminbar.php</a></li>
<li><a href="#trunkbpcorebpcorebuddybarphp">trunk/bp-core/bp-core-buddybar.php</a></li>
<li><a href="#trunkbpcorecssadminbardevcss">trunk/bp-core/css/admin-bar.dev.css</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbpcorecssadminbarrtlcss">trunk/bp-core/css/admin-bar-rtl.css</a></li>
<li><a href="#trunkbpcorecssadminbarrtldevcss">trunk/bp-core/css/admin-bar-rtl.dev.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-adminbar.php (4975 => 4976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-adminbar.php 2011-08-13 21:56:37 UTC (rev 4975)
+++ trunk/bp-core/bp-core-adminbar.php 2011-08-14 12:53:55 UTC (rev 4976)
</span><span class="lines">@@ -226,6 +226,9 @@
</span><span class="cx"> function bp_core_load_admin_bar_css() {
</span><span class="cx"> global $wp_version;
</span><span class="cx">
</span><ins>+ if ( !bp_use_wp_admin_bar() )
+ return;
+
</ins><span class="cx"> // Admin bar styles
</span><span class="cx"> if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
</span><span class="cx"> $stylesheet = BP_PLUGIN_URL . '/bp-core/css/admin-bar.dev.css';
</span><span class="lines">@@ -238,12 +241,11 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
</span><del>- $stylesheet = BP_PLUGIN_URL . '/bp-core/css/admin_bar-rtl.dev.css';
</del><ins>+ $stylesheet = BP_PLUGIN_URL . '/bp-core/css/admin-bar-rtl.dev.css';
</ins><span class="cx"> else
</span><del>- $stylesheet = BP_PLUGIN_URL . '/bp-core/css/admin_bar-rtl.css';
</del><ins>+ $stylesheet = BP_PLUGIN_URL . '/bp-core/css/admin-bar-rtl.css';
</ins><span class="cx">
</span><span class="cx"> wp_enqueue_style( 'bp-admin-bar-rtl', apply_filters( 'bp_core_admin_bar_rtl_css', $stylesheet ), array( 'bp-admin-bar' ), '20110723' );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_init', 'bp_core_load_admin_bar_css' );
</span><del>-
</del><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpcorebpcorebuddybarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-buddybar.php (4975 => 4976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-buddybar.php 2011-08-13 21:56:37 UTC (rev 4975)
+++ trunk/bp-core/bp-core-buddybar.php 2011-08-14 12:53:55 UTC (rev 4976)
</span><span class="lines">@@ -545,16 +545,6 @@
</span><span class="cx"> if ( (int)bp_get_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Admin bar styles
- if ( file_exists( get_stylesheet_directory() . '/_inc/css/adminbar.css' ) ) // Backwards compatibility
- $stylesheet = get_stylesheet_directory_uri() . '/_inc/css/adminbar.css';
- elseif ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
- $stylesheet = BP_PLUGIN_URL . '/bp-core/css/buddybar.dev.css';
- else
- $stylesheet = BP_PLUGIN_URL . '/bp-core/css/buddybar.css';
-
- wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', $stylesheet ), array(), '20110723' );
-
</del><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">@@ -569,13 +559,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Load the buddybar's RTL stylesheet if appropriate.
- *
- * This can't be done in bp_core_load_admin_bar() because that function is called before locale.php is included.
- *
- * @since 1.5
</del><ins>+ * Handle the BuddyBar CSS
</ins><span class="cx"> */
</span><del>-function bp_core_load_buddybar_rtl_stylesheet() {
</del><ins>+function bp_core_load_buddybar_css() {
+ if ( bp_use_wp_admin_bar() )
+ return;
+
+ if ( file_exists( get_stylesheet_directory() . '/_inc/css/adminbar.css' ) ) // Backwards compatibility
+ $stylesheet = get_stylesheet_directory_uri() . '/_inc/css/adminbar.css';
+ elseif ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG )
+ $stylesheet = BP_PLUGIN_URL . '/bp-core/css/buddybar.dev.css';
+ else
+ $stylesheet = BP_PLUGIN_URL . '/bp-core/css/buddybar.css';
+
+ wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', $stylesheet ), array(), '20110723' );
+
</ins><span class="cx"> if ( !is_rtl() )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -586,5 +584,5 @@
</span><span class="cx">
</span><span class="cx"> wp_enqueue_style( 'bp-admin-bar-rtl', apply_filters( 'bp_core_buddybar_rtl_css', $stylesheet ), array( 'bp-admin-bar' ), '20110723' );
</span><span class="cx"> }
</span><del>-add_action( 'wp', 'bp_core_load_buddybar_rtl_stylesheet' );
</del><ins>+add_action( 'bp_init', 'bp_core_load_buddybar_css' );
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpcorecssadminbarrtlcss"></a>
<div class="addfile"><h4>Added: trunk/bp-core/css/admin-bar-rtl.css (0 => 4976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/css/admin-bar-rtl.css (rev 0)
+++ trunk/bp-core/css/admin-bar-rtl.css 2011-08-14 12:53:55 UTC (rev 4976)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+#wpadminbar .quicklinks li#wp-admin-bar-my-account ul,#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar ul{left:auto;right:0;}#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar>a img,#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar>a img{margin:-2px -5px 0 23px;}#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar ul,#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul{left:auto;right:30px;}#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar ul ul,#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul{left:auto;right:0;}#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul{left:auto;right:0;}#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul{left:auto;right:0;}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpcorecssadminbarrtldevcss"></a>
<div class="addfile"><h4>Added: trunk/bp-core/css/admin-bar-rtl.dev.css (0 => 4976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/css/admin-bar-rtl.dev.css (rev 0)
+++ trunk/bp-core/css/admin-bar-rtl.dev.css 2011-08-14 12:53:55 UTC (rev 4976)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+#wpadminbar .quicklinks li#wp-admin-bar-my-account ul,
+#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar ul {
+ left: auto;
+ right: 0;
+}
+#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar > a img,
+#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar > a img {
+ margin: -2px -5px 0 23px;
+}
+#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar ul,
+#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul {
+ left: auto;
+ right: 30px;
+}
+#wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar ul ul,
+#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul {
+ left: auto;
+ right: 0;
+}
+#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul {
+ left: auto;
+ right: 0;
+}
+#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul {
+ left: auto;
+ right: 0;
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpcorecssadminbardevcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/css/admin-bar.dev.css (4975 => 4976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/css/admin-bar.dev.css 2011-08-13 21:56:37 UTC (rev 4975)
+++ trunk/bp-core/css/admin-bar.dev.css 2011-08-14 12:53:55 UTC (rev 4976)
</span><span class="lines">@@ -4,74 +4,11 @@
</span><span class="cx"> right: auto;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* These extra bits move the user links to the right side
-
-#wpadminbar .quicklinks #wp-admin-bar-bp-register,
-#wpadminbar .quicklinks #wp-admin-bar-bp-login {
- float: right;
-}
-#wpadminbar .quicklinks li#wp-admin-bar-my-account,
-#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar {
- float: right;
-}
-
-#wpadminbar .quicklinks li#wp-admin-bar-my-account ul,
-#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar ul {
-
-}
-
-#wpadminbar .quicklinks li#wp-admin-bar-my-account ul li,
-#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar ul li {
- float: right;
-}
-
-#wpadminbar .quicklinks li#wp-admin-bar-my-account ul,
-#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar ul {
- left: auto;
- right: 0;
-}
-
-#wpadminbar .quicklinks li#wp-admin-bar-my-account ul ul,
-#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar ul ul {
- right: 0;
- left: auto;
-}
-
-#wpadminbar .quicklinks li#wp-admin-bar-my-account.menupop li:hover > ul,
-#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar.menupop li.hover > ul {
- margin-right: 100%;
- margin-left: 0;
-}
-
-
-#wpadminbar .quicklinks li#wp-admin-bar-my-account.menupop ul li a > span,
-#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar.menupop ul li a > span {
- background: url(../images/admin-bar-sprite-rtl.png?d=11122010) left -29px no-repeat;
- padding-right: 0;
- padding-left: 1.5em;
-}
-
-#wpadminbar .quicklinks li#wp-admin-bar.menupop li a img.blavatar,
-#wpadminbar .quicklinks li#wp-admin-bar-my-account.menupop li a img.blavatar {
- margin-right: 0;
- margin-left: 8px;
-}
-
-#wpadminbar .quicklinks li#wp-admin-bar-my-account > a,
-#wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar > a {
- border-right: none;
- border-left: 1px solid #686868;
-}
-
-End extra bits */
-
</del><span class="cx"> /* Displayed User */
</span><del>-
</del><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar > a {
</span><span class="cx"> border-left: none;
</span><span class="cx"> background: url(../images/admin-bar-sprite.png?d=11122010) top left no-repeat;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar > a img,
</span><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar > a img {
</span><span class="cx"> width: 16px;
</span><span class="lines">@@ -84,44 +21,26 @@
</span><span class="cx"> background: #eee;
</span><span class="cx"> float: none;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar ul,
</span><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul {
</span><span class="cx"> left: 30px;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-user-admin-with-avatar ul ul,
</span><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul {
</span><span class="cx"> left: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Displayed Group */
</span><del>-
</del><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar > a {
</span><span class="cx"> border-left: none;
</span><span class="cx"> background: url(../images/admin-bar-sprite.png?d=11122010) top left no-repeat;
</span><span class="cx"> }
</span><del>-
-#wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar > a img {
- width: 16px;
- height: 16px;
- display: inline;
- border: 1px solid #999;
- vertical-align: middle;
- margin: -2px 23px 0 -5px;
- padding: 0;
- background: #eee;
- float: none;
-}
-
</del><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul {
</span><span class="cx"> left: 0;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-group-admin-with-avatar ul ul {
</span><span class="cx"> left: 0;
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-my-account a span.count,
</span><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-my-account-with-avatar a span.count,
</span><span class="cx"> #wpadminbar .quicklinks li#wp-admin-bar-bp-notifications #ab-pending-notifications {
</span></span></pre>
</div>
</div>
</body>
</html>