improved coding of template files and search form

ThemeZee · Jun 18, 2016 · dd8ee9b · dd8ee9b
1 parent 6e79bf4
commit dd8ee9b
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 10 deletions.
diff --git a/searchform.php b/searchform.php
@@ -9,10 +9,14 @@
 
 <form role="search" method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
 	<label>
-		<span class="screen-reader-text"><?php _ex( 'Search for:', 'label', 'gridbox' ); ?></span>
-		<input type="search" class="search-field" placeholder="<?php echo esc_attr_x( 'Search &hellip;', 'placeholder', 'gridbox' ); ?>" value="<?php echo esc_attr( get_search_query() ); ?>" name="s">
+		<span class="screen-reader-text"><?php echo esc_html_x( 'Search for:', 'label', 'gridbox' ); ?></span>
+		<input type="search" class="search-field"
+			placeholder="<?php echo esc_attr_x( 'Search &hellip;', 'placeholder', 'gridbox' ); ?>"
+			value="<?php echo esc_html( get_search_query() ); ?>" name="s"
+			title="<?php echo esc_attr_x( 'Search for:', 'label', 'gridbox' ); ?>" />
 	</label>
 	<button type="submit" class="search-submit">
 		<span class="genericon-search"></span>
+		<span class="screen-reader-text"><?php echo esc_html_x( 'Search', 'submit button', 'gridbox' ); ?></span>
 	</button>
 </form>
diff --git a/style.css b/style.css
@@ -1239,7 +1239,7 @@ textarea {
 	background: #4477aa;
 }
 
-/* Page Links | wp_link_pages() */
+/* Page Links */
 .page-links {
 	margin: 0;
 	word-spacing: 1em;

diff --git a/template-parts/content-featured.php b/template-parts/content-featured.php
@@ -11,7 +11,7 @@
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-		<a href="<?php esc_url( the_permalink() ); ?>" class="featured-image-link">
+		<a href="<?php the_permalink(); ?>" class="featured-image-link">
 
 			<?php // Display Post Thumbnail or default thumbnail.
 			if ( has_post_thumbnail() ) :

diff --git a/template-parts/content-page.php b/template-parts/content-page.php
@@ -18,9 +18,14 @@
 	<?php gridbox_post_image_single(); ?>
 
 	<div class="entry-content clearfix">
+
 		<?php the_content(); ?>
-		<!-- <?php trackback_rdf(); ?> -->
-		<div class="page-links"><?php wp_link_pages(); ?></div>
+
+		<?php wp_link_pages( array(
+			'before' => '<div class="page-links"><p>' . esc_html__( 'Pages:', 'gridbox' ),
+			'after'  => '</p></div>',
+		) ); ?>
+
 	</div><!-- .entry-content -->
 
 </article>
diff --git a/template-parts/content-search.php b/template-parts/content-search.php
@@ -11,7 +11,7 @@
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-		<a href="<?php esc_url( the_permalink() ); ?>" rel="bookmark">
+		<a href="<?php the_permalink(); ?>" rel="bookmark">
 			<?php the_post_thumbnail(); ?>
 		</a>
 

diff --git a/template-parts/content-single.php b/template-parts/content-single.php
@@ -20,9 +20,14 @@
 	</header><!-- .entry-header -->
 
 	<div class="entry-content clearfix">
+
 		<?php the_content(); ?>
-		<!-- <?php trackback_rdf(); ?> -->
-		<div class="page-links"><?php wp_link_pages(); ?></div>
+
+		<?php wp_link_pages( array(
+			'before' => '<div class="page-links"><p>' . esc_html__( 'Pages:', 'gridbox' ),
+			'after'  => '</p></div>',
+		) ); ?>
+
 	</div><!-- .entry-content -->
 
 	<footer class="entry-footer">

diff --git a/template-parts/content.php b/template-parts/content.php
@@ -11,7 +11,7 @@
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 
-		<a href="<?php esc_url( the_permalink() ); ?>" rel="bookmark">
+		<a href="<?php the_permalink(); ?>" rel="bookmark">
 			<?php the_post_thumbnail(); ?>
 		</a>