Make WordPress Core

Ticket #35577: 35577.3.diff

File 35577.3.diff, 6.3 KB (added by cwpnolen, 8 years ago)
  • src/wp-admin/css/nav-menus.css

     
    658658.add-menu-item-pagelinks {
    659659        margin: .5em auto;
    660660        text-align: center;
     661        word-spacing: -3px;
    661662}
    662663
     664.add-menu-item-pagelinks .page-numbers {
     665        display: inline-block;
     666        padding: 0 4px;
     667}
     668
    663669.link-to-original {
    664670        display: block;
    665671        margin: 0 0 15px;
  • src/wp-includes/general-template.php

     
    32593259                 *
    32603260                 * @param string $link The paginated link URL.
    32613261                 */
    3262                 $page_links[] = '<a class="prev page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['prev_text'] . '</a>';
     3262                $page_links[] = '<a class="prev page-numbers" aria-label="' . __( 'Previous page' ) . '" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['prev_text'] . '</a>';
    32633263        endif;
    32643264        for ( $n = 1; $n <= $total; $n++ ) :
    32653265                if ( $n == $current ) :
     
    32743274                                $link .= $args['add_fragment'];
    32753275
    32763276                                /** This filter is documented in wp-includes/general-template.php */
    3277                                 $page_links[] = "<a class='page-numbers' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</a>";
     3277                                $page_links[] = "<a class='page-numbers' aria-label='" . sprintf( __( 'Page %s' ), $n ) . "' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</a>";
     3278
    32783279                                $dots = true;
    32793280                        elseif ( $dots && ! $args['show_all'] ) :
    32803281                                $page_links[] = '<span class="page-numbers dots">' . __( '&hellip;' ) . '</span>';
     
    32903291                $link .= $args['add_fragment'];
    32913292
    32923293                /** This filter is documented in wp-includes/general-template.php */
    3293                 $page_links[] = '<a class="next page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['next_text'] . '</a>';
     3294                $page_links[] = '<a class="next page-numbers" aria-label="' . __( 'Next page' ) . '" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['next_text'] . '</a>';
    32943295        endif;
    32953296        switch ( $args['type'] ) {
    32963297                case 'array' :
  • tests/phpunit/tests/general/paginateLinks.php

     
    1717
    1818                $expected =<<<EXPECTED
    1919<span class='page-numbers current'>1</span>
    20 <a class='page-numbers' href='$page2'>2</a>
    21 <a class='page-numbers' href='$page3'>3</a>
     20<a class='page-numbers' aria-label='Page 2' href='$page2'>2</a>
     21<a class='page-numbers' aria-label='Page 3' href='$page3'>3</a>
    2222<span class="page-numbers dots">&hellip;</span>
    23 <a class='page-numbers' href='$page50'>50</a>
    24 <a class="next page-numbers" href="$page2">Next &raquo;</a>
     23<a class='page-numbers' aria-label='Page 50' href='$page50'>50</a>
     24<a class="next page-numbers" aria-label="Next page" href="$page2">Next &raquo;</a>
    2525EXPECTED;
    2626
    2727                $links = paginate_links( array( 'total' => 50 ) );
     
    3535
    3636                $expected =<<<EXPECTED
    3737<span class='page-numbers current'>1</span>
    38 <a class='page-numbers' href='$page2'>2</a>
    39 <a class='page-numbers' href='$page3'>3</a>
     38<a class='page-numbers' aria-label='Page 2' href='$page2'>2</a>
     39<a class='page-numbers' aria-label='Page 3' href='$page3'>3</a>
    4040<span class="page-numbers dots">&hellip;</span>
    41 <a class='page-numbers' href='$page50'>50</a>
    42 <a class="next page-numbers" href="$page2">Next &raquo;</a>
     41<a class='page-numbers' aria-label='Page 50' href='$page50'>50</a>
     42<a class="next page-numbers" aria-label="Next page" href="$page2">Next &raquo;</a>
    4343EXPECTED;
    4444
    4545                $links = paginate_links( array( 'total' => 50, 'format' => 'page/%#%/' ) );
     
    5353                $page50 = get_pagenum_link( 50 );
    5454
    5555                $expected =<<<EXPECTED
    56 <a class='page-numbers' href='$home'>1</a>
     56<a class='page-numbers' aria-label='Page 1' href='$home'>1</a>
    5757<span class='page-numbers current'>2</span>
    58 <a class='page-numbers' href='$page3'>3</a>
    59 <a class='page-numbers' href='$page4'>4</a>
     58<a class='page-numbers' aria-label='Page 3' href='$page3'>3</a>
     59<a class='page-numbers' aria-label='Page 4' href='$page4'>4</a>
    6060<span class="page-numbers dots">&hellip;</span>
    61 <a class='page-numbers' href='$page50'>50</a>
     61<a class='page-numbers' aria-label='Page 50' href='$page50'>50</a>
    6262EXPECTED;
    6363
    6464                $links = paginate_links( array( 'total' => 50, 'prev_next' => false, 'current' => 2 ) );
     
    7272                $page50 = get_pagenum_link( 50 );
    7373
    7474                $expected =<<<EXPECTED
    75 <a class="prev page-numbers" href="$home">&laquo; Previous</a>
    76 <a class='page-numbers' href='$home'>1</a>
     75<a class="prev page-numbers" aria-label="Previous page" href="$home">&laquo; Previous</a>
     76<a class='page-numbers' aria-label='Page 1' href='$home'>1</a>
    7777<span class='page-numbers current'>2</span>
    78 <a class='page-numbers' href='$page3'>3</a>
    79 <a class='page-numbers' href='$page4'>4</a>
     78<a class='page-numbers' aria-label='Page 3' href='$page3'>3</a>
     79<a class='page-numbers' aria-label='Page 4' href='$page4'>4</a>
    8080<span class="page-numbers dots">&hellip;</span>
    81 <a class='page-numbers' href='$page50'>50</a>
    82 <a class="next page-numbers" href="$page3">Next &raquo;</a>
     81<a class='page-numbers' aria-label='Page 50' href='$page50'>50</a>
     82<a class="next page-numbers" aria-label="Next page" href="$page3">Next &raquo;</a>
    8383EXPECTED;
    8484
    8585                $links = paginate_links( array( 'total' => 50, 'prev_next' => true, 'current' => 2 ) );
     
    138138                $document = new DOMDocument();
    139139                $document->preserveWhiteSpace = false;
    140140
    141                 // The first two links should link to page 1
     141                // The first two links should Page 1
    142142                foreach ( $expected_attributes as $link_idx => $attributes ) {
    143143
    144144                        $document->loadHTML( $links[$link_idx] );
     
    319319                ) );
    320320
    321321                $page_2_url = home_url() . '?foo=2';
    322                 $this->assertContains( "<a class='page-numbers' href='$page_2_url'>2</a>", $links );
     322                $this->assertContains( "<a class='page-numbers' aria-label='Page 2' href='$page_2_url'>2</a>", $links );
    323323        }
    324324}