Ticket #2395: #2395.patch

bp-core.php

@@ -1804 +1804 @@
                 add_action( $hookname, $function );
 
         if ( empty($icon_url) )
-                $icon_url = 'images/generic.png';
+                $icon_url = 'div';
         elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') )
                 $icon_url = 'https://' . substr($icon_url, 7);
 

bp-core/admin/bp-core-admin.php

@@ -49 +49 @@
 
         <div class="wrap">
 
+                <div class="icon32" id="icon-buddypress"><br></div>
+
                 <h2><?php _e( 'BuddyPress Settings', 'buddypress' ) ?></h2>
 
                 <?php if ( isset( $_POST['bp-admin'] ) ) : ?>
@@ -173 +175 @@
 
         <div class="wrap">
 
+                <div class="icon32" id="icon-buddypress"><br></div>
+
                 <h2><?php _e( 'BuddyPress Component Setup', 'buddypress' ) ?></h2>
 
                 <?php if ( isset( $_POST['bp-admin-component-submit'] ) ) : ?>

bp-core/bp-core-cssjs.php

@@ -23 +23 @@
                         wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_admin_bar_css', BP_PLUGIN_URL . '/bp-themes/bp-default/_inc/css/adminbar.css' ) );
         }
 }
-add_action( 'init', 'bp_core_add_admin_bar_css' );
+add_action( (is_admin()) ? 'admin_print_styles' : 'init' ,      'bp_core_add_admin_bar_css' );
 
 /**
  * bp_core_admin_menu_icon_css()
@@ -33 +33 @@
  * @package BuddyPress Core
  */
 function bp_core_admin_menu_icon_css() {
-        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 { background-position: -1px 0; }
-                ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img { display: none; }
-        </style>
-<?php
+        $pathcss                = BP_PLUGIN_DIR . '/bp-core/css/colors_' . get_user_option('admin_color') . '.css';
+        $css_url                = BP_PLUGIN_URL . '/bp-core/css/colors_' . get_user_option('admin_color') . '.css';
+        $css_url_default        = BP_PLUGIN_URL . '/bp-core/css/colors_fresh.css';
+        $css_url                = (is_file($pathcss)) ? $css_url : $css_url_default;
+        wp_register_style ( 'BuddyPress_colors',        $css_url);
+        wp_enqueue_style  ( 'BuddyPress_colors' );
 }
-add_action( 'admin_head', 'bp_core_admin_menu_icon_css' );
+add_action( 'admin_print_styles', 'bp_core_admin_menu_icon_css' );
 
 function bp_core_confirmation_js() {
         global $current_blog;

bp-core/css/colors_classic.css

@@ +1 @@
+ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a { 
+        background-image: url(../images/bp_admin_menu_icon-vs.png);
+        background-position: -1px -32px; 
+}
+ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a { 
+        background-position: -1px 0; 
+}
+ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img { 
+        display: none; 
+}
+
+#icon-buddypress {
+        background:transparent url(../images/icon32-vs.png) no-repeat;
+}
+ No newline at end of file

bp-core/css/colors_fresh.css

@@ +1 @@
+ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a { 
+        background-image: url(../images/bp_admin_menu_icon.png);
+        background-position: -1px -32px; 
+}
+ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a { 
+        background-position: -1px 0; 
+}
+ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img { 
+        display: none; 
+}
+
+#icon-buddypress {
+        background:transparent url(../images/icon32.png);
+}
+ No newline at end of file

bp-forums/bp-forums-admin.php

@@ -5 +5 @@
 ?>
         <div class="wrap">
 
+                <div class="icon32" id="icon-buddypress"><br></div>
+
                 <h2><?php _e( 'Forums Setup', 'buddypress' ) ?></h2>
 
                 <?php if ( isset( $_POST['submit'] ) ) : ?>

bp-themes/bp-default/_inc/options.php

@@ -24 +24 @@
         } ?>
 
                 <div class="wrap">
+
+                    <div class="icon32" id="icon-buddypress"><br></div>
+
                     <?php echo "<h2>" . __( 'Theme Options', 'buddypress' ) . "</h2>"; ?>
 
                         <form name="options" method="post" action="">

bp-xprofile/bp-xprofile-admin.php

@@ -41 +41 @@
 ?>
 
         <div class="wrap">
-                <div class="icon32" id="icon-tools"><br></div>
+                <div class="icon32" id="icon-buddypress"><br></div>
                 <h2>
                         <?php _e( 'Profile Field Setup', 'buddypress'); ?>
                         <a id="add_group" class="button add-new-h2" href="admin.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Group', 'buddypress' ); ?></a>

bp-xprofile/bp-xprofile-classes.php

@@ -190 +190 @@
                 }
 ?>
                 <div class="wrap">
-                        <div class="icon32" id="icon-tools"><br></div>
+
+                        <div class="icon32" id="icon-buddypress"><br></div>
+
                         <h2><?php echo $title; ?></h2>
                         <p><?php _e( 'Fields marked * are required', 'buddypress' ) ?></p>
 
@@ -592 +594 @@
                 }
 ?>
         <div class="wrap">
-                <div id="icon-users" class="icon32"><br /></div>
+
+                <div class="icon32" id="icon-buddypress"><br></div>
+
                 <h2><?php echo $title; ?></h2>
                 <p><?php _e( 'Fields marked * are required', 'buddypress' ) ?></p>