Changeset 14384
- Timestamp:
- 05/03/2010 07:16:47 PM (15 years ago)
- Location:
- trunk/wp-content/themes/twentyten
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-content/themes/twentyten/attachment.php
r14037 r14384 35 35 get_the_date() 36 36 ); 37 if ( wp_attachment_is_image() ) { 38 $size = getimagesize( wp_get_attachment_url() ); 39 printf( __( ' at <a href="%1$s" title="Link to full-size image">%2$s × %3$s</a>', 'twentyten'), 40 wp_get_attachment_url(), 41 $size[0], 42 $size[1] 43 ); 44 } 37 45 ?> 38 46 <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?> … … 42 50 <div class="entry-attachment"> 43 51 <?php if ( wp_attachment_is_image() ) : ?> 44 <p class="attachment"><a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php 45 echo wp_get_attachment_image( $post->ID, array( $content_width, $content_width ) ); // max $content_width wide or high. 52 <p class="attachment"><a href="<?php echo twentyten_get_next_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php 53 $attachment_size = apply_filters( 'twentyten_attachment_size', 900 ); 54 echo wp_get_attachment_image( $post->ID, array( $attachment_size, 9999 ) ); // filterable image width with, essentially, no limit for image height. 46 55 ?></a></p> 47 56 … … 65 74 $tag_list = get_the_tag_list(); 66 75 if ( '' != $tag_list ) { 67 $utility_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>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' );76 $utility_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>.', 'twentyten' ); 68 77 } else { 69 $utility_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' );78 $utility_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' ); 70 79 } 71 80 printf( … … 97 106 </div><!-- #container --> 98 107 99 <?php get_sidebar(); ?>100 108 <?php get_footer(); ?> -
trunk/wp-content/themes/twentyten/functions.php
r14374 r14384 285 285 endif; 286 286 287 if ( ! function_exists( 'twentyten_cat_list' ) ) :288 /**289 * Returns the list of categories290 *291 * Returns the list of categories based on if we are or are292 * not browsing a category archive page.293 *294 * @uses twentyten_term_list295 *296 * @return string297 */298 function twentyten_cat_list() {299 return twentyten_term_list( 'category', ', ', __( 'Posted in %s', 'twentyten' ), __( 'Also posted in %s', 'twentyten' ) );300 }301 endif;302 303 if ( ! function_exists( 'twentyten_tag_list' ) ) :304 /**305 * Returns the list of tags306 *307 * Returns the list of tags based on if we are or are not308 * browsing a tag archive page309 *310 * @uses twentyten_term_list311 *312 * @return string313 */314 function twentyten_tag_list() {315 return twentyten_term_list( 'post_tag', ', ', __( 'Tagged %s', 'twentyten' ), __( 'Also tagged %s', 'twentyten' ) );316 }317 endif;318 319 320 if ( ! function_exists( 'twentyten_term_list' ) ) :321 /**322 * Returns the list of taxonomy items in multiple ways323 *324 * Returns the list of taxonomy items differently based on325 * if we are browsing a term archive page or a different326 * type of page. If browsing a term archive page and the327 * post has no other taxonomied terms, it returns empty328 *329 * @return string330 */331 function twentyten_term_list( $taxonomy, $glue = ', ', $text = '', $also_text = '' ) {332 global $wp_query, $post;333 $current_term = $wp_query->get_queried_object();334 $terms = wp_get_object_terms( $post->ID, $taxonomy );335 // If we're viewing a Taxonomy page..336 if ( isset( $current_term->taxonomy ) && $taxonomy == $current_term->taxonomy ) {337 // Remove the term from display.338 foreach ( (array) $terms as $key => $term ) {339 if ( $term->term_id == $current_term->term_id ) {340 unset( $terms[$key] );341 break;342 }343 }344 // Change to Also text as we've now removed something from the terms list.345 $text = $also_text;346 }347 $tlist = array();348 $rel = 'category' == $taxonomy ? 'rel="category"' : 'rel="tag"';349 foreach ( (array) $terms as $term ) {350 $tlist[] = '<a href="' . get_term_link( $term, $taxonomy ) . '" title="' . esc_attr( sprintf( __( 'View all posts in %s', 'twentyten' ), $term->name ) ) . '" ' . $rel . '>' . $term->name . '</a>';351 }352 if ( ! empty( $tlist ) )353 return sprintf( $text, join( $glue, $tlist ) );354 return '';355 }356 endif;357 358 287 /** 359 288 * Register widgetized areas, including two sidebars and four widget-ready columns in the footer. … … 440 369 } 441 370 add_action( 'widgets_init', 'twentyten_remove_recent_comments_style' ); 371 372 /** 373 * Get the URL of the next image in a gallery for attachment pages 374 */ 375 function twentyten_get_next_attachment_url() { 376 global $post; 377 $post = get_post($post); 378 $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') )); 379 380 foreach ( $attachments as $k => $attachment ) 381 if ( $attachment->ID == $post->ID ) 382 break; 383 384 $k = $k + 1; 385 386 if ( isset($attachments[$k]) ) { 387 return get_attachment_link($attachments[$k]->ID); 388 } else { 389 return get_permalink($post->post_parent); 390 } 391 } -
trunk/wp-content/themes/twentyten/loop.php
r14350 r14384 143 143 144 144 <div class="entry-utility"> 145 <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php echo twentyten_cat_list(); ?></span></span>145 <span class="cat-links"><span class="entry-utility-prep entry-utility-prep-cat-links"><?php _e( 'Posted in ', 'twentyten' ); ?></span><?php the_category( ', ' ); ?></span> 146 146 <span class="meta-sep"> | </span> 147 <?php $tags_text = twentyten_tag_list(); ?> 148 <?php if ( ! empty( $tags_text ) ) : ?> 149 <span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links"><?php echo $tags_text; ?></span></span> 150 <span class="meta-sep"> | </span> 151 <?php endif; //$tags_text ?> 147 <?php the_tags( '<span class="tag-links"><span class="entry-utility-prep entry-utility-prep-tag-links">' . __( 'Tagged ', 'twentyten' ) . '</span>', ', ', '<span class="meta-sep"> | </span>' ); ?> 152 148 <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'twentyten' ), __( '1 Comment', 'twentyten' ), __( '% Comments', 'twentyten' ) ); ?></span> 153 149 <?php edit_post_link( __( 'Edit', 'twentyten' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?> -
trunk/wp-content/themes/twentyten/single.php
r14289 r14384 55 55 $tag_list = get_the_tag_list('', ', '); 56 56 if ( '' != $tag_list ) { 57 $utility_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>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' );57 $utility_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>.', 'twentyten' ); 58 58 } else { 59 $utility_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>. Follow any comments here with the <a href="%5$s" title="Comments RSS to %4$s" rel="alternate" type="application/rss+xml">RSS feed for this post</a>.', 'twentyten' );59 $utility_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' ); 60 60 } 61 61 printf( … … 64 64 $tag_list, 65 65 get_permalink(), 66 the_title_attribute( 'echo=0' ), 67 get_post_comments_feed_link() 66 the_title_attribute( 'echo=0' ) 68 67 ); 69 68 ?> -
trunk/wp-content/themes/twentyten/style.css
r14300 r14384 93 93 } 94 94 95 /* 96 LAYOUT: Full width, no sidebar 97 DESCRIPTION: Full width content with no sidebar; used for attachment pages 98 */ 99 100 .single-attachment #content { 101 margin: 0 auto; 102 width: 900px; 103 } 95 104 96 105 … … 763 772 max-width: 640px; 764 773 } 774 .single-attachment #content img { 775 max-width: 900px; 776 } 765 777 #content .alignleft, 766 778 #content img.alignleft { … … 812 824 #content .gallery .gallery-item { 813 825 float: left; 814 margin-top: 10px;826 margin-top: 0; 815 827 text-align: center; 816 828 width: 33%; … … 820 832 } 821 833 #content .gallery .gallery-caption { 822 margin-left: 0; 834 color: #888; 835 font-size: 12px; 836 margin: 0 0 12px; 823 837 } 824 838 #content .gallery dl { … … 827 841 #content .gallery img { 828 842 border: 10px solid #f1f1f1; 829 }830 #content .gallery-caption {831 color: #888;832 font-size: 12px;833 margin:-24px 0 24px 0;834 843 } 835 844 #content .gallery br+br {
Note: See TracChangeset
for help on using the changeset viewer.