Ticket #26601: 26601.10.patch
File 26601.10.patch, 20.4 KB (added by , 9 years ago) |
---|
-
src/wp-admin/css/common.css
583 583 584 584 .wrap h1, 585 585 .wrap h2 { 586 display: inline-block; 586 587 font-size: 23px; 587 588 font-weight: 400; 588 padding: 9px 15px 4px 0;589 padding: 9px 7px 4px 0; 589 590 line-height: 29px; 590 591 } 591 592 … … 592 593 .subtitle { 593 594 color: #777; 594 595 font-size: 14px; 595 padding-left: 2 5px;596 padding-left: 20px; 596 597 } 597 598 598 599 .wrap .add-new-h2, /* deprecated */ … … 599 600 .wrap .add-new-h2:active, /* deprecated */ 600 601 .wrap .page-title-action, 601 602 .wrap .page-title-action:active { 602 margin-left: 4px; 603 padding: 4px 8px; 603 display: inline-block; 604 604 position: relative; 605 605 top: -3px; 606 border: none; 607 margin-bottom: 6px; 608 padding: 4px 8px; 606 609 text-decoration: none; 607 border: none;608 610 -webkit-border-radius: 2px; 609 611 border-radius: 2px; 610 612 background: #e0e0e0; … … 620 622 } 621 623 622 624 .wrap h1.long-header { 625 display: block; /* post revisions screen */ 623 626 padding-right: 0; 624 627 } 625 628 … … 990 993 .title-count { 991 994 display: inline; 992 995 top: -3px; 993 margin-left: 5px; 994 margin-right: 20px; 996 margin-right: 25px; 995 997 } 996 998 997 999 .filter-items { -
src/wp-admin/css/themes.css
13 13 } 14 14 15 15 .themes-php .wrap h1 { 16 float: left;17 16 margin-bottom: 15px; 18 17 } 19 18 -
src/wp-admin/edit-comments.php
140 140 ?> 141 141 142 142 <div class="wrap"> 143 <div class="header"> 143 144 <h1><?php 144 if ( $post_id ) 145 echo sprintf( __( 'Comments on “%s”' ),145 if ( $post_id ) { 146 printf( __( 'Comments on “%s”' ), 146 147 sprintf( '<a href="%s">%s</a>', 147 148 get_edit_post_link( $post_id ), 148 149 wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' ) 149 150 ) 150 151 ); 151 else 152 } else { 152 153 _e( 'Comments' ); 153 154 if ( isset($_REQUEST['s']) && $_REQUEST['s'] ) 155 echo '<span class="subtitle">' . sprintf( __( 'Search results for “%s”' ), wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '…' ) ) . '</span>'; ?> 156 </h1> 157 154 } ?></h1> 158 155 <?php 156 if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] ) { 157 echo '<span class="subtitle">' . sprintf( __( 'Search results for “%s”' ), wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '…' ) ) . '</span>'; 158 } 159 ?> 160 </div> 161 <?php 159 162 if ( isset( $_REQUEST['error'] ) ) { 160 163 $error = (int) $_REQUEST['error']; 161 164 $error_msg = ''; -
src/wp-admin/edit-form-advanced.php
414 414 ?> 415 415 416 416 <div class="wrap"> 417 < h1><?php418 echo esc_html( $title ); 419 if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) ) 417 <div class="header"> 418 <h1><?php echo esc_html( $title ); ?></h1> 419 <?php if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) ) { 420 420 echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>'; 421 ?></h1> 421 } ?> 422 </div> 423 422 424 <?php if ( $notice ) : ?> 423 425 <div id="notice" class="notice notice-warning"><p id="has-newer-autosave"><?php echo $notice ?></p></div> 424 426 <?php endif; ?> -
src/wp-admin/edit-link-form.php
70 70 ?> 71 71 72 72 <div class="wrap"> 73 <h1><?php echo esc_html( $title ); ?> <a href="link-add.php" class="page-title-action"><?php echo esc_html_x('Add New', 'link'); ?></a></h1> 73 <div class="header"> 74 <h1><?php echo esc_html( $title ); ?></h1> 75 <a href="link-add.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'link' ); ?></a> 76 </div> 74 77 75 78 <?php if ( isset( $_GET['added'] ) ) : ?> 76 79 <div id="message" class="updated notice is-dismissible"><p><?php _e('Link added.'); ?></p></div> -
src/wp-admin/edit-tags.php
312 312 ?> 313 313 314 314 <div class="wrap nosubsub"> 315 <h1><?php echo esc_html( $title ); 316 if ( !empty($_REQUEST['s']) ) 317 printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?> 318 </h1> 315 <div class="header"> 316 <h1><?php echo esc_html( $title ); ?></h1><?php 317 if ( ! empty( $_REQUEST['s'] ) ) { 318 printf( '<span class="subtitle">' . __( 'Search results for “%s”' ) . '</span>', esc_html( wp_unslash( $_REQUEST['s'] ) ) ); 319 } ?> 320 </div> 319 321 320 322 <?php if ( $message ) : ?> 321 323 <div id="message" class="<?php echo $class; ?> notice is-dismissible"><p><?php echo $message; ?></p></div> -
src/wp-admin/edit.php
283 283 require_once( ABSPATH . 'wp-admin/admin-header.php' ); 284 284 ?> 285 285 <div class="wrap"> 286 <h1><?php 287 echo esc_html( $post_type_object->labels->name ); 288 if ( current_user_can( $post_type_object->cap->create_posts ) ) 286 <div class="header"> 287 <h1><?php echo esc_html( $post_type_object->labels->name ); ?></h1> 288 <?php 289 if ( current_user_can( $post_type_object->cap->create_posts ) ) { 289 290 echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>'; 290 if ( ! empty( $_REQUEST['s'] ) ) 291 printf( ' <span class="subtitle">' . __('Search results for “%s”') . '</span>', get_search_query() ); 292 ?></h1> 291 } 292 if ( ! empty( $_REQUEST['s'] ) ) { 293 printf( ' <span class="subtitle">' . __( 'Search results for “%s”' ) . '</span>', get_search_query() ); 294 } 295 ?> 296 </div> 293 297 294 298 <?php 295 299 // If we have a bulk message to issue: -
src/wp-admin/js/common.js
370 370 } 371 371 372 372 // Move .notice, .updated and .error alert boxes. Don't move boxes designed to be inline. 373 $firstHeading = $( '.wrap > h1:first ' );373 $firstHeading = $( '.wrap > h1:first, .wrap > .header:first' ); 374 374 375 // Back compatibility: if there is no H1 , apply to first H2.375 // Back compatibility: if there is no H1 or div.header, apply to first H2. 376 376 if ( ! $firstHeading.length ) { 377 377 $firstHeading = $( '.wrap h2:first' ); 378 378 } -
src/wp-admin/js/theme.js
84 84 }, 85 85 86 86 // Defines search element container 87 searchContainer: $( '#wpbody h1:first' ),87 searchContainer: $( '#wpbody .header:first' ), 88 88 89 89 // Search input and view 90 90 // for current theme collection -
src/wp-admin/link-manager.php
69 69 ?> 70 70 71 71 <div class="wrap nosubsub"> 72 <h1><?php echo esc_html( $title ); ?> <a href="link-add.php" class="page-title-action"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php 73 if ( !empty($_REQUEST['s']) ) 74 printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?> 75 </h1> 72 <div class="header"> 73 <h1><?php echo esc_html( $title ); ?></h1> 74 <a href="link-add.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'link' ); ?></a> 75 <?php 76 if ( ! empty( $_REQUEST['s'] ) ) { 77 printf( '<span class="subtitle">' . __( 'Search results for “%s”' ) . '</span>', esc_html( wp_unslash( $_REQUEST['s'] ) ) ); 78 } ?> 79 </div> 76 80 77 81 <?php 78 82 if ( isset($_REQUEST['deleted']) ) { -
src/wp-admin/media.php
103 103 ?> 104 104 105 105 <div class="wrap"> 106 <h1> 106 <div class="header"> 107 <h1><?php echo esc_html( $title ); ?></h1> 107 108 <?php 108 echo esc_html( $title );109 109 if ( current_user_can( 'upload_files' ) ) { ?> 110 <a href="media-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file'); ?></a>110 <a href="media-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file' ); ?></a> 111 111 <?php } ?> 112 </ h1>112 </div> 113 113 114 114 <form method="post" class="media-upload-form" id="media-single-form"> 115 115 <p class="submit" style="padding-bottom: 0;"> -
src/wp-admin/nav-menus.php
558 558 require_once( ABSPATH . 'wp-admin/admin-header.php' ); 559 559 ?> 560 560 <div class="wrap"> 561 <div class="header"> 561 562 <h1 class="nav-tab-wrapper"> 562 563 <a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a> 563 564 <?php if ( $num_locations && $menu_count ) : ?> … … 579 580 } 580 581 ?> 581 582 </h1> 583 </div> 582 584 <?php 583 585 foreach( $messages as $message ) : 584 586 echo $message . "\n"; -
src/wp-admin/network/sites.php
248 248 ?> 249 249 250 250 <div class="wrap"> 251 <h1><?php _e( 'Sites' ); ?> 251 <div class="header"> 252 <h1><?php _e( 'Sites' ); ?></h1> 252 253 253 254 <?php if ( current_user_can( 'create_sites') ) : ?> 254 255 <a href="<?php echo network_admin_url('site-new.php'); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'site' ); ?></a> … … 257 258 <?php if ( isset( $_REQUEST['s'] ) && $_REQUEST['s'] ) { 258 259 printf( '<span class="subtitle">' . __( 'Search results for “%s”' ) . '</span>', esc_html( $s ) ); 259 260 } ?> 260 </ h1>261 </div> 261 262 262 263 <?php echo $msg; ?> 263 264 -
src/wp-admin/network/themes.php
261 261 ?> 262 262 263 263 <div class="wrap"> 264 <h1><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="page-title-action"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php } 265 if ( $s ) 266 printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( $s ) ); ?> 267 </h1> 264 <div class="header"> 265 <h1><?php echo esc_html( $title ); ?></h1> 266 <?php 267 if ( current_user_can( 'install_themes' ) ) : ?> 268 <a href="theme-install.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'theme' ); ?></a><?php 269 endif; 268 270 271 if ( $s ) { 272 printf( '<span class="subtitle">' . __( 'Search results for “%s”' ) . '</span>', esc_html( $s ) ); 273 } 274 ?> 275 </div> 276 269 277 <?php 270 278 if ( isset( $_GET['enabled'] ) ) { 271 279 $enabled = absint( $_GET['enabled'] ); -
src/wp-admin/network/users.php
309 309 } 310 310 ?> 311 311 <div class="wrap"> 312 <h1><?php esc_html_e( 'Users' ); 312 <div class="header"> 313 <h1><?php esc_html_e( 'Users' ); ?></h1> 314 <?php 313 315 if ( current_user_can( 'create_users') ) : ?> 314 <a href="<?php echo network_admin_url( 'user-new.php'); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php316 <a href="<?php echo network_admin_url( 'user-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php 315 317 endif; 316 318 317 if ( !empty( $usersearch ) ) 318 printf( '<span class="subtitle">' . __( 'Search results for “%s”' ) . '</span>', esc_html( $usersearch ) ); 319 if ( ! empty( $usersearch ) ) { 320 printf( '<span class="subtitle">' . __( 'Search results for “%s”' ) . '</span>', esc_html( $usersearch ) ); 321 } 319 322 ?> 320 </ h1>323 </div> 321 324 322 325 <?php $wp_list_table->views(); ?> 323 326 -
src/wp-admin/plugin-install.php
94 94 include(ABSPATH . 'wp-admin/admin-header.php'); 95 95 ?> 96 96 <div class="wrap"> 97 <h1> 97 <div class="header"> 98 <h1><?php echo esc_html( $title ); ?></h1> 98 99 <?php 99 echo esc_html( $title );100 100 if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) { 101 101 if ( $tab === 'upload' ) { 102 102 $href = self_admin_url( 'plugin-install.php' ); … … 108 108 echo ' <a href="' . $href . '" class="upload page-title-action">' . $text . '</a>'; 109 109 } 110 110 ?> 111 </ h1>111 </div> 112 112 113 113 <?php 114 114 if ( $tab !== 'upload' ) { -
src/wp-admin/plugins.php
446 446 <?php endif; ?> 447 447 448 448 <div class="wrap"> 449 <h1><?php echo esc_html( $title ); 450 if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?> 451 <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'plugin'); ?></a> 449 <div class="header"> 450 <h1><?php echo esc_html( $title ); ?></h1> 451 <?php 452 if ( ( ! is_multisite() || is_network_admin() ) && current_user_can( 'install_plugins' ) ) { ?> 453 <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'plugin' ); ?></a> 452 454 <?php } 453 if ( $s ) 454 printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( $s ) ); ?> 455 </h1> 455 if ( $s ) { 456 printf( '<span class="subtitle">' . __( 'Search results for “%s”' ) . '</span>', esc_html( $s ) ); 457 } 458 ?> 459 </div> 456 460 457 461 <?php 458 462 /** -
src/wp-admin/theme-install.php
102 102 103 103 ?> 104 104 <div class="wrap"> 105 < h1><?php106 echo esc_html( $title );107 105 <div class="header"> 106 <h1><?php echo esc_html( $title ); ?></h1> 107 <?php 108 108 /** 109 109 * Filter the tabs shown on the Add Themes screen. 110 110 * … … 120 120 echo ' <a href="#" class="upload page-title-action">' . __( 'Upload Theme' ) . '</a>'; 121 121 echo ' <a href="#" class="browse-themes page-title-action">' . _x( 'Browse', 'themes' ) . '</a>'; 122 122 } 123 ?></h1> 123 ?> 124 </div> 124 125 125 126 <div class="upload-theme"> 126 127 <?php install_themes_upload(); ?> -
src/wp-admin/themes.php
124 124 ?> 125 125 126 126 <div class="wrap"> 127 <h1><?php esc_html_e( 'Themes' ); ?> 127 <div class="header"> 128 <h1><?php esc_html_e( 'Themes' ); ?></h1> 128 129 <span class="title-count theme-count"><?php echo count( $themes ); ?></span> 129 130 <?php if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?> 130 131 <a href="<?php echo admin_url( 'theme-install.php' ); ?>" class="hide-if-no-js page-title-action"><?php echo esc_html_x( 'Add New', 'Add new theme' ); ?></a> 131 132 <?php endif; ?> 132 </h1>133 133 <?php 134 134 if ( ! validate_current_theme() || isset( $_GET['broken'] ) ) : ?> 135 135 <div id="message1" class="updated notice is-dismissible"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div> … … 200 200 } 201 201 202 202 ?> 203 203 </div> 204 204 <div class="theme-browser"> 205 205 <div class="themes"> 206 206 -
src/wp-admin/upload.php
71 71 require_once( ABSPATH . 'wp-admin/admin-header.php' ); 72 72 ?> 73 73 <div class="wrap" id="wp-media-grid" data-search="<?php _admin_search_query() ?>"> 74 <h1> 74 <div class="header"> 75 <h1><?php echo esc_html( $title ); ?></h1> 75 76 <?php 76 echo esc_html( $title );77 77 if ( current_user_can( 'upload_files' ) ) { ?> 78 78 <a href="media-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file' ); ?></a><?php 79 79 } 80 80 ?> 81 </ h1>81 </div> 82 82 <div class="error hide-if-js"> 83 83 <p><?php _e( 'The grid view for the Media Library requires JavaScript. <a href="upload.php?mode=list">Switch to the list view</a>.' ); ?></p> 84 84 </div> … … 206 206 ?> 207 207 208 208 <div class="wrap"> 209 <h1> 209 <div class="header"> 210 <h1><?php echo esc_html( $title ); ?></h1> 210 211 <?php 211 echo esc_html( $title );212 212 if ( current_user_can( 'upload_files' ) ) { ?> 213 <a href="media-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file'); ?></a><?php213 <a href="media-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file' ); ?></a><?php 214 214 } 215 if ( ! empty( $_REQUEST['s'] ) ) 216 printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', get_search_query() ); ?> 217 </h1> 215 if ( ! empty( $_REQUEST['s'] ) ) { 216 printf( '<span class="subtitle">' . __( 'Search results for “%s”' ) . '</span>', get_search_query() ); 217 } ?> 218 </div> 218 219 219 220 <?php 220 221 $message = ''; -
src/wp-admin/user-edit.php
202 202 <?php endif; ?> 203 203 204 204 <div class="wrap" id="profile-page"> 205 <h1> 205 <div class="header"> 206 <h1><?php echo esc_html( $title ); ?></h1> 206 207 <?php 207 echo esc_html( $title );208 208 if ( ! IS_PROFILE_PAGE ) { 209 209 if ( current_user_can( 'create_users' ) ) { ?> 210 210 <a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a> … … 212 212 <a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a> 213 213 <?php } 214 214 } ?> 215 </ h1>215 </div> 216 216 <form id="your-profile" action="<?php echo esc_url( self_admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ) ); ?>" method="post" novalidate="novalidate"<?php 217 217 /** 218 218 * Fires inside the your-profile form tag on the user editing screen. -
src/wp-admin/users.php
443 443 } ?> 444 444 445 445 <div class="wrap"> 446 <h1> 446 <div class="header"> 447 <h1><?php echo esc_html( $title );?></h1> 447 448 <?php 448 echo esc_html( $title );449 449 if ( current_user_can( 'create_users' ) ) { ?> 450 450 <a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a> 451 451 <?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?> 452 452 <a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a> 453 453 <?php } 454 if ( $usersearch ) { 455 printf( '<span class="subtitle">' . __( 'Search results for “%s”' ) . '</span>', esc_html( $usersearch ) ); 456 } 457 ?> 458 </div> 454 459 455 if ( $usersearch )456 printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( $usersearch ) ); ?>457 </h1>458 459 460 <?php $wp_list_table->views(); ?> 460 461 461 462 <form method="get"> -
src/wp-admin/widgets.php
315 315 require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?> 316 316 317 317 <div class="wrap"> 318 <h1> 318 <div class="header"> 319 <h1><?php echo esc_html( $title ); ?></h1> 319 320 <?php 320 echo esc_html( $title );321 321 if ( current_user_can( 'customize' ) ) { 322 322 printf( 323 323 ' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>', … … 332 332 ); 333 333 } 334 334 ?> 335 </ h1>335 </div> 336 336 337 337 <?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?> 338 338 <div id="message" class="updated notice is-dismissible"><p><?php echo $messages[$_GET['message']]; ?></p></div>