Changeset 3706 for trunk/bp-core/bp-core-cssjs.php

Timestamp:

01/14/2011 07:35:58 AM (14 years ago)

Author:

johnjamesjacoby

Message:

First round of WordPress 3.1 adjustments for BuddyPress installer/upgrader.

File:

• trunk/bp-core/bp-core-cssjs.php (modified) (3 diffs)

trunk/bp-core/bp-core-cssjs.php

@@ -34 +34 @@
  */
 function bp_core_admin_menu_icon_css() {
-    global $bp;
-?>
+    global $bp; ?>
 
     <style type="text/css">
-        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; }
-        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; }
+        /* Wizard Icon */
+        ul#adminmenu li.toplevel_page_bp-wizard .wp-menu-image a img { display: none; }
+        ul#adminmenu li.toplevel_page_bp-wizard .wp-menu-image a { background-image: url( <?php echo plugins_url( 'buddypress/bp-core/images/admin_menu_icon.png' ) ?> ) !important; background-position: -1px -32px; }
+        ul#adminmenu li.toplevel_page_bp-wizard:hover .wp-menu-image a,
+        ul#adminmenu li.toplevel_page_bp-wizard.wp-has-current-submenu .wp-menu-image a {
+            background-position: -1px 0;
+        }
+
+        /* Settings Icon */
         ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img { display: none; }
+        ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a { background-image: url( <?php echo plugins_url( 'buddypress/bp-core/images/admin_menu_icon.png' ) ?> ) !important; background-position: -1px -32px; }
+        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;
+        }
     </style>
 
@@ -85 +96 @@
     $image = apply_filters( 'bp_inline_cropper_image', getimagesize( BP_AVATAR_UPLOAD_PATH . $bp->avatar_admin->image->dir ) );
     $aspect_ratio = 1;
+    
+    $full_height = (int) constant( 'BP_AVATAR_FULL_HEIGHT' );
+    $full_width  = (int) constant( 'BP_AVATAR_FULL_WIDTH'  );
 
     // Calculate Aspect Ratio
-    if ( (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) && ( (int) constant( 'BP_AVATAR_FULL_WIDTH' ) != (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) ) )
-        $aspect_ratio = (int) constant( 'BP_AVATAR_FULL_WIDTH' ) / (int) constant( 'BP_AVATAR_FULL_HEIGHT' );
+    if ( $full_height && ( $full_width != $full_height ) )
+        $aspect_ratio = $full_width / $full_height;
 
     $width  = $image[0] / 2;
@@ -115 +129 @@
         function showPreview(coords) {
             if ( parseInt(coords.w) > 0 ) {
-                var rx = <?php echo (int) constant( 'BP_AVATAR_FULL_WIDTH' ) ?> / coords.w;
-                var ry = <?php echo (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) ?> / coords.h;
+                var rx = <?php echo $full_width; ?> / coords.w;
+                var ry = <?php echo $full_height; ?> / coords.h;
 
                 jQuery('#avatar-crop-preview').css({
                 <?php if ( $image ) : ?>
-                    width: Math.round(rx * <?php echo $image[0] ?>) + 'px',
-                    height: Math.round(ry * <?php echo $image[1] ?>) + 'px',
+                    width: Math.round(rx * <?php echo $image[0]; ?>) + 'px',
+                    height: Math.round(ry * <?php echo $image[1]; ?>) + 'px',
                 <?php endif; ?>
                     marginLeft: '-' + Math.round(rx * coords.x) + 'px',