Ticket #26601: 26601.6.patch
File 26601.6.patch, 10.5 KB (added by , 6 years ago) |
---|
-
wp-admin/css/common.css
414 414 415 415 .subsubsub { 416 416 list-style: none; 417 margin: 8px 00;417 margin: 0; 418 418 padding: 0; 419 419 font-size: 13px; 420 420 float: left; … … 553 553 } 554 554 555 555 .wrap { 556 margin: 10px 20px 0 2px;556 margin: 20px 20px 0 2px; 557 557 } 558 558 559 559 .attention { … … 566 566 margin: 0; 567 567 } 568 568 569 .wrap header { 570 margin-bottom: 20px; 571 } 572 569 573 .wrap h2 { 570 574 font-size: 23px; 571 575 font-weight: 400; 572 padding: 9px 15px 4px 0; 573 line-height: 29px; 576 padding-right: 10px; 577 line-height: 1.2; 578 display: inline; 574 579 } 575 580 581 .index-php .wrap h2, 582 .nav-menus-php .wrap h2 { 583 display: block; 584 margin-bottom: 10px; 585 } 586 576 587 .subtitle { 577 588 color: #777; 578 589 font-size: 14px; … … 581 592 582 593 .wrap .add-new-h2, 583 594 .wrap .add-new-h2:active { 584 margin-left: 4px; 585 padding: 4px 8px; 586 position: relative; 587 top: -3px; 595 padding: 5px 8px; 588 596 text-decoration: none; 589 597 border: none; 590 598 -webkit-border-radius: 2px; … … 593 601 text-shadow: none; 594 602 font-weight: 600; 595 603 font-size: 13px; 604 display: inline; 605 margin-right: 20px; 596 606 } 597 607 598 608 .wrap .add-new-h2:hover { … … 948 958 } 949 959 950 960 /* not a part of filter bar, but derived from it, so here for now */ 951 .t itle-count {961 .theme-count { 952 962 display: inline; 953 top: -3px; 954 margin-left: 5px; 955 margin-right: 20px; 963 margin-right: 25px; 956 964 } 957 965 966 .helper-content { 967 display: inline; 968 position: relative; 969 } 970 971 .theme-install-php .helper-content { 972 bottom: -10px; 973 } 974 958 975 .filter-items { 959 976 float: left; 960 977 } -
wp-admin/css/themes.css
27 27 28 28 /* Search form */ 29 29 .themes-php .wp-filter-search { 30 position: relative;31 top: -2px;32 left: 20px;33 30 margin: 0; 34 31 width: 280px; 35 32 font-size: 16px; -
wp-admin/edit-comments.php
140 140 ?> 141 141 142 142 <div class="wrap"> 143 <h2><?php 144 if ( $post_id ) 145 echo sprintf( __( 'Comments on “%s”' ), 146 sprintf( '<a href="%s">%s</a>', 147 get_edit_post_link( $post_id ), 148 wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' ) 149 ) 150 ); 151 else 152 echo __('Comments'); 143 <header> 144 <h2><?php if ( $post_id ) echo sprintf( __( 'Comments on “%s”' ), sprintf( '<a href="%s">%s</a>', get_edit_post_link( $post_id ), wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' ) ) ); 145 else echo __( 'Comments' );?></h2> 146 <?php 147 if ( isset($_REQUEST['s']) && $_REQUEST['s'] ) echo '<span class="subtitle">' . sprintf( __( 'Search results for “%s”' ), wp_html_excerpt( esc_html( wp_unslash( $_REQUEST['s'] ) ), 50, '…' ) ) . '</span>'; ?> 148 </header> 153 149 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 </h2>157 158 150 <?php 159 151 if ( isset( $_REQUEST['error'] ) ) { 160 152 $error = (int) $_REQUEST['error']; -
wp-admin/edit.php
277 277 require_once( ABSPATH . 'wp-admin/admin-header.php' ); 278 278 ?> 279 279 <div class="wrap"> 280 <h2><?php 281 echo esc_html( $post_type_object->labels->name ); 282 if ( current_user_can( $post_type_object->cap->create_posts ) ) 283 echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="add-new-h2">' . esc_html( $post_type_object->labels->add_new ) . '</a>'; 284 if ( ! empty( $_REQUEST['s'] ) ) 285 printf( ' <span class="subtitle">' . __('Search results for “%s”') . '</span>', get_search_query() ); 286 ?></h2> 280 <header> 281 <h2><?php echo esc_html( $post_type_object->labels->name );?></h2> 282 <?php 283 if ( current_user_can( $post_type_object->cap->create_posts ) ) 284 echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="add-new-h2">' . esc_html( $post_type_object->labels->add_new ) . '</a>'; 285 if ( ! empty( $_REQUEST['s'] ) ) 286 printf( ' <span class="subtitle">' . __('Search results for “%s”') . '</span>', get_search_query() ); 287 ?> 288 </header> 287 289 288 290 <?php 289 291 // If we have a bulk message to issue: -
wp-admin/js/theme.js
84 84 }, 85 85 86 86 // Defines search element container 87 searchContainer: $( '#wpbody h2:first' ),87 searchContainer: $( '#wpbody .helper-content' ), 88 88 89 89 // Search input and view 90 90 // for current theme collection -
wp-admin/plugins.php
432 432 <?php endif; ?> 433 433 434 434 <div class="wrap"> 435 <h2><?php echo esc_html( $title ); 436 if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?> 437 <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a> 435 <header> 436 <h2><?php echo esc_html( $title );?></h2> 437 <?php if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?> 438 <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a> 439 </header> 438 440 <?php } 439 441 if ( $s ) 440 442 printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( $s ) ); ?> 441 </h2>442 443 443 444 <?php 444 445 /** -
wp-admin/themes.php
121 121 ?> 122 122 123 123 <div class="wrap"> 124 <h2><?php esc_html_e( 'Themes' ); ?> 124 <header> 125 <h2><?php esc_html_e( 'Themes' ); ?></h2> 125 126 <span class="title-count theme-count"><?php echo count( $themes ); ?></span> 126 <?php if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?> 127 <a href="<?php echo admin_url( 'theme-install.php' ); ?>" class="hide-if-no-js add-new-h2"><?php echo esc_html_x( 'Add New', 'Add new theme' ); ?></a> 128 <?php endif; ?> 129 </h2> 127 <div class="helper-content"> 128 <?php if ( ! is_multisite() && current_user_can( 'install_themes' ) ) : ?> 129 <a href="<?php echo admin_url( 'theme-install.php' ); ?>" class="hide-if-no-js add-new-h2"><?php echo esc_html_x( 'Add New', 'Add new theme' ); ?></a> 130 <?php endif; ?> 131 </div> 132 </header> 130 133 <?php 131 134 if ( ! validate_current_theme() || isset( $_GET['broken'] ) ) : ?> 132 135 <div id="message1" class="updated"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div> -
wp-admin/upload.php
68 68 require_once( ABSPATH . 'wp-admin/admin-header.php' ); 69 69 ?> 70 70 <div class="wrap" id="wp-media-grid"> 71 <h 2>72 <?php73 echo esc_html( $title );74 if ( current_user_can( 'upload_files' ) ) { ?>75 < a href="media-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'file' ); ?></a><?php76 }77 ?>78 </h2> 71 <header> 72 <h2><?php echo esc_html( $title );?></h2> 73 <?php if ( current_user_can( 'upload_files' ) ) { ?> 74 <a href="media-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'file' ); ?></a> 75 <?php } 76 ?> 77 </header> 78 79 79 <div class="error hide-if-js"> 80 80 <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> 81 81 </div> -
wp-admin/users.php
428 428 } ?> 429 429 430 430 <div class="wrap"> 431 <h2> 432 <?php 433 echo esc_html( $title ); 434 if ( current_user_can( 'create_users' ) ) { ?> 435 <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a> 436 <?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?> 437 <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a> 438 <?php } 431 <header> 432 <h2><?php echo esc_html( $title );?></h2> 433 <?php 434 if ( current_user_can( 'create_users' ) ) { ?> 435 <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a> 436 <?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?> 437 <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a> 438 <?php } 439 if ( $usersearch ) 440 printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( $usersearch ) ); ?> 441 </header> 439 442 440 if ( $usersearch )441 printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( $usersearch ) ); ?>442 </h2>443 443 444 444 <?php $wp_list_table->views(); ?> 445 445 -
wp-admin/widgets.php
310 310 require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?> 311 311 312 312 <div class="wrap"> 313 <h2>314 <?php 315 echo esc_html( $title );316 if ( current_user_can( 'customize' ) ) {317 printf(318 ' <a class="add-new-h2 hide-if-no-customize" href="%1$s">%2$s</a>',319 esc_url( add_query_arg(320 array(321 array( 'autofocus' => array( 'panel' => 'widgets' ) ),322 'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) )323 ),324 admin_url( 'customize.php' )325 ) ),326 __( 'Manage in Customizer' )327 );328 }329 ?>330 </h2>313 <header> 314 <h2><?php echo esc_html( $title );?></h2> 315 <?php 316 if ( current_user_can( 'customize' ) ) { 317 printf( 318 ' <a class="add-new-h2 hide-if-no-customize" href="%1$s">%2$s</a>', 319 esc_url( add_query_arg( 320 array( 321 array( 'autofocus' => array( 'panel' => 'widgets' ) ), 322 'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ) 323 ), 324 admin_url( 'customize.php' ) 325 ) ), 326 __( 'Manage in Customizer' ) 327 ); 328 } 329 ?> 330 </header> 331 331 332 332 <?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?> 333 333 <div id="message" class="updated"><p><?php echo $messages[$_GET['message']]; ?></p></div>