Ticket #23701: 23701.diff

wp-content/themes/twentythirteen/searchform.php

@@ -1 @@
-<?php
-/**
- * The template for displaying search forms in Twenty Thirteen.
- *
- * @package WordPress
- * @subpackage Twenty_Thirteen
- * @since Twenty Thirteen 1.0
- */
-?>
-<form method="get" id="searchform" class="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>" role="search">
-        <label for="s" class="assistive-text"><?php _ex( 'Search', 'assistive text', 'twentythirteen' ); ?></label>
-        <input type="search" class="field" name="s" value="<?php echo esc_attr( get_search_query() ); ?>" id="s" placeholder="<?php echo esc_attr_x( 'Search &hellip;', 'placeholder', 'twentythirteen' ); ?>" />
-        <input type="submit" class="submit" name="submit" id="searchsubmit" value="<?php echo esc_attr_x( 'Search', 'submit button', 'twentythirteen' ); ?>" />
-</form>

wp-content/themes/twentythirteen/comments.php

@@ -38 +38 @@
                         if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
                 ?>
                 <nav class="navigation comment-navigation" role="navigation">
-                        <h1 class="assistive-text section-heading"><?php _e( 'Comment navigation', 'twentythirteen' ); ?></h1>
+                        <h1 class="screen-reader-text section-heading"><?php _e( 'Comment navigation', 'twentythirteen' ); ?></h1>
                         <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentythirteen' ) ); ?></div>
                         <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentythirteen' ) ); ?></div>
                 </nav>

wp-content/themes/twentythirteen/content-none.php

@@ -20 +20 @@
         <?php elseif ( is_search() ) : ?>
 
         <p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with different keywords.', 'twentythirteen' ); ?></p>
-        <?php get_search_form(); ?>
+        <?php get_search_form( true, 'html5' ); ?>
 
         <?php else : ?>
 
         <p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'twentythirteen' ); ?></p>
-        <?php get_search_form(); ?>
+        <?php get_search_form( true, 'html5' ); ?>
 
         <?php endif; ?>
 </div><!-- .page-content -->

wp-content/themes/twentythirteen/header.php

@@ -49 +49 @@
                         <div id="navbar" class="navbar">
                                 <nav id="site-navigation" class="navigation main-navigation" role="navigation">
                                         <h3 class="menu-toggle"><?php _e( 'Menu', 'twentythirteen' ); ?></h3>
-                                        <a class="assistive-text skip-link" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentythirteen' ); ?>"><?php _e( 'Skip to content', 'twentythirteen' ); ?></a>
+                                        <a class="screen-reader-text skip-link" href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentythirteen' ); ?>"><?php _e( 'Skip to content', 'twentythirteen' ); ?></a>
                                         <?php wp_nav_menu( array( 'theme_location' => 'primary', 'menu_class' => 'nav-menu' ) ); ?>
-                                        <?php get_search_form(); ?>
                                 </nav><!-- #site-navigation -->
                         </div><!-- #navbar -->
                 </header><!-- #masthead -->

wp-content/themes/twentythirteen/404.php

@@ -21 +21 @@
                                         <h2><?php _e( 'This is somewhat embarrassing, isn&rsquo;t it?', 'twentythirteen' ); ?></h2>
                                         <p><?php _e( 'It looks like nothing was found at this location. Maybe try a search?', 'twentythirteen' ); ?></p>
 
-                                        <?php get_search_form(); ?>
+                                        <?php get_search_form( true, 'html5' ); ?>
                                 </div><!-- .page-content -->
                         </div><!-- .page-wrapper -->
 

wp-content/themes/twentythirteen/css/ie.css

@@ -32 +32 @@
         left: 100%;
 }
 
-.site-header .searchform .field {
+.site-header .searchform [type="search"] {
         padding-top: 6px;
 }
 
@@ -174 +174 @@
         width: 13px;
 }
 
-.ie7 .assistive-text,
-.ie7 .site .screen-reader-text {
+.ie7 .screen-reader-text {
         clip: rect(1px 1px 1px 1px); /* IE7 */
 }
 
@@ -204 +203 @@
         left: 100%;
 }
 
