<!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][5739] trunk: Remove unused images and add new ones from Ben; update CSS to use new icons and images; welcome the pinata for Activity.</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/5739">5739</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-02-12 21:59:53 +0000 (Sun, 12 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused images and add new ones from Ben; update CSS to use new icons and images; welcome the pinata for Activity. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4003">#4003</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityadminphp">trunk/bp-activity/bp-activity-admin.php</a></li>
<li><a href="#trunkbpcoreadminbpcorefunctionsphp">trunk/bp-core/admin/bp-core-functions.php</a></li>
<li><a href="#trunkbpcoreadminbpcoreupdatephp">trunk/bp-core/admin/bp-core-update.php</a></li>
<li><a href="#trunkbpcorecssadmindevcss">trunk/bp-core/css/admin.dev.css</a></li>
<li><a href="#trunkbpcoreimagesicons32png">trunk/bp-core/images/icons32.png</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbpcoreimagesmenupng">trunk/bp-core/images/menu.png</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkbpcoreimagesadminbarspritertlpng">trunk/bp-core/images/admin-bar-sprite-rtl.png</a></li>
<li><a href="#trunkbpcoreimagesadminbarspritepng">trunk/bp-core/images/admin-bar-sprite.png</a></li>
<li><a href="#trunkbpcoreimageslogocolumnheaderpng">trunk/bp-core/images/logo-column-header.png</a></li>
<li><a href="#trunkbpcoreimageslogopng">trunk/bp-core/images/logo.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-admin.php (5738 => 5739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-admin.php        2012-02-12 20:36:08 UTC (rev 5738)
+++ trunk/bp-activity/bp-activity-admin.php        2012-02-12 21:59:53 UTC (rev 5739)
</span><span class="lines">@@ -554,7 +554,7 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx">         <div class="wrap">
</span><del>-                <?php screen_icon( 'buddypress' ); ?>
</del><ins>+                <?php screen_icon( 'buddypress-activity' ); ?>
</ins><span class="cx">                 <h2><?php printf( __( 'Editing Activity (ID #%s)', 'buddypress' ), number_format_i18n( (int) $_REQUEST['aid'] ) ); ?></h2>
</span><span class="cx">
</span><span class="cx">                 <?php if ( ! empty( $activity ) ) : ?>
</span><span class="lines">@@ -817,7 +817,7 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx">         <div class="wrap">
</span><del>-                <?php screen_icon( 'buddypress' ); ?>
</del><ins>+                <?php screen_icon( 'buddypress-activity' ); ?>
</ins><span class="cx">                 <h2>
</span><span class="cx">                         <?php if ( !empty( $_REQUEST['aid'] ) ) : ?>
</span><span class="cx">                                 <?php printf( __( 'Activity related to ID #%s', 'buddypress' ), number_format_i18n( (int) $_REQUEST['aid'] ) ); ?>
</span></span></pre></div>
<a id="trunkbpcoreadminbpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-functions.php (5738 => 5739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-functions.php        2012-02-12 20:36:08 UTC (rev 5738)
+++ trunk/bp-core/admin/bp-core-functions.php        2012-02-12 21:59:53 UTC (rev 5739)
</span><span class="lines">@@ -331,56 +331,6 @@
</span><span class="cx"> /** UI/Styling ****************************************************************/
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * bp_core_admin_menu_icon_css()
- *
- * Add a hover-able icon to the "BuddyPress" wp-admin area menu.
- *
- * @package BuddyPress Core
- */
-function bp_core_admin_menu_icon_css() {
-        global $bp; ?>
-
-        <style type="text/css">
-                /* 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-components .wp-menu-image a img,
-                ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img {
-                        display: none;
-                }
-
-                ul#adminmenu li.toplevel_page_bp-components .wp-menu-image a,
-                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-components:hover .wp-menu-image a,
-                ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a,
-                ul#adminmenu li.toplevel_page_bp-components.wp-has-current-submenu .wp-menu-image a,
-                ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image a {
-                        background-position: -1px 0;
-                }
-
-                /* Activity Icon */
-                ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image a img { display: none; }
-                ul#adminmenu li.toplevel_page_bp-activity .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-activity:hover .wp-menu-image a,
-                ul#adminmenu li.toplevel_page_bp-activity.wp-has-current-submenu .wp-menu-image a {
-                        background-position: -1px 0;
-                }
-        </style>
-
-<?php
-}
-add_action( 'admin_head', 'bp_core_admin_menu_icon_css' );
-
-/**
</del><span class="cx"> * Loads admin panel styles and scripts.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span></span></pre></div>
<a id="trunkbpcoreadminbpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-update.php (5738 => 5739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php        2012-02-12 20:36:08 UTC (rev 5738)
+++ trunk/bp-core/admin/bp-core-update.php        2012-02-12 21:59:53 UTC (rev 5739)
</span><span class="lines">@@ -1192,27 +1192,7 @@
</span><span class="cx">         }
</span><span class="cx">
</span><span class="cx">         wp_enqueue_script( 'thickbox' );
</span><del>-        wp_enqueue_style( 'thickbox' ); ?>
-
-        <style type="text/css">
-                /* 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-config .wp-menu-image a img { display: none; }
-                ul#adminmenu li.toplevel_page_bp-general-config .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-config:hover .wp-menu-image a,
-                ul#adminmenu li.toplevel_page_bp-general-config.wp-has-current-submenu .wp-menu-image a {
-                        background-position: -1px 0;
-                }
-        </style>
-
-<?php
</del><ins>+        wp_enqueue_style( 'thickbox' );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'admin_head', 'bp_core_update_add_admin_menu_styles' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorecssadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/css/admin.dev.css (5738 => 5739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/css/admin.dev.css        2012-02-12 20:36:08 UTC (rev 5738)
+++ trunk/bp-core/css/admin.dev.css        2012-02-12 21:59:53 UTC (rev 5739)
</span><span class="lines">@@ -1,12 +1,73 @@
</span><ins>+
+/* Icon 32
+------------------------------------------------------------------------------*/
+
</ins><span class="cx"> div#icon-buddypress {
</span><del>-        background: url( ../images/icons32.png ) no-repeat -4px 0px;
</del><ins>+        background: url( ../images/icons32.png ) no-repeat -370px -6px;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+div#icon-buddypress-activity {
+        background: url( ../images/icons32.png ) no-repeat -10px -6px;
+}
+
+/* Menu Icons
+------------------------------------------------------------------------------*/
+
+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( '../images/menu.png' ) !important;
+        background-position: -178pxpx -34px;
+}
+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: -178px -2px;
+}
+
+/* Backpat Icon */
+ul#adminmenu li.toplevel_page_bp-components .wp-menu-image a img,
+ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img {
+        display: none;
+}
+
+ul#adminmenu li.toplevel_page_bp-components .wp-menu-image a,
+ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a {
+        background-image: url( '../images/menu.png' ) !important;
+        background-position: -178px -34px;
+}
+
+ul#adminmenu li.toplevel_page_bp-components:hover .wp-menu-image a,
+ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a,
+ul#adminmenu li.toplevel_page_bp-components.wp-has-current-submenu .wp-menu-image a,
+ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image a {
+        background-position: -178px -2px;
+}
+
+/* Activity Icon */
+ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image a img {
+        display: none;
+}
+ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image a {
+        background-image: url( '../images/menu.png' ) !important;
+        background-position: 0px -34px;
+}
+ul#adminmenu li.toplevel_page_bp-activity:hover .wp-menu-image a,
+ul#adminmenu li.toplevel_page_bp-activity.current .wp-menu-image a,
+ul#adminmenu li.toplevel_page_bp-activity.wp-has-current-submenu .wp-menu-image a {
+        background-position: 0 -2px;
+}
+
+/* General Admin Styling
+------------------------------------------------------------------------------*/
+
</ins><span class="cx"> div#bp-admin {
</span><span class="cx">         color: #555;
</span><span class="cx">         min-width: 680px;
</span><del>-        }
-        div#bp-admin p { line-height: 170%; }
</del><ins>+}
+div#bp-admin p {
+        line-height: 170%;
+}
</ins><span class="cx">
</span><span class="cx"> form#bp-admin-form {
</span><span class="cx">         margin: 0 10px;
</span><span class="lines">@@ -51,6 +112,7 @@
</span><span class="cx">                                         background: #fff;
</span><span class="cx">                                         color: #555;
</span><span class="cx">                                 }
</span><ins>+
</ins><span class="cx">         div#bp-admin-nav ol li span.complete {
</span><span class="cx">                 background: url( ../images/completed.gif ) center left no-repeat;
</span><span class="cx">                 padding: 6px;
</span></span></pre></div>
<a id="trunkbpcoreimagesadminbarspritertlpng"></a>
<div class="binary"><h4>Deleted: trunk/bp-core/images/admin-bar-sprite-rtl.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkbpcoreimagesadminbarspritepng"></a>
<div class="binary"><h4>Deleted: trunk/bp-core/images/admin-bar-sprite.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkbpcoreimagesicons32png"></a>
<div class="binary"><h4>Modified: trunk/bp-core/images/icons32.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkbpcoreimageslogocolumnheaderpng"></a>
<div class="delfile"><h4>Deleted: trunk/bp-core/images/logo-column-header.png (5738 => 5739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/images/logo-column-header.png        2012-02-12 20:36:08 UTC (rev 5738)
+++ trunk/bp-core/images/logo-column-header.png        2012-02-12 21:59:53 UTC (rev 5739)
</span><span class="lines">@@ -1,18 +0,0 @@
</span><del>-\x89PNG
-
-
-IHDR B \x95 \xEEiCCPICC Profile x\x85T\xCFkA\xFE6n\xA9\xD0"Zk\xB2x\x90"IY\xABhE\xD46\xFDbk\xDB\xB6E\x90d3I\xD6n6\xEB\xEE&\xB5\xA5\x88\xE4\xE2\xD1*\xDEE\xED\xA1\xFF\x80z\xF0d/J\x85ZE(ޫ(b\xA1-\xF1\xCDnL\xB6\xA5\xEA\xC0\xCE~\xF3\xDE7\xEF}ov\xDF
-r\xD24\xF5\x80\xE4
-\xC7R\xA2il|Bj\xFC\x88 \x8E\xA2        A4%U\xDB\xECN$A\x83s\xF9{\xE7\xD8z\x81[V\xC3{\xFBw\xB2w\xAD\x9AҶ\x9A\x84\xFD@\xE0G\x9A\xD9*\xB0\xEFq
-Y\x88<ߡ)\xC7t\xDF\xE3\xD8\xF2\xEC\x8F9Nyx\xC1\xB5+=\xC4Y"|@5-\xCEM\xB8S\xCD%\xD3@\x83H8\x94\xF5qR>\x9C\x94\xD7inf\xC6\xC8\xBDO\x90\xA6\xBB\xCC\xEE\xABb\xA1\x9CN\xF6\x90\xBD\x9D\xF4~N\xB3\xDE>\xC2!\xC2\xAD?F\xB8\x8D\x9E\xF5\x8C\xD5?\xE2a\xE1\xA4\xE6Ć=5\xF4\xF8`\xB7\xA9\xF85\xC2_M'\xA2Tq\xD9.
-\xF1\x98\xAE\xFDV\xF2J\x82p\x908\xCAda\x80sZHO\xD7Ln\xF8\xBA\x87}&\xD7\xAF\xE2wVQ\xE1y\x8Fg\xDE\xD4\xDD\xEFE\xDA\xAF0\x9A
-HPEa\x98\xB0P@\x86<14\xB2r?#\xAB\x93{2u$j\xBBtbD\xB1A{6\xDC=\xB7Q\xA4\xDD<\xFE("q\x94C\xB5\x92\xFCA\xFE*\xAF\xC9O\xE5y\xF9\xCB\\xB0\xD8V\x{1D4B5B}\x9A\xBA\xF2\xE0;\xC5噹\xD7\xD3\xC8\xE3sM^|\x95\xD4v\x93WG\x96\xACyz\xBC\x9A\xEC?\xECW\x971\xE6\x825\x8F\xC4s\xB0\xFB\xF1-_\x95̗)\x8C\xC5\xE3U\xF3\xEAK\x84uZ17ߟl;=\xE2.\xCF.\xB5\xD6s\xAD\x89\x8B7V\x9B\x97g\xFDjH\xFB\x93\xE6U\xF9O^\xF5\xF1\xFCg\xCD\xC4c\xE2)1&v\x8A\xE7!\x89\x97\xC5.\xF1\x92\xD8K\xAB\xE2`m\xC7\x9D\x95\x86)\xD2m\x91\xFA$\xD5``\x9
A\xBC\xF5/]?[x\xBDF\xF5Q\x94\xCC\xD2T\x89\xF7\xC2*d4\x9D\xB9o\xFA\x8F\xDB\xC7\xFC\xE4\xF7\x8A\xE7\x9F(/l\xE0ș\xBAmSq\xEF\xA1e\xA5ns\xAE\xBF\xD1}\xF0\xB6nk\xA3~8\xFCX<\xAB\xADR5\x9F \xBCv\x87z\xE8)\x98Ӗ\x96\xCD9R\x87,\x9F\x93\xBA\xE9\xCAbR\xCCP\xDBCRR\xD7%\xD7eK\xB3\x99Ub\xE9vؙ\xD3n\xA19B\xF7ħJe\x93\xFA\xAF\xF1\xB0\xFD\xB0R\xF9\xF9\xACR\xD9~Nց\x97\xFAo\xC0\xBC\xFDE\xC0x\x8B\x89         pHYs