Update to Twenty Ten 1.0.3 from theme dir. see #14284.
git-svn-id: http://svn.automattic.com/wordpress/trunk@15392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
3a5154435e
commit
c43b5bc26b
wp-content/themes/twentyten
|
@ -14,10 +14,12 @@ get_header(); ?>
|
|||
|
||||
<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
|
||||
|
||||
<p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'twentyten' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
|
||||
/* translators: %s - title of parent post */
|
||||
printf( __( '<span class="meta-nav">←</span> %s', 'twentyten' ), get_the_title( $post->post_parent ) );
|
||||
?></a></p>
|
||||
<?php if ( ! empty( $post->post_parent ) ) : ?>
|
||||
<p class="page-title"><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'twentyten' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php
|
||||
/* translators: %s - title of parent post */
|
||||
printf( __( '<span class="meta-nav">←</span> %s', 'twentyten' ), get_the_title( $post->post_parent ) );
|
||||
?></a></p>
|
||||
<?php endif; ?>
|
||||
|
||||
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
|
||||
<h2 class="entry-title"><?php the_title(); ?></h2>
|
||||
|
|
|
@ -39,7 +39,7 @@ body, input, textarea {
|
|||
line-height: 18px;
|
||||
}
|
||||
hr {
|
||||
background-color: #E7E7E7;
|
||||
background-color: #e7e7e7;
|
||||
border:0;
|
||||
height: 1px;
|
||||
margin-bottom: 18px;
|
||||
|
@ -95,7 +95,7 @@ big {
|
|||
font-size: 131.25%;
|
||||
}
|
||||
ins {
|
||||
background: #FFFFCC;
|
||||
background: #ffffcc;
|
||||
border: none;
|
||||
color: #333;
|
||||
}
|
||||
|
@ -142,14 +142,14 @@ sub {
|
|||
top: .5ex;
|
||||
}
|
||||
a:link {
|
||||
color:#0066CC;
|
||||
color:#0066cc;
|
||||
}
|
||||
a:visited {
|
||||
color:#743399;
|
||||
}
|
||||
a:active,
|
||||
a:hover {
|
||||
color: #FF4B33;
|
||||
color: #ff4b33;
|
||||
}
|
||||
p,
|
||||
ul,
|
||||
|
|
|
@ -203,64 +203,6 @@ function twentyten_admin_header_style() {
|
|||
}
|
||||
endif;
|
||||
|
||||
/**
|
||||
* Makes some changes to the <title> tag, by filtering the output of wp_title().
|
||||
*
|
||||
* If we have a site description and we're viewing the home page or a blog posts
|
||||
* page (when using a static front page), then we will add the site description.
|
||||
*
|
||||
* If we're viewing a search result, then we're going to recreate the title entirely.
|
||||
* We're going to add page numbers to all titles as well, to the middle of a search
|
||||
* result title and the end of all other titles.
|
||||
*
|
||||
* The site title also gets added to all titles.
|
||||
*
|
||||
* @since Twenty Ten 1.0
|
||||
*
|
||||
* @param string $title Title generated by wp_title()
|
||||
* @param string $separator The separator passed to wp_title(). Twenty Ten uses a
|
||||
* vertical bar, "|", as a separator in header.php.
|
||||
* @return string The new title, ready for the <title> tag.
|
||||
*/
|
||||
function twentyten_filter_wp_title( $title, $separator ) {
|
||||
// Don't affect wp_title() calls in feeds.
|
||||
if ( is_feed() )
|
||||
return $title;
|
||||
|
||||
// The $paged global variable contains the page number of a listing of posts.
|
||||
// The $page global variable contains the page number of a single post that is paged.
|
||||
// We'll display whichever one applies, if we're not looking at the first page.
|
||||
global $paged, $page;
|
||||
|
||||
if ( is_search() ) {
|
||||
// If we're a search, let's start over:
|
||||
$title = sprintf( __( 'Search results for %s', 'twentyten' ), '"' . get_search_query() . '"' );
|
||||
// Add a page number if we're on page 2 or more:
|
||||
if ( $paged >= 2 )
|
||||
$title .= " $separator " . sprintf( __( 'Page %s', 'twentyten' ), $paged );
|
||||
// Add the site name to the end:
|
||||
$title .= " $separator " . get_bloginfo( 'name', 'display' );
|
||||
// We're done. Let's send the new title back to wp_title():
|
||||
return $title;
|
||||
}
|
||||
|
||||
// Otherwise, let's start by adding the site name to the end:
|
||||
$title .= get_bloginfo( 'name', 'display' );
|
||||
|
||||
// If we have a site description and we're on the home/front page, add the description:
|
||||
$site_description = get_bloginfo( 'description', 'display' );
|
||||
if ( $site_description && ( is_home() || is_front_page() ) )
|
||||
$title .= " $separator " . $site_description;
|
||||
|
||||
// Add a page number if necessary:
|
||||
if ( $paged >= 2 || $page >= 2 )
|
||||
$title .= " $separator " . sprintf( __( 'Page %s', 'twentyten' ), max( $paged, $page ) );
|
||||
|
||||
// Return the new title to wp_title():
|
||||
return $title;
|
||||
}
|
||||
add_filter( 'wp_title', 'twentyten_filter_wp_title', 10, 2 );
|
||||
|
||||
/**
|
||||
* Get our wp_nav_menu() fallback, wp_page_menu(), to show a home link.
|
||||
*
|
||||
|
|
|
@ -15,11 +15,23 @@
|
|||
<title><?php
|
||||
/*
|
||||
* Print the <title> tag based on what is being viewed.
|
||||
* We filter the output of wp_title() a bit -- see
|
||||
* twentyten_filter_wp_title() in functions.php.
|
||||
*/
|
||||
global $page, $paged;
|
||||
|
||||
wp_title( '|', true, 'right' );
|
||||
|
||||
// Add the blog name.
|
||||
bloginfo( 'name' );
|
||||
|
||||
// Add the blog description for the home/front page.
|
||||
$site_description = get_bloginfo( 'description', 'display' );
|
||||
if ( $site_description && ( is_home() || is_front_page() ) )
|
||||
echo " | $site_description";
|
||||
|
||||
// Add a page number if necessary:
|
||||
if ( $paged >= 2 || $page >= 2 )
|
||||
echo ' | ' . sprintf( __( 'Page %s', 'twentyten' ), max( $paged, $page ) );
|
||||
|
||||
?></title>
|
||||
<link rel="profile" href="http://gmpg.org/xfn/11" />
|
||||
<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
|
||||
|
|
|
@ -68,22 +68,23 @@
|
|||
<div class="entry-content">
|
||||
<?php if ( post_password_required() ) : ?>
|
||||
<?php the_content(); ?>
|
||||
<?php else : ?>
|
||||
<div class="gallery-thumb">
|
||||
<?php
|
||||
$images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999 ) );
|
||||
$total_images = count( $images );
|
||||
$image = array_shift( $images );
|
||||
$image_img_tag = wp_get_attachment_image( $image->ID, 'thumbnail' );
|
||||
?>
|
||||
<a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo $image_img_tag; ?></a>
|
||||
</div><!-- .gallery-thumb -->
|
||||
<p><em><?php printf( __( 'This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten' ),
|
||||
'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"',
|
||||
$total_images
|
||||
); ?></em></p>
|
||||
|
||||
<?php the_excerpt(); ?>
|
||||
<?php else : ?>
|
||||
<?php
|
||||
$images = get_children( array( 'post_parent' => $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999 ) );
|
||||
if ( $images ) :
|
||||
$total_images = count( $images );
|
||||
$image = array_shift( $images );
|
||||
$image_img_tag = wp_get_attachment_image( $image->ID, 'thumbnail' );
|
||||
?>
|
||||
<div class="gallery-thumb">
|
||||
<a class="size-thumbnail" href="<?php the_permalink(); ?>"><?php echo $image_img_tag; ?></a>
|
||||
</div><!-- .gallery-thumb -->
|
||||
<p><em><?php printf( __( 'This gallery contains <a %1$s>%2$s photos</a>.', 'twentyten' ),
|
||||
'href="' . get_permalink() . '" title="' . sprintf( esc_attr__( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ) . '" rel="bookmark"',
|
||||
$total_images
|
||||
); ?></em></p>
|
||||
<?php endif; ?>
|
||||
<?php the_excerpt(); ?>
|
||||
<?php endif; ?>
|
||||
</div><!-- .entry-content -->
|
||||
|
||||
|
|
|
@ -7,7 +7,6 @@ Version: 1.0
|
|||
Tags: black, blue, white, two-columns, fixed-width, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style
|
||||
*/
|
||||
|
||||
|
||||
/* Reset default browser CSS. Based on work by Eric Meyer: http://meyerweb.com/eric/tools/css/reset/index.html
|
||||
-------------------------------------------------------------- */
|
||||
|
||||
|
|
Loading…
Reference in New Issue