<!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] [3279] branches/1.2/bp-core/bp-core-cssjs.php: Fixes #2024,
#2448 (branch).</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3279</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-10-07 19:55:18 +0000 (Thu, 07 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2024, #2448 (branch). Also adds missing new lines. Props TobiasBg.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcorecssjsphp">branches/1.2/bp-core/bp-core-cssjs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorebpcorecssjsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-cssjs.php (3278 => 3279)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-cssjs.php 2010-10-07 19:41:00 UTC (rev 3278)
+++ branches/1.2/bp-core/bp-core-cssjs.php 2010-10-07 19:55:18 UTC (rev 3279)
</span><span class="lines">@@ -35,11 +35,13 @@
</span><span class="cx"> function bp_core_admin_menu_icon_css() {
</span><span class="cx"> global $bp;
</span><span class="cx"> ?>
</span><ins>+
</ins><span class="cx"> <style type="text/css">
</span><span class="cx"> ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a { background-image: url( <?php echo BP_PLUGIN_URL . '/bp-core/images/admin_menu_icon.png' ?> ) !important; background-position: -1px -32px; }
</span><span class="cx"> ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a, ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image a { background-position: -1px 0; }
</span><span class="cx"> ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img { display: none; }
</span><span class="cx"> </style>
</span><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_head', 'bp_core_admin_menu_icon_css' );
</span><span class="lines">@@ -50,7 +52,9 @@
</span><span class="cx"> if ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
</span><span class="cx"> return false;
</span><span class="cx"> ?>
</span><ins>+
</ins><span class="cx"> <script type="text/javascript"> jQuery(document).ready( function() { jQuery("a.confirm").click( function() { if ( confirm( '<?php _e( 'Are you sure?', 'buddypress' ) ?>' ) ) return true; else return false; }); });</script>
</span><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx"> add_action( 'wp_head', 'bp_core_confirmation_js', 100 );
</span><span class="lines">@@ -81,10 +85,11 @@
</span><span class="cx"> $image = apply_filters( 'bp_inline_cropper_image', getimagesize( BP_AVATAR_UPLOAD_PATH . $bp->avatar_admin->image->dir ) );
</span><span class="cx"> $aspect_ratio = 1;
</span><span class="cx">
</span><del>- /* Calculate Aspect Ratio */
</del><ins>+ // Calculate Aspect Ratio
</ins><span class="cx"> if ( (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) && ( (int) constant( 'BP_AVATAR_FULL_WIDTH' ) != (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) ) )
</span><del>- $aspect_ratio = (int) constant( 'BP_AVATAR_FULL_WIDTH' ) / (int) constant( 'BP_AVATAR_FULL_HEIGHT' );
</del><ins>+ $aspect_ratio = (int) constant( 'BP_AVATAR_FULL_WIDTH' ) / (int) constant( 'BP_AVATAR_FULL_HEIGHT' );
</ins><span class="cx"> ?>
</span><ins>+
</ins><span class="cx"> <script type="text/javascript">
</span><span class="cx"> jQuery(window).load( function(){
</span><span class="cx"> jQuery('#avatar-to-crop').Jcrop({
</span><span class="lines">@@ -119,6 +124,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> </script>
</span><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -132,6 +138,7 @@
</span><span class="cx"> function bp_core_add_cropper_inline_css() {
</span><span class="cx"> global $bp;
</span><span class="cx"> ?>
</span><ins>+
</ins><span class="cx"> <style type="text/css">
</span><span class="cx"> .jcrop-holder { float: left; margin: 0 20px 20px 0; text-align: left; }
</span><span class="cx"> .jcrop-vline, .jcrop-hline { font-size: 0; position: absolute; background: white top left repeat url( <?php echo BP_PLUGIN_URL ?>/bp-core/images/Jcrop.gif ); }
</span><span class="lines">@@ -145,6 +152,7 @@
</span><span class="cx"> #avatar-crop-submit { margin: 20px 0; }
</span><span class="cx"> #avatar-upload-form img, #create-group-form img, #group-settings-form img { border: none !important; }
</span><span class="cx"> </style>
</span><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -157,27 +165,12 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_add_ajax_url_js() {
</span><span class="cx"> global $bp;
</span><ins>+?>
</ins><span class="cx">
</span><del>- echo
-'<script type="text/javascript">var ajaxurl = "' . site_url( 'wp-load.php' ) . '";</script>
-';
</del><ins>+ <script type="text/javascript">var ajaxurl = "<?php echo site_url( 'wp-load.php' ); ?>";</script>
+
+<?php
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'wp_head', 'bp_core_add_ajax_url_js' );
</span><span class="cx">
</span><del>-/**
- * bp_core_override_adminbar_css()
- *
- * Overrides the theme's admin bar CSS to hide the adminbar if disabled.
- *
- * @package BuddyPress Core
- */
-function bp_core_override_adminbar_css() {
- global $bp;
-
- if ( defined( 'BP_DISABLE_ADMIN_BAR' ) || ( (int)get_site_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() ) ) {
- ?>
-<style type="text/css">body { padding-top: 0 !important; } #wp-admin-bar { display: none; }</style>
- <?php }
-}
-add_action( 'wp_footer', 'bp_core_override_adminbar_css' );
-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre>
</div>
</div>
</body>
</html>