forked from mirror/_s
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
commit
543cae8bbf
|
|
@ -34,17 +34,17 @@
|
|||
if ( ! _s_categorized_blog() ) {
|
||||
// This blog only has 1 category so we just need to worry about tags in the meta text
|
||||
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 {
|
||||
$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 {
|
||||
// But this blog has loads of categories so we should probably display them here
|
||||
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 {
|
||||
$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
|
||||
|
|
@ -53,8 +53,7 @@
|
|||
$meta_text,
|
||||
$category_list,
|
||||
$tag_list,
|
||||
get_permalink(),
|
||||
the_title_attribute( 'echo=0' )
|
||||
get_permalink()
|
||||
);
|
||||
?>
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<footer id="colophon" class="site-footer" role="contentinfo">
|
||||
<div class="site-info">
|
||||
<?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>
|
||||
<?php printf( __( 'Theme: %1$s by %2$s.', '_s' ), '_s', '<a href="http://automattic.com/" rel="designer">Automattic</a>' ); ?>
|
||||
</div><!-- .site-info -->
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@
|
|||
<?php do_action( 'before' ); ?>
|
||||
<header id="masthead" class="site-header" role="banner">
|
||||
<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>
|
||||
</div>
|
||||
|
||||
<nav id="site-navigation" class="main-navigation" role="navigation">
|
||||
<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' ) ); ?>
|
||||
</nav><!-- #site-navigation -->
|
||||
|
|
|
|||
|
|
@ -19,14 +19,13 @@ get_header(); ?>
|
|||
<div class="entry-meta">
|
||||
<?php
|
||||
$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 × %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 × %5$s</a> in <a href="%6$s" rel="gallery">%7$s</a>', '_s' ),
|
||||
esc_attr( get_the_date( 'c' ) ),
|
||||
esc_html( get_the_date() ),
|
||||
esc_url( wp_get_attachment_url() ),
|
||||
$metadata['width'],
|
||||
$metadata['height'],
|
||||
esc_url( get_permalink( $post->post_parent ) ),
|
||||
esc_attr( strip_tags( get_the_title( $post->post_parent ) ) ),
|
||||
get_the_title( $post->post_parent )
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
* You can add an optional custom header image to header.php like so ...
|
||||
|
||||
<?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="">
|
||||
</a>
|
||||
<?php endif; // End header image check. ?>
|
||||
|
|
|
|||
|
|
@ -159,9 +159,8 @@ function _s_the_attached_image() {
|
|||
$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 ),
|
||||
the_title_attribute( array( 'echo' => false ) ),
|
||||
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' ),
|
||||
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_attr( get_the_time() ),
|
||||
$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_attr( sprintf( __( 'View all posts by %s', '_s' ), get_the_author() ) ),
|
||||
esc_html( get_the_author() )
|
||||
)
|
||||
);
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
<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', '_s' ); ?></span>
|
||||
<input type="search" class="search-field" placeholder="<?php echo esc_attr_x( 'Search …', '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 …', 'placeholder', '_s' ); ?>" value="<?php echo esc_attr( get_search_query() ); ?>" name="s">
|
||||
</label>
|
||||
<input type="submit" class="search-submit" value="<?php echo esc_attr_x( 'Search', 'submit button', '_s' ); ?>">
|
||||
</form>
|
||||
|
|
|
|||
Reference in New Issue