rayelliott
/
_s
Archived
forked from mirror/_s
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/davidakennedy/_s into titles 

Conflicts:
	image.php
	inc/custom-header.php
	searchform.php
This commit is contained in:
obenland 2013-09-25 14:59:11 -07:00
parent 083d8a580d 48ac0da4e1
commit 543cae8bbf
7 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
content-single.php
View File

@ -34,17 +34,17 @@
if ( ! _s_categorized_blog() ) { if ( ! _s_categorized_blog() ) {
// This blog only has 1 category so we just need to worry about tags in the meta text // This blog only has 1 category so we just need to worry about tags in the meta text
if ( '' != $tag_list ) { if ( '' != $tag_list ) {
$meta_text = __( 'This entry was tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', '_s' ); $meta_text = __( 'This entry was tagged %2$s. Bookmark the <a href="%3$s" rel="bookmark">permalink</a>.', '_s' );
} else { } else {
$meta_text = __( 'Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', '_s' ); $meta_text = __( 'Bookmark the <a href="%3$s" rel="bookmark">permalink</a>.', '_s' );
} }
} else { } else {
// But this blog has loads of categories so we should probably display them here // But this blog has loads of categories so we should probably display them here
if ( '' != $tag_list ) { if ( '' != $tag_list ) {
$meta_text = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', '_s' ); $meta_text = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" rel="bookmark">permalink</a>.', '_s' );
} else { } else {
$meta_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', '_s' ); $meta_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" rel="bookmark">permalink</a>.', '_s' );
} }
} // end check for categories on this blog } // end check for categories on this blog
@ -53,8 +53,7 @@
$meta_text, $meta_text,
$category_list, $category_list,
$tag_list, $tag_list,
get_permalink(), get_permalink()
the_title_attribute( 'echo=0' )
); );
?> ?>

2
footer.php
View File

@ -13,7 +13,7 @@
<footer id="colophon" class="site-footer" role="contentinfo"> <footer id="colophon" class="site-footer" role="contentinfo">
<div class="site-info"> <div class="site-info">
<?php do_action( '_s_credits' ); ?> <?php do_action( '_s_credits' ); ?>
<a href="http://wordpress.org/" title="<?php esc_attr_e( 'A Semantic Personal Publishing Platform', '_s' ); ?>" rel="generator"><?php printf( __( 'Proudly powered by %s', '_s' ), 'WordPress' ); ?></a> <a href="http://wordpress.org/" rel="generator"><?php printf( __( 'Proudly powered by %s', '_s' ), 'WordPress' ); ?></a>
<span class="sep"> | </span> <span class="sep"> | </span>
<?php printf( __( 'Theme: %1$s by %2$s.', '_s' ), '_s', '<a href="http://automattic.com/" rel="designer">Automattic</a>' ); ?> <?php printf( __( 'Theme: %1$s by %2$s.', '_s' ), '_s', '<a href="http://automattic.com/" rel="designer">Automattic</a>' ); ?>
</div><!-- .site-info --> </div><!-- .site-info -->

4
header.php
View File

@ -23,13 +23,13 @@
<?php do_action( 'before' ); ?> <?php do_action( 'before' ); ?>
<header id="masthead" class="site-header" role="banner"> <header id="masthead" class="site-header" role="banner">
<div class="site-branding"> <div class="site-branding">
<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1> <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
<h2 class="site-description"><?php bloginfo( 'description' ); ?></h2> <h2 class="site-description"><?php bloginfo( 'description' ); ?></h2>
</div> </div>
<nav id="site-navigation" class="main-navigation" role="navigation"> <nav id="site-navigation" class="main-navigation" role="navigation">
<h1 class="menu-toggle"><?php _e( 'Menu', '_s' ); ?></h1> <h1 class="menu-toggle"><?php _e( 'Menu', '_s' ); ?></h1>
<div class="screen-reader-text skip-link"><a href="#content" title="<?php esc_attr_e( 'Skip to content', '_s' ); ?>"><?php _e( 'Skip to content', '_s' ); ?></a></div> <div class="screen-reader-text skip-link"><a href="#content"><?php _e( 'Skip to content', '_s' ); ?></a></div>
<?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?> <?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
</nav><!-- #site-navigation --> </nav><!-- #site-navigation -->

3
image.php
View File

