Changeset 38983
- Timestamp:
- 10/27/2016 08:38:09 PM (8 years ago)
- Location:
- trunk/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/css/common.css
r38893 r38983 573 573 font-weight: 400; 574 574 margin: 0; 575 padding: 9px 15px4px 0;575 padding: 9px 0 4px 0; 576 576 line-height: 29px; 577 } 578 579 .wrap h1.wp-heading-inline { 580 display: inline-block; 581 margin-right: 5px; 582 } 583 584 .wp-header-end { 585 visibility: hidden; 586 margin: -2px 0 0; 577 587 } 578 588 … … 609 619 } 610 620 621 .wrap .wp-heading-inline + .page-title-action { 622 margin-left: 0; 623 } 624 611 625 .wrap .add-new-h2:hover, /* deprecated */ 612 626 .wrap .page-title-action:hover { … … 3655 3669 } 3656 3670 3671 .wrap h1.wp-heading-inline { 3672 margin-bottom: 0.5em; 3673 } 3674 3657 3675 .wrap .add-new-h2, /* deprecated */ 3658 3676 .wrap .add-new-h2:active, /* deprecated */ -
trunk/src/wp-admin/edit-form-advanced.php
r38951 r38983 475 475 476 476 <div class="wrap"> 477 <h1 ><?php477 <h1 class="wp-heading-inline"><?php 478 478 echo esc_html( $title ); 479 if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) ) 479 ?></h1> 480 481 <?php 482 if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) ) { 480 483 echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>'; 481 ?></h1> 484 } 485 ?> 486 487 <hr class="wp-header-end"> 488 482 489 <?php if ( $notice ) : ?> 483 490 <div id="notice" class="notice notice-warning"><p id="has-newer-autosave"><?php echo $notice ?></p></div> -
trunk/src/wp-admin/edit.php
r38958 r38983 304 304 ?> 305 305 <div class="wrap"> 306 <h1 ><?php306 <h1 class="wp-heading-inline"><?php 307 307 echo esc_html( $post_type_object->labels->name ); 308 if ( current_user_can( $post_type_object->cap->create_posts ) ) 308 ?></h1> 309 310 <?php 311 if ( current_user_can( $post_type_object->cap->create_posts ) ) { 309 312 echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>'; 313 } 310 314 311 315 if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) { … … 313 317 printf( ' <span class="subtitle">' . __( 'Search results for “%s”' ) . '</span>', get_search_query() ); 314 318 } 315 ?></h1> 319 ?> 320 321 <hr class="wp-header-end"> 316 322 317 323 <?php -
trunk/src/wp-admin/js/common.js
r38706 r38983 203 203 adminbar: $adminbar.height(), 204 204 menu: $adminMenuWrap.height() 205 }; 205 }, 206 $headerEnd = $( '.wp-header-end' ); 206 207 207 208 … … 397 398 * The `.below-h2` class is here just for backward compatibility with plugins 398 399 * that are (incorrectly) using it. Do not use. Use `.inline` instead. See #34570. 400 * If '.wp-header-end' is found, append the notices after it otherwise 401 * after the first h1 or h2 heading found within the main content. 399 402 */ 400 $( 'div.updated, div.error, div.notice' ).not( '.inline, .below-h2' ).insertAfter( $( '.wrap h1, .wrap h2' ).first() ); 403 if ( ! $headerEnd.length ) { 404 $headerEnd = $( '.wrap h1, .wrap h2' ).first(); 405 } 406 $( 'div.updated, div.error, div.notice' ).not( '.inline, .below-h2' ).insertAfter( $headerEnd ); 401 407 402 408 // Make notices dismissible -
trunk/src/wp-includes/js/autosave.js
r37737 r38983 316 316 postData = getSavedPostData(), 317 317 cookie = wpCookies.get( 'wp-saving-post' ), 318 $newerAutosaveNotice = $( '#has-newer-autosave' ).parent( '.notice' ); 318 $newerAutosaveNotice = $( '#has-newer-autosave' ).parent( '.notice' ), 319 $headerEnd = $( '.wp-header-end' ); 319 320 320 321 if ( cookie === post_id + '-saved' ) { … … 339 340 } 340 341 342 /* 343 * If '.wp-header-end' is found, append the notices after it otherwise 344 * after the first h1 or h2 heading found within the main content. 345 */ 346 if ( ! $headerEnd.length ) { 347 $headerEnd = $( '.wrap h1, .wrap h2' ).first(); 348 } 349 341 350 $notice = $( '#local-storage-notice' ) 342 .insertAfter( $ ( '.wrap h1, .wrap h2' ).first())351 .insertAfter( $headerEnd ) 343 352 .addClass( 'notice-warning' ); 344 353
Note: See TracChangeset
for help on using the changeset viewer.