Ticket #15611: adminbar.patch
| File adminbar.patch, 13.4 KB (added by ocean90, 3 years ago) |
|---|
-
wp-includes/admin-bar.php
67 67 add_action( 'admin_footer', 'wp_admin_bar_render', 1000 ); 68 68 69 69 /** 70 * Show the logged in user's gravatar as a separator.71 *72 * @since 3.1.073 */74 function wp_admin_bar_me_separator() {75 global $wp_admin_bar;76 $user_id = get_current_user_id();77 if ( 0 != $user_id )78 $wp_admin_bar->add_menu( array( 'id' => 'me', 'title' => get_avatar( get_current_user_id(), 16 ), 'href' => get_edit_profile_url( $user_id ), ) );79 }80 81 /**82 70 * Add the "My Account" menu and all submenus. 83 71 * 84 72 * @since 3.1.0 … … 90 78 91 79 if ( 0 != $user_id ) { 92 80 /* Add the 'My Account' menu */ 93 $wp_admin_bar->add_menu( array( 'id' => 'my-account', 'title' => $user_identity, 'href' => get_edit_profile_url( $user_id ) ) ); 81 $avatar = get_avatar( get_current_user_id(), 16 ); 82 $wp_admin_bar->add_menu( array( 'id' => 'my-account', 'title' => $avatar . $user_identity, 'href' => get_edit_profile_url( $user_id ) ) ); 94 83 95 84 /* Add the "My Account" sub menus */ 96 85 $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Edit My Profile' ), 'href' => get_edit_profile_url( $user_id ) ) ); … … 147 136 } 148 137 149 138 /** 150 * Show the blavatar of the current site as a separator.151 *152 * @since 3.1.0153 */154 function wp_admin_bar_blog_separator() {155 global $wp_admin_bar, $current_blog;156 $default = includes_url('images/wpmini-blue.png');157 $wp_admin_bar->add_menu( array( 'id' => 'blog', 'title' => '<img class="avatar" src="' . $default . '" alt="' . esc_attr__( 'Current site avatar' ) . '" width="16" height="16" />', 'href' => home_url(), ) );158 }159 160 161 /**162 139 * Provide a shortlink. 163 140 * 164 141 * @since 3.1.0 … … 192 169 } 193 170 } 194 171 172 /** 173 * Add "Add New" menu. 174 * 175 * @since 3.1.0 176 */ 195 177 function wp_admin_bar_new_content_menu() { 196 178 global $wp_admin_bar; 197 179 … … 199 181 foreach ( (array) get_post_types( array( 'show_ui' => true ), 'objects' ) as $ptype_obj ) { 200 182 if ( true !== $ptype_obj->show_in_menu || ! current_user_can( $ptype_obj->cap->edit_posts ) ) 201 183 continue; 184 202 185 $actions[ 'post-new.php?post_type=' . $ptype_obj->name ] = array( $ptype_obj->labels->singular_name, $ptype_obj->cap->edit_posts, 'new-' . $ptype_obj->name ); 203 186 } 204 187 … … 212 195 } 213 196 } 214 197 198 /** 199 * Add edit comments link with awaiting moderation count bubble. 200 * 201 * @since 3.1.0 202 */ 215 203 function wp_admin_bar_comments_menu() { 216 204 global $wp_admin_bar; 217 205 … … 225 213 $wp_admin_bar->add_menu( array( 'id' => 'comments', 'title' => sprintf( __('Comments %s'), $awaiting_mod ), 'href' => admin_url('edit-comments.php') ) ); 226 214 } 227 215 216 /** 217 * Add "Appearance" menu with widget and nav menu submenu. 218 * 219 * @since 3.1.0 220 */ 228 221 function wp_admin_bar_appearance_menu() { 229 222 global $wp_admin_bar; 230 223 … … 243 236 $wp_admin_bar->add_menu( array( 'parent' => 'appearance', 'id' => 'menus', 'title' => __('Menus'), 'href' => admin_url('nav-menus.php') ) ); 244 237 } 245 238 239 /** 240 * Provide an update link if theme/plugin/core updates are available. 241 * 242 * @since 3.1.0 243 */ 246 244 function wp_admin_bar_updates_menu() { 247 245 global $wp_admin_bar; 248 246 -
wp-includes/css/admin-bar-rtl.dev.css
29 29 border-left-color: #686868; 30 30 } 31 31 32 #wpadminbar .quicklinks li.ab-m e a img.avatar{33 margin: 5px -4px 0 2px;32 #wpadminbar .quicklinks li.ab-my-account a img.avatar { 33 margin: -2px -5px 0 23px; 34 34 } 35 35 36 #wpadminbar .quicklinks li.ab-my-account ul { 37 left: auto; 38 right: 30px; 39 } 40 36 41 #wpadminbar .quicklinks .menupop li:hover > ul, 37 42 #wpadminbar .quicklinks .menupop li.hover > ul { 38 43 margin-right: 100%; … … 40 45 } 41 46 42 47 #wpadminbar .quicklinks .menupop a > span { 43 background: url(../images/admin-bar-sprite-rtl.png?d= 08102010) 0 100.4%no-repeat;48 background: url(../images/admin-bar-sprite-rtl.png?d=11122010) left -58px no-repeat; 44 49 padding-right: 0; 45 50 padding-left: .8em; 46 51 } 47 52 48 53 #wpadminbar .quicklinks .menupop ul li a > span { 49 background: url(../images/admin-bar-sprite-rtl.png?d= 08102010) 0% 97.2%no-repeat;54 background: url(../images/admin-bar-sprite-rtl.png?d=11122010) left -29px no-repeat; 50 55 padding-right: 0; 51 56 padding-left: 1.5em; 52 57 } … … 55 60 font-family: Tahoma, Arial, Helvetica, sans-serif; 56 61 } 57 62 58 #wpadminbar .quicklinks li:hover {59 background: #555 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -282px repeat-x;60 }61 62 #wpadminbar .quicklinks .menupop li:hover {63 background: #888 url(../images/admin-bar-sprite-rtl.png?d=08102010) 0 -222px repeat-x;64 }65 66 63 #wpadminbar .quicklinks .menupop li a img.blavatar { 67 64 margin-right: 0; 68 65 margin-left: 8px; 69 66 } 70 67 71 #wpadminbar .quicklinks li.ab-m e> a {72 background: url(../images/admin-bar-sprite-rtl.png?d= 08102010) 0% 59.8%no-repeat;68 #wpadminbar .quicklinks li.ab-my-account > a { 69 background: url(../images/admin-bar-sprite-rtl.png?d=11122010) top right no-repeat; 73 70 } 74 71 75 72 #wpadminbar .quicklinks li.ab-my-account > a { … … 82 79 } 83 80 84 81 #wpadminbar #adminbarsearch .adminbar-input { 85 background: #ddd url(../images/admin-bar-sprite-rtl.png?d=08102010) right top no-repeat;86 82 float: right; 87 83 font-family: Tahoma, Arial, Helvetica, sans-serif; 88 84 margin-right: 0; 89 85 margin-left: 3px; 86 -moz-box-shadow: inset 2px -2px 1px #cdcdcd; 87 -webkit-box-shadow: inset -2px 2px 1px #cdcdcd; 88 box-shadow: inset 2px -2px 1px #cdcdcd; 90 89 } 91 90 92 91 #wpadminbar #adminbarsearch .adminbar-button { 93 background: url(../images/admin-bar-sprite-rtl.png?d=08102010) left -107px no-repeat;94 92 float: right; 95 padding: 0 0 0 14px;96 }97 98 #wpadminbar #adminbarsearch .adminbar-button span {99 background: url(../images/admin-bar-sprite-rtl.png?d=08102010) right -69px no-repeat;100 padding: 3px 14px 0 0;101 93 font-family: Tahoma, Arial, Helvetica, sans-serif; 102 94 } 103 104 #wpadminbar #adminbarsearch .adminbar-button:active {105 background-position: left -184px;106 }107 108 #wpadminbar #adminbarsearch .adminbar-button:active span {109 background-position: right -146px;110 } -
wp-includes/css/admin-bar.dev.css
1 1 #wpadminbar { 2 2 direction: ltr; 3 background: #666 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x; 3 background: #666; 4 background: -moz-linear-gradient(bottom, #666, #7f7f7f); 5 background: -webkit-gradient(linear, left bottom, left top, from(#666), to(#7f7f7f)); 4 6 color: #ddd; 5 7 font: 12px Arial, Helvetica, sans-serif; 6 8 height: 28px; 7 left: 0;8 9 margin: 0; 10 padding: 0; 9 11 position: fixed; 10 12 top: 0; 13 left: 0; 11 14 width: 100%; 12 15 z-index: 99999; 13 16 min-width: 960px; … … 75 78 border-top: none; 76 79 float: none; 77 80 } 81 78 82 #wpadminbar .quicklinks .menupop ul li { 79 83 float: none; 80 84 } … … 105 109 } 106 110 107 111 #wpadminbar .quicklinks li:hover { 108 background: #555 url(../images/admin-bar-sprite.png?d=08102010) 0 -282px repeat-x; 112 background: #555; 113 background: -moz-linear-gradient(bottom, #555, #3e3e3e); 114 background: -webkit-gradient(linear, left bottom, left top, from(#555), to(#3e3e3e)); 109 115 } 110 116 111 117 #wpadminbar .quicklinks .menupop li:hover { 112 background: #888 url(../images/admin-bar-sprite.png?d=08102010) 0 -222px repeat-x; 118 background: #888; 119 background: -moz-linear-gradient(bottom, #888, #9d9d9d); 120 background: -webkit-gradient(linear, left bottom, left top, from(#888), to(#9d9d9d)); 113 121 } 114 122 115 123 #wpadminbar .quicklinks .menupop a > span { 116 background: url(../images/admin-bar-sprite.png?d= 08102010) 100% 100.4%no-repeat;124 background: url(../images/admin-bar-sprite.png?d=11122010) right -58px no-repeat; 117 125 padding-right: .8em; 118 126 } 119 127 120 128 #wpadminbar .quicklinks .menupop ul li a > span { 121 129 display: block; 122 background: url(../images/admin-bar-sprite.png?d= 08102010) 100% 97.2%no-repeat;130 background: url(../images/admin-bar-sprite.png?d=11122010) right -29px no-repeat; 123 131 padding-right: 1.5em; 124 132 } 125 133 … … 144 152 color: #000; 145 153 } 146 154 147 #wpadminbar .quicklinks li.ab-me a {148 border: none;149 background: url(../images/admin-bar-sprite.png?d=08102010) 100% 59.8% no-repeat;150 }151 152 155 #wpadminbar .quicklinks li.ab-my-account > a { 153 156 border-left: none; 157 background: url(../images/admin-bar-sprite.png?d=11122010) top left no-repeat; 154 158 } 155 159 156 #wpadminbar .quicklinks li.ab-me:hover { 157 background: none; 158 } 159 160 #wpadminbar .quicklinks li.ab-me a img.avatar { 160 #wpadminbar .quicklinks li.ab-my-account a img.avatar { 161 161 border: 1px solid #999; 162 margin: 5px 2px 0 -4px; 162 vertical-align: middle; 163 margin: -2px 23px 0 -5px; 163 164 background: #eee; 164 width: 16px;165 height: 16px;166 165 } 167 166 167 #wpadminbar .quicklinks li.ab-my-account ul { 168 left: 30px; 169 } 170 168 171 #wpadminbar .quicklinks .menupop li a img.blavatar { 169 172 vertical-align: middle; 170 173 margin-right: 8px; … … 177 180 } 178 181 179 182 #wpadminbar #adminbarsearch .adminbar-input { 180 color: #555;181 183 width: 140px; 182 display: block;183 184 float: left; 184 185 font: 12px Arial, Helvetica, sans-serif; 186 color: #555; 187 text-shadow: 0 1px 0 #fff; 185 188 border: 1px solid #626262; 186 189 padding: 2px 3px; 187 190 margin: 0 3px 0 0; 188 background: #ddd url(../images/admin-bar-sprite.png?d=08102010) top left no-repeat; 191 background-color: #ddd; 192 -moz-box-shadow: inset 2px 2px 1px #cdcdcd; 193 -webkit-box-shadow: inset 2px 2px 1px #cdcdcd; 194 box-shadow: inset 2px 2px 1px #cdcdcd; 189 195 -webkit-border-radius: 0; 190 196 -khtml-border-radius: 0; 191 197 -moz-border-radius: 0; 192 198 border-radius: 0; 199 -moz-box-sizing: border-box; 200 -webkit-box-sizing: border-box; 201 -ms-box-sizing: border-box; 202 box-sizing: border-box; 193 203 outline: none; 194 text-shadow: 0 1px 0 #fff;195 204 } 196 205 197 206 #wpadminbar #adminbarsearch .adminbar-button { 198 position: relative; 199 border: 0; 207 font: bold 12px Arial, Helvetica, sans-serif; 208 color: #444; 209 text-shadow: 0px 1px 0px #eee; 200 210 cursor: pointer; 201 overflow: visible;202 margin: 0 !important;203 211 float: left; 204 background: url(../images/admin-bar-sprite.png?d=08102010) right -107px no-repeat; 205 padding: 0 14px 0 0; 206 text-align: center; 207 outline: none; 212 background: #aaa; 213 background: -moz-linear-gradient(bottom, #aaa, #cecece); 214 background: -webkit-gradient(linear, left bottom, left top, from(#aaa), to(#cecece)); 215 -webkit-border-radius: 10px; 216 -khtml-border-radius: 10px; 217 -moz-border-radius: 10px; 218 border-radius: 10px; 219 border: 1px solid #626262; 220 padding: 2px 13px; 221 margin: 0; 208 222 } 209 223 210 #wpadminbar #adminbarsearch .adminbar-button span {211 position: relative;212 display: block;213 white-space: nowrap;214 height: 19px;215 background: url(../images/admin-bar-sprite.png?d=08102010) left -69px no-repeat;216 padding: 3px 0 0 14px;217 font: 12px Arial, Helvetica, sans-serif;218 font-weight: bold;219 color: #444;220 text-shadow: 0px 1px 0px #eee;221 }222 223 224 #wpadminbar #adminbarsearch .adminbar-button:active { 224 background-position: right -184px; 225 text-shadow: 0px 1px 0px #eee; 225 background: #a0a0a0; 226 background:-moz-linear-gradient(bottom, #a0a0a0, #c1c1c1); 227 background:-webkit-gradient(linear, left bottom, left top, from(#a0a0a0), to(#c1c1c1)); 228 -moz-box-shadow: inset 1px 1px 1px #9b9b9b; 229 -webkit-box-shadow: inset 1px 1px 1px #9b9b9b; 230 box-shadow: inset 1px 1px 1px #9b9b9b; 226 231 } 227 232 228 #wpadminbar #adminbarsearch .adminbar-button:hover span{233 #wpadminbar #adminbarsearch .adminbar-button:hover { 229 234 color: #000; 230 235 } 231 236 232 #wpadminbar #adminbarsearch .adminbar-button:active span {233 background-position: left -146px;234 }235 236 237 #wpadminbar #adminbarsearch .adminbar-button::-moz-focus-inner { 237 238 border: none; 238 239 } -
wp-includes/class-wp-admin-bar.php
101 101 <div id="adminbarsearch-wrap"> 102 102 <form action="<?php echo home_url(); ?>" method="get" id="adminbarsearch"> 103 103 <input class="adminbar-input" name="s" id="adminbar-search" type="text" value="" maxlength="150" /> 104 < button type="submit" class="adminbar-button"><span><?php _e('Search'); ?></span></button>104 <input type="submit" class="adminbar-button" value="<?php _e('Search'); ?>"/> 105 105 </form> 106 106 </div> 107 107 </div> … … 174 174 } 175 175 176 176 function add_menus() { 177 add_action( 'admin_bar_menu', 'wp_admin_bar_me_separator', 10 ); 178 add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 20 ); 179 add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 30 ); 180 add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 40 ); 181 add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 90 ); 182 add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 80 ); 177 add_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 10 ); 178 add_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 ); 179 add_action( 'admin_bar_menu', 'wp_admin_bar_edit_menu', 30 ); 180 add_action( 'admin_bar_menu', 'wp_admin_bar_shortlink_menu', 80 ); 181 add_action( 'admin_bar_menu', 'wp_admin_bar_updates_menu', 70 ); 183 182 184 183 if ( !is_network_admin() && !is_user_admin() ) { 185 add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 50 );186 add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 60 );187 add_action( 'admin_bar_menu', 'wp_admin_bar_appearance_menu', 70 );184 add_action( 'admin_bar_menu', 'wp_admin_bar_new_content_menu', 40 ); 185 add_action( 'admin_bar_menu', 'wp_admin_bar_comments_menu', 50 ); 186 add_action( 'admin_bar_menu', 'wp_admin_bar_appearance_menu', 60 ); 188 187 } 189 188 190 189 do_action( 'add_admin_bar_menus' );