@ -19,14 +19,13 @@ get_header(); ?>
<div class="entry-meta"> <div class="entry-meta">
<?php <?php
$metadata = wp_get_attachment_metadata(); $metadata = wp_get_attachment_metadata();
printf( __( 'Published <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>', '_s' ), printf( __( 'Published <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s">%4$s &times; %5$s</a> in <a href="%6$s" rel="gallery">%7$s</a>', '_s' ),
esc_attr( get_the_date( 'c' ) ), esc_attr( get_the_date( 'c' ) ),
esc_html( get_the_date() ), esc_html( get_the_date() ),
esc_url( wp_get_attachment_url() ), esc_url( wp_get_attachment_url() ),
$metadata['width'], $metadata['width'],
$metadata['height'], $metadata['height'],
esc_url( get_permalink( $post->post_parent ) ), esc_url( get_permalink( $post->post_parent ) ),
esc_attr( strip_tags( get_the_title( $post->post_parent ) ) ),
get_the_title( $post->post_parent ) get_the_title( $post->post_parent )
); );

2
inc/custom-header.php
View File

@ -6,7 +6,7 @@
* You can add an optional custom header image to header.php like so ... * You can add an optional custom header image to header.php like so ...
<?php if ( get_header_image() ) : ?> <?php if ( get_header_image() ) : ?>
<a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"> <a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
<img src="<?php header_image(); ?>" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt=""> <img src="<?php header_image(); ?>" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="">
</a> </a>
<?php endif; // End header image check. ?> <?php endif; // End header image check. ?>

9
inc/template-tags.php
View File

@ -159,9 +159,8 @@ function _s_the_attached_image() {
$next_attachment_url = get_attachment_link( array_shift( $attachment_ids ) ); $next_attachment_url = get_attachment_link( array_shift( $attachment_ids ) );
} }
printf( '<a href="%1$s" title="%2$s" rel="attachment">%3$s</a>', printf( '<a href="%1$s" rel="attachment">%2$s</a>',
esc_url( $next_attachment_url ), esc_url( $next_attachment_url ),
the_title_attribute( array( 'echo' => false ) ),
wp_get_attachment_image( $post->ID, $attachment_size ) wp_get_attachment_image( $post->ID, $attachment_size )
); );
} }
@ -184,14 +183,12 @@ function _s_posted_on() {
); );
printf( __( '<span class="posted-on">Posted on %1$s</span><span class="byline"> by %2$s</span>', '_s' ), printf( __( '<span class="posted-on">Posted on %1$s</span><span class="byline"> by %2$s</span>', '_s' ),
sprintf( '<a href="%1$s" title="%2$s" rel="bookmark">%3$s</a>', sprintf( '<a href="%1$s" rel="bookmark">%2$s</a>',
esc_url( get_permalink() ), esc_url( get_permalink() ),
esc_attr( get_the_time() ),
$time_string $time_string
), ),
sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>', sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s">%2$s</a></span>',
esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ), esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
esc_attr( sprintf( __( 'View all posts by %s', '_s' ), get_the_author() ) ),
esc_html( get_the_author() ) esc_html( get_the_author() )
) )
); );

2
searchform.php
View File

@ -8,7 +8,7 @@
<form role="search" method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>"> <form role="search" method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
<label> <label>
<span class="screen-reader-text"><?php _ex( 'Search for:', 'label', '_s' ); ?></span> <span class="screen-reader-text"><?php _ex( 'Search for:', 'label', '_s' ); ?></span>
<input type="search" class="search-field" placeholder="<?php echo esc_attr_x( 'Search &hellip;', 'placeholder', '_s' ); ?>" value="<?php echo esc_attr( get_search_query() ); ?>" name="s" title="<?php echo esc_attr_x( 'Search for:', 'label', '_s' ); ?>"> <input type="search" class="search-field" placeholder="<?php echo esc_attr_x( 'Search &hellip;', 'placeholder', '_s' ); ?>" value="<?php echo esc_attr( get_search_query() ); ?>" name="s">
</label> </label>
<input type="submit" class="search-submit" value="<?php echo esc_attr_x( 'Search', 'submit button', '_s' ); ?>"> <input type="submit" class="search-submit" value="<?php echo esc_attr_x( 'Search', 'submit button', '_s' ); ?>">
</form> </form>