Permalink
Browse files

Merge Twenty Ten 1.1 to the 3.0 branch.

git-svn-id: http://svn.automattic.com/wordpress/branches/3.0@16628 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
1 parent 3ccbe58 commit c051fdc952abcf2f14bfe4a92310fa3628adcd85 nacin committed Nov 30, 2010
@@ -12,13 +12,105 @@
<div id="container" class="single-attachment">
<div id="content" role="main">
- <?php
- /* Run the loop to output the attachment.
- * If you want to overload this in a child theme then include a file
- * called loop-attachment.php and that will be used instead.
- */
- get_template_part( 'loop', 'attachment' );
- ?>
+<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+
+ <?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">&larr;</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>
+
+ <div class="entry-meta">
+ <?php
+ printf(__('<span class="%1$s">By</span> %2$s', 'twentyten'),
+ 'meta-prep meta-prep-author',
+ sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
+ get_author_posts_url( get_the_author_meta( 'ID' ) ),
+ sprintf( esc_attr__( 'View all posts by %s', 'twentyten' ), get_the_author() ),
+ get_the_author()
+ )
+ );
+ ?>
+ <span class="meta-sep">|</span>
+ <?php
+ printf( __('<span class="%1$s">Published</span> %2$s', 'twentyten'),
+ 'meta-prep meta-prep-entry-date',
+ sprintf( '<span class="entry-date"><abbr class="published" title="%1$s">%2$s</abbr></span>',
+ esc_attr( get_the_time() ),
+ get_the_date()
+ )
+ );
+ if ( wp_attachment_is_image() ) {
+ echo ' <span class="meta-sep">|</span> ';
+ $metadata = wp_get_attachment_metadata();
+ printf( __( 'Full size is %s pixels', 'twentyten'),
+ sprintf( '<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
+ wp_get_attachment_url(),
+ esc_attr( __('Link to full-size image', 'twentyten') ),
+ $metadata['width'],
+ $metadata['height']
+ )
+ );
+ }
+ ?>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-meta -->
+
+ <div class="entry-content">
+ <div class="entry-attachment">
+<?php if ( wp_attachment_is_image() ) :
+ $attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
+ foreach ( $attachments as $k => $attachment ) {
+ if ( $attachment->ID == $post->ID )
+ break;
+ }
+ $k++;
+ // If there is more than 1 image attachment in a gallery
+ if ( count( $attachments ) > 1 ) {
+ if ( isset( $attachments[ $k ] ) )
+ // get the URL of the next image attachment
+ $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+ else
+ // or get the URL of the first image attachment
+ $next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
+ } else {
+ // or, if there's only 1 image attachment, get the URL of the image
+ $next_attachment_url = wp_get_attachment_url();
+ }
+?>
+ <p class="attachment"><a href="<?php echo $next_attachment_url; ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
+ $attachment_size = apply_filters( 'twentyten_attachment_size', 900 );
+ echo wp_get_attachment_image( $post->ID, array( $attachment_size, 9999 ) ); // filterable image width with, essentially, no limit for image height.
+ ?></a></p>
+
+ <div id="nav-below" class="navigation">
+ <div class="nav-previous"><?php previous_image_link( false ); ?></div>
+ <div class="nav-next"><?php next_image_link( false ); ?></div>
+ </div><!-- #nav-below -->
+<?php else : ?>
+ <a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
+<?php endif; ?>
+ </div><!-- .entry-attachment -->
+ <div class="entry-caption"><?php if ( !empty( $post->post_excerpt ) ) the_excerpt(); ?></div>
+
+<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?>
+<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+
+ </div><!-- .entry-content -->
+
+ <div class="entry-utility">
+ <?php twentyten_posted_in(); ?>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), ' <span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-utility -->
+ </div><!-- #post-## -->
+
+<?php comments_template(); ?>
+
+<?php endwhile; ?>
</div><!-- #content -->
</div><!-- #container -->
@@ -1,13 +1,15 @@
/*
Theme Name: Twenty Ten
-Description: Used to style the TinyMCE editor.
+*/
+/*
+Used to style the TinyMCE editor.
*/
html .mceContentBody {
- max-width: 640px;
+ max-width:640px;
}
* {
- color: #444;
font-family: Georgia, "Bitstream Charter", serif;
+ color: #444;
line-height: 1.5;
}
p,
@@ -38,10 +40,10 @@ body, input, textarea {
}
hr {
background-color: #e7e7e7;
- border: 0;
- clear: both;
+ border:0;
height: 1px;
margin-bottom: 18px;
+ clear:both;
}
/* Text elements */
p {
@@ -56,22 +58,22 @@ ol {
margin: 0 0 18px 1.5em;
}
ol ol {
- list-style: upper-alpha;
+ list-style:upper-alpha;
}
ol ol ol {
- list-style: lower-roman;
+ list-style:lower-roman;
}
ol ol ol ol {
- list-style: lower-alpha;
+ list-style:lower-alpha;
}
ul ul,
ol ol,
ul ol,
ol ul {
- margin-bottom: 0;
+ margin-bottom:0;
}
dl {
- margin: 0 0 24px 0;
+ margin:0 0 24px 0;
}
dt {
font-weight: bold;
@@ -80,20 +82,20 @@ dd {
margin-bottom: 18px;
}
strong {
- color: #000;
font-weight: bold;
+ color: #000;
}
cite,
em,
i {
- border: none;
font-style: italic;
+ border: none;
}
big {
font-size: 131.25%;
}
ins {
- background: #ffc;
+ background: #ffffcc;
border: none;
color: #333;
}
@@ -127,11 +129,11 @@ ins {
}
sup,
sub {
- font-size: 10px;
height: 0;
line-height: 1;
- position: relative;
vertical-align: baseline;
+ position: relative;
+ font-size: 10px;
}
sup {
bottom: 1ex;
@@ -140,10 +142,10 @@ sub {
top: .5ex;
}
a:link {
- color: #06c;
+ color:#0066cc;
}
a:visited {
- color: #743399;
+ color:#743399;
}
a:active,
a:hover {
@@ -155,13 +157,13 @@ ol,
dd,
pre,
hr {
- margin-bottom: 24px;
+ margin-bottom:24px;
}
ul ul,
ol ol,
ul ol,
ol ul {
- margin-bottom: 0;
+ margin-bottom:0;
}
pre,
kbd,
@@ -186,9 +188,9 @@ h4,
h5,
h6 {
color: #000;
- font-weight: normal;
- line-height: 1.5em;
margin: 0 0 20px 0;
+ line-height: 1.5em;
+ font-weight: normal;
}
h1 {
font-size: 2.4em;
@@ -210,11 +212,11 @@ h6 {
}
table {
border: 1px solid #e7e7e7 !important;
- border-collapse: collapse;
- border-spacing: 0;
- margin: 0 -1px 24px 0;
text-align: left;
+ margin: 0 -1px 24px 0;
width: 100%;
+ border-collapse: collapse;
+ border-spacing: 0;
}
tr th,
thead th {
@@ -230,15 +232,11 @@ tr td {
border-top: 1px solid #e7e7e7 !important;
padding: 6px 24px;
}
+
+
img {
margin: 0;
-}
-img.size-auto,
-img.size-large,
-img.size-full,
-img.size-medium {
- max-width: 100%;
- height: auto;
+ max-width: 640px;
}
.alignleft,
img.alignleft {
@@ -267,19 +265,18 @@ img.aligncenter {
margin-bottom: 12px;
}
.wp-caption {
- background: #f1f1f1;
border: none;
- -khtml-border-radius: 0;
- -moz-border-radius: 0;
- -webkit-border-radius: 0;
- border-radius: 0;
+ background: #f1f1f1;
color: #888;
font-size: 12px;
line-height: 18px;
+ text-align: center;
margin-bottom: 20px;
- max-width: 632px !important; /* prevent too-wide images from breaking layout */
padding: 4px;
- text-align: center;
+ -moz-border-radius: 0;
+ -khtml-border-radius: 0;
+ -webkit-border-radius: 0;
+ border-radius: 0;
}
.wp-caption img {
margin: 5px;
@@ -288,5 +285,5 @@ img.aligncenter {
margin: 0 0 4px;
}
.wp-smiley {
- margin: 0;
+ margin:0;
}
@@ -73,7 +73,7 @@
$image[1] >= HEADER_IMAGE_WIDTH ) :
// Houston, we have a new header image!
echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
- elseif ( get_header_image() ) : ?>
+ else : ?>
<img src="<?php header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="" />
<?php endif; ?>
</div><!-- #branding -->
@@ -17,13 +17,20 @@
<div id="container" class="one-column">
<div id="content" role="main">
- <?php
- /* Run the loop to output the page.
- * If you want to overload this in a child theme then include a file
- * called loop-page.php and that will be used instead.
- */
- get_template_part( 'loop', 'page' );
- ?>
+<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <h1 class="entry-title"><?php the_title(); ?></h1>
+ <div class="entry-content">
+ <?php the_content(); ?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-content -->
+ </div><!-- #post-## -->
+
+ <?php comments_template( '', true ); ?>
+
+<?php endwhile; ?>
</div><!-- #content -->
</div><!-- #container -->
@@ -17,13 +17,25 @@
<div id="container">
<div id="content" role="main">
- <?php
- /* Run the loop to output the page.
- * If you want to overload this in a child theme then include a file
- * called loop-page.php and that will be used instead.
- */
- get_template_part( 'loop', 'page' );
- ?>
+<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
+
+ <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <?php if ( is_front_page() ) { ?>
+ <h2 class="entry-title"><?php the_title(); ?></h2>
+ <?php } else { ?>
+ <h1 class="entry-title"><?php the_title(); ?></h1>
+ <?php } ?>
+
+ <div class="entry-content">
+ <?php the_content(); ?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
+ <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-content -->
+ </div><!-- #post-## -->
+
+ <?php comments_template( '', true ); ?>
+
+<?php endwhile; ?>
</div><!-- #content -->
</div><!-- #container -->
@@ -120,9 +120,6 @@ blockquote {
float: left;
font-style: normal;
}
-#branding img {
- float: right;
-}
/* =Menu
-------------------------------------------------------------- */
Oops, something went wrong.

0 comments on commit c051fdc

Please sign in to comment.