Ticket #26601: 26601.7b.patch
File 26601.7b.patch, 15.1 KB (added by , 6 years ago) |
---|
-
wp-admin/css/common.css
416 416 417 417 .subsubsub { 418 418 list-style: none; 419 margin: 8px 00;419 margin: 0; 420 420 padding: 0; 421 421 font-size: 13px; 422 422 float: left; … … 555 555 } 556 556 557 557 .wrap { 558 margin: 10px 20px 0 2px;558 margin: 20px 20px 0 2px; 559 559 } 560 560 561 561 .attention { … … 568 568 margin: 0; 569 569 } 570 570 571 .wrap header { 572 margin-bottom: 15px; 573 } 574 571 575 .wrap h2 { 572 576 font-size: 23px; 573 577 font-weight: 400; 574 padding: 9px 15px 4px 0; 575 line-height: 29px; 578 padding-right: 10px; 579 line-height: 1.2; 580 display: inline; 576 581 } 582 .post-php .wrap h2 { 583 float: left; 584 } 585 .index-php .wrap h2, 586 .nav-menus-php .wrap h2 { 587 display: block; 588 margin-bottom: 10px; 589 } 577 590 578 591 .subtitle { 579 592 color: #777; … … 583 596 584 597 .wrap .add-new-h2, 585 598 .wrap .add-new-h2:active { 586 margin-left: 4px;587 599 padding: 4px 8px; 588 position: relative;589 top: -3px;590 600 text-decoration: none; 591 601 border: none; 592 602 -webkit-border-radius: 2px; … … 595 605 text-shadow: none; 596 606 font-weight: 600; 597 607 font-size: 13px; 608 display: inline-block; 609 margin-right: 20px; 598 610 } 599 611 600 612 .wrap .add-new-h2:hover { … … 964 976 } 965 977 966 978 /* not a part of filter bar, but derived from it, so here for now */ 967 .t itle-count {979 .theme-count { 968 980 display: inline; 969 top: -3px; 970 margin-left: 5px; 971 margin-right: 20px; 981 margin-right: 25px; 972 982 } 973 983 984 .helper-content { 985 display: inline; 986 position: relative; 987 } 988 989 .theme-install-php .helper-content { 990 bottom: -10px; 991 } 992 974 993 .filter-items { 975 994 float: left; 976 995 } -
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-form-advanced.php
401 401 ?> 402 402 403 403 <div class="wrap"> 404 <h2><?php 405 echo esc_html( $title ); 406 if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) ) 407 echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="add-new-h2">' . esc_html( $post_type_object->labels->add_new ) . '</a>'; 408 ?></h2> 409 <?php if ( $notice ) : ?> 410 <div id="notice" class="notice notice-warning"><p id="has-newer-autosave"><?php echo $notice ?></p></div> 411 <?php endif; ?> 412 <?php if ( $message ) : ?> 413 <div id="message" class="updated"><p><?php echo $message; ?></p></div> 414 <?php endif; ?> 415 <div id="lost-connection-notice" class="error hidden"> 416 <p><span class="spinner"></span> <?php _e( '<strong>Connection lost.</strong> Saving has been disabled until you’re reconnected.' ); ?> 417 <span class="hide-if-no-sessionstorage"><?php _e( 'We’re backing up this post in your browser, just in case.' ); ?></span> 418 </p> 419 </div> 404 <header> 405 <h2><?php echo esc_html( $title );?></h2> 406 <?php if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) ) 407 echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="add-new-h2">' . esc_html( $post_type_object->labels->add_new ) . '</a>';?> 408 <?php if ( $notice ) : ?> 409 <div id="notice" class="notice notice-warning"><p id="has-newer-autosave"><?php echo $notice ?></p></div> 410 <?php endif; ?> 411 <?php if ( $message ) : ?> 412 <div id="message" class="updated"> 413 <p><?php echo $message; ?></p> 414 </div> 415 <?php endif; ?> 416 <div id="lost-connection-notice" class="error hidden"> 417 <p><span class="spinner"></span> <?php _e( '<strong>Connection lost.</strong> Saving has been disabled until you’re reconnected.' ); ?> 418 <span class="hide-if-no-sessionstorage"><?php _e( 'We’re backing up this post in your browser, just in case.' ); ?></span> 419 </p> 420 </div> 421 </header> 422 420 423 <form name="post" action="post.php" method="post" id="post"<?php 421 424 /** 422 425 * Fires inside the post editor form tag. -
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
85 85 }, 86 86 87 87 // Defines search element container 88 searchContainer: $( '#wpbody h2:first' ),88 searchContainer: $( '#wpbody .helper-content' ), 89 89 90 90 // Search input and view 91 91 // for current theme collection -
wp-admin/plugin-install.php
94 94 include(ABSPATH . 'wp-admin/admin-header.php'); 95 95 ?> 96 96 <div class="wrap"> 97 <h2> 98 <?php 99 echo esc_html( $title ); 100 if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) { 101 if ( $tab === 'upload' ) { 102 $href = self_admin_url( 'plugin-install.php' ); 103 $text = _x( 'Browse', 'plugins' ); 104 } else { 105 $href = self_admin_url( 'plugin-install.php?tab=upload' ); 106 $text = __( 'Upload Plugin' ); 107 } 108 echo ' <a href="' . $href . '" class="upload add-new-h2">' . $text . '</a>'; 109 } 110 ?> 111 </h2> 97 <header> 98 <h2><?php echo esc_html( $title );?></h2> 99 <?php if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) { 100 if ( $tab === 'upload' ) { 101 $href = self_admin_url( 'plugin-install.php' ); 102 $text = _x( 'Browse', 'plugins' ); 103 } else { 104 $href = self_admin_url( 'plugin-install.php?tab=upload' ); 105 $text = __( 'Upload Plugin' ); 106 } 107 echo ' <a href="' . $href . '" class="upload add-new-h2">' . $text . '</a>'; 108 }?> 109 </header> 112 110 113 111 <?php 114 112 if ( $tab !== 'upload' ) { -
wp-admin/plugins.php
435 435 <?php endif; ?> 436 436 437 437 <div class="wrap"> 438 <h2><?php echo esc_html( $title ); 439 if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?> 440 <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a> 438 <header> 439 <h2><?php echo esc_html( $title );?></h2> 440 <?php if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?> 441 <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a> 442 </header> 441 443 <?php } 442 444 if ( $s ) 443 445 printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( $s ) ); ?> 444 </h2>445 446 446 447 <?php 447 448 /** -
wp-admin/theme-install.php
99 99 100 100 ?> 101 101 <div class="wrap"> 102 <h2><?php 103 echo esc_html( $title ); 102 <header> 103 <h2><?php echo esc_html( $title );?></h2> 104 <?php 104 105 105 106 /** 106 107 * Filter the tabs shown on the Add Themes screen. … … 117 118 echo ' <a href="#" class="upload add-new-h2">' . __( 'Upload Theme' ) . '</a>'; 118 119 echo ' <a href="#" class="browse-themes add-new-h2">' . _x( 'Browse', 'themes' ) . '</a>'; 119 120 } 120 ?></h2> 121 ?> 122 </header> 121 123 122 124 <div class="upload-theme"> 123 125 <?php install_themes_upload(); ?> -
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
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 <h2> 75 <?php 76 echo esc_html( $title ); 77 if ( current_user_can( 'upload_files' ) ) { ?> 78 <a href="media-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'file' ); ?></a><?php 79 } 80 ?> 81 </h2> 74 <header> 75 <h2><?php echo esc_html( $title );?></h2> 76 <?php if ( current_user_can( 'upload_files' ) ) { ?> 77 <a href="media-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'file' ); ?></a> 78 <?php } 79 ?> 80 </header> 82 81 <div class="error hide-if-js"> 83 82 <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 83 </div> … … 206 205 ?> 207 206 208 207 <div class="wrap"> 209 <h2> 208 <h2><?php echo esc_html( $title );?></h2> 209 210 210 <?php 211 echo esc_html( $title );212 211 if ( current_user_can( 'upload_files' ) ) { ?> 213 212 <a href="media-new.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'file'); ?></a><?php 214 213 } 215 214 if ( ! empty( $_REQUEST['s'] ) ) 216 215 printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', get_search_query() ); ?> 217 </h2>218 216 219 217 <?php 220 218 $message = ''; -
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>