-.ie7 .site-header .searchform .field {
+.ie7 .site-header .searchform [type="search"] {
         background-color: #fff;
         border: 2px solid #c3c0ab;
         cursor: text;

wp-content/themes/twentythirteen/style.css

@@ -537 +537 @@
 }
 
 /* Assistive text */
-.assistive-text {
+.screen-reader-text {
         position: absolute !important;
         clip: rect(1px, 1px, 1px, 1px);
 }
 
-.assistive-text:hover,
-.assistive-text:active,
-.assistive-text:focus {
+.screen-reader-text:hover,
+.screen-reader-text:active,
+.screen-reader-text:focus {
         background-color: #f1f1f1;
         border-radius: 3px;
         box-shadow: 0 0 2px 2px rgba(0,0,0,.6);
@@ -925 +925 @@
         width: 100%;
 }
 
-.main-navigation .searchform {
+.site-header .searchform {
         position: absolute;
         right: 0;
         top: 1px;
 }
 
-.site-header .searchform .field {
+.site-header .searchform [type="search"] {
         background-color: transparent;
         background-image: url(images/search-icon.png);
         background-position: 5px center;
@@ -948 +948 @@
         width: 0;
 }
 
-.site-header .searchform .field:focus {
+.site-header .searchform [type="search"]:focus {
         background-color: #fff;
         border: 2px solid #c3c0ab;
         cursor: text;
@@ -2524 +2524 @@
 }
 
 /* Search widget */
-.searchform .submit {
+.searchform [type="submit"] {
         display: none;
 }
 
-.widget .searchform .field {
+.widget .searchform [type="text"] {
         width: 100%;
 }
 
@@ -3137 +3137 @@
         (-webkit-min-device-pixel-ratio: 1.25),
         (min-resolution: 120dpi) {
 
-        .site-header .searchform .field {
+        .site-header .searchform [type="search"] {
                 background-image: url(images/search-icon-2x.png);
         }
 
@@ -3157 +3157 @@
                 font-size: 10pt;
         }
 
-        footer a[rel=bookmark]:link:after,
-        footer a[rel=bookmark]:visited:after {
+        footer a[rel="bookmark"]:link:after,
+        footer a[rel="bookmark"]:visited:after {
                 content: " [" attr(href) "] "; /* Show URLs */
         }
 

wp-content/themes/twentythirteen/functions.php

@@ -262 +262 @@
                 return;
         ?>
         <nav class="navigation paging-navigation" role="navigation">
-                <h1 class="assistive-text"><?php _e( 'Posts navigation', 'twentythirteen' ); ?></h1>
+                <h1 class="screen-reader-text"><?php _e( 'Posts navigation', 'twentythirteen' ); ?></h1>
                 <div class="nav-links">
 
                         <?php if ( get_next_posts_link() ) : ?>
@@ -298 +298 @@
                 return;
         ?>
         <nav class="navigation post-navigation" role="navigation">
-                <h1 class="assistive-text"><?php _e( 'Post navigation', 'twentythirteen' ); ?></h1>
+                <h1 class="screen-reader-text"><?php _e( 'Post navigation', 'twentythirteen' ); ?></h1>
                 <div class="nav-links">
 
                         <?php previous_post_link( '%link', _x( '<span class="meta-nav">&larr;</span> %title', 'Previous post link', 'twentythirteen' ) ); ?>
@@ -486 +486 @@
 endif;
 
 /**
+ * Adds a search form to the main navigation.
+ *
+ * @since Twenty Thirteen 1.0
+ *
+ * @param string $menu
+ * @return string
+ */
+function twentythirteen_navbar_searchform( $menu ) {
+        return $menu .= get_search_form( false, 'html5' );
+}
+add_filter( 'wp_nav_menu',  'twentythirteen_navbar_searchform' );
+add_filter( 'wp_page_menu', 'twentythirteen_navbar_searchform' );
+
+/**
  * Extends the default WordPress body class to denote:
  * 1. Custom fonts enabled.
  * 2. Single or multiple authors.