WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
05/16/2016 01:02:00 PM (9 years ago)
Author:
afercia
Message:

Accessibility: make the tab order match the visual order in the Edit terms screens.

Fixes #35664.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-admin/edit-tags.php

    r36308 r37439  
    322322<div id="ajax-response"></div>
    323323
    324 <form class="search-form" method="get">
     324<form class="search-form wp-clearfix" method="get">
    325325<input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
    326326<input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
    … …  
    329329
    330330</form>
    331 <br class="clear" />
    332 
    333 <div id="col-container">
    334 
    335 <div id="col-right">
    336 <div class="col-wrap">
    337 <form id="posts-filter" method="post">
    338 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
    339 <input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
    340 
    341 <?php $wp_list_table->display(); ?>
    342 
    343 <br class="clear" />
    344 </form>
    345 
    346 <?php if ( 'category' == $taxonomy ) : ?>
    347 <div class="form-wrap">
    348 <p>
    349     <?php
    350     echo '<strong>' . __( 'Note:' ) . '</strong><br />';
    351     printf(
    352         /* translators: %s: default category */
    353         __( 'Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.' ),
    354         /** This filter is documented in wp-includes/category-template.php */
    355         '<strong>' . apply_filters( 'the_category', get_cat_name( get_option( 'default_category') ) ) . '</strong>'
    356     );
    357     ?>
    358 </p>
    359 <?php if ( current_user_can( 'import' ) ) : ?>
    360 <p><?php printf( __( 'Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.' ), esc_url( $import_link ) ) ?></p>
    361 <?php endif; ?>
    362 </div>
    363 <?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?>
    364 <div class="form-wrap">
    365 <p><?php printf( __( 'Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>.' ), esc_url( $import_link ) ) ;?></p>
    366 </div>
    367 <?php endif;
    368 
    369 /**
    370  * Fires after the taxonomy list table.
    371  *
    372  * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
    373  *
    374  * @since 3.0.0
    375  *
    376  * @param string $taxonomy The taxonomy name.
    377  */
    378 do_action( "after-{$taxonomy}-table", $taxonomy );
    379 ?>
    380 
    381 </div>
    382 </div><!-- /col-right -->
     331
     332<div id="col-container" class="wp-clearfix">
    383333
    384334<div id="col-left">
    … …  
    386336
    387337<?php
    388 
    389 if ( !is_null( $tax->labels->popular_items ) ) {
    390     if ( current_user_can( $tax->cap->edit_terms ) )
    391         $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'post_type' => $post_type, 'echo' => false, 'link' => 'edit' ) );
    392     else
    393         $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false ) );
    394 
    395     if ( $tag_cloud ) :
    396     ?>
    397 <div class="tagcloud">
    398 <h2><?php echo $tax->labels->popular_items; ?></h2>
    399 <?php echo $tag_cloud; unset( $tag_cloud ); ?>
    400 </div>
    401 <?php
    402 endif;
    403 }
    404338
    405339if ( current_user_can($tax->cap->edit_terms) ) {
    … …  
    598532?>
    599533</form></div>
    600 <?php } ?>
     534<?php }
     535
     536if ( ! is_null( $tax->labels->popular_items ) ) {
     537    if ( current_user_can( $tax->cap->edit_terms ) ) {
     538        $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'post_type' => $post_type, 'echo' => false, 'link' => 'edit' ) );
     539    } else {
     540        $tag_cloud = wp_tag_cloud( array( 'taxonomy' => $taxonomy, 'echo' => false ) );
     541    }
     542
     543    if ( $tag_cloud ) :
     544    ?>
     545<div class="tagcloud">
     546<h2><?php echo $tax->labels->popular_items; ?></h2>
     547<?php echo $tag_cloud; unset( $tag_cloud ); ?>
     548</div>
     549<?php
     550    endif;
     551}
     552
     553?>
    601554
    602555</div>
    603556</div><!-- /col-left -->
     557
     558<div id="col-right">
     559<div class="col-wrap">
     560<form id="posts-filter" method="post">
     561<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $taxonomy ); ?>" />
     562<input type="hidden" name="post_type" value="<?php echo esc_attr( $post_type ); ?>" />
     563
     564<?php $wp_list_table->display(); ?>
     565
     566</form>
     567
     568<?php if ( 'category' == $taxonomy ) : ?>
     569<div class="form-wrap edit-term-notes">
     570<p>
     571    <?php
     572    echo '<strong>' . __( 'Note:' ) . '</strong><br />';
     573    printf(
     574        /* translators: %s: default category */
     575        __( 'Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.' ),
     576        /** This filter is documented in wp-includes/category-template.php */
     577        '<strong>' . apply_filters( 'the_category', get_cat_name( get_option( 'default_category') ) ) . '</strong>'
     578    );
     579    ?>
     580</p>
     581<?php if ( current_user_can( 'import' ) ) : ?>
     582<p><?php printf( __( 'Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.' ), esc_url( $import_link ) ) ?></p>
     583<?php endif; ?>
     584</div>
     585<?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?>
     586<div class="form-wrap edit-term-notes">
     587<p><?php printf( __( 'Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>.' ), esc_url( $import_link ) ) ;?></p>
     588</div>
     589<?php endif;
     590
     591/**
     592 * Fires after the taxonomy list table.
     593 *
     594 * The dynamic portion of the hook name, `$taxonomy`, refers to the taxonomy slug.
     595 *
     596 * @since 3.0.0
     597 *
     598 * @param string $taxonomy The taxonomy name.
     599 */
     600do_action( "after-{$taxonomy}-table", $taxonomy );
     601?>
     602
     603</div>
     604</div><!-- /col-right -->
    604605
    605606</div><!-- /col-container -->
Note: See TracChangeset for help on using the changeset viewer.