Index: wp-content/themes/twentyten/searchform.php =================================================================== --- wp-content/themes/twentyten/searchform.php (revision 13052) +++ wp-content/themes/twentyten/searchform.php (working copy) @@ -1,7 +1,7 @@ -
+
- + - +
\ No newline at end of file Index: wp-content/themes/twentyten/footer.php =================================================================== --- wp-content/themes/twentyten/footer.php (revision 13052) +++ wp-content/themes/twentyten/footer.php (working copy) @@ -3,10 +3,10 @@ -max_num_pages; if ( $total_pages > 1 ) { ?> - - + - + \ No newline at end of file Index: wp-content/themes/twentyten/functions.php =================================================================== --- wp-content/themes/twentyten/functions.php (revision 13052) +++ wp-content/themes/twentyten/functions.php (working copy) @@ -1,12 +1,14 @@ ID ) ) { + echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' ); + } else { ?> + +' . 'Continue reading →' . ''; } -add_filter('excerpt_more', 'new_excerpt_more'); +add_filter( 'excerpt_more', 'twentyten_new_excerpt_more' ); +// Displays the archive title +function twentyten_page_title() { + $title = null; + $description = ''; + + if ( is_search() ) { + $title = sprintf( __( 'Search Results for: %s', 'twentyten' ), esc_attr( apply_filters('the_search_query', get_search_query()) ) ); + + } elseif ( is_tax() ) { + global $wp_query; + $term = $wp_query->get_queried_object(); + $title = sprintf( __( 'Taxonomy Archives: %s', 'twentyten' ), esc_html($term->name) ); + if ( $term->description ) + $description = apply_filters( 'archive_meta', '

' . esc_html($term->description) . '

' ); + + } elseif ( is_category() ) { + $title = sprintf( __( 'Category Archives: %s', 'twentyten' ), single_cat_title( '', false ) ); + if ( category_description() ) + $description = apply_filters( 'archive_meta', '
' . category_description() . '
' ); + + } elseif ( is_tag() ) { + $title = sprintf( __( 'Tag Archives: %s', 'twentyten' ), single_tag_title( '', false ) ); + if ( tag_description() ) + $description = apply_filters( 'archive_meta', '
' . tag_description() . '
' ); + + } elseif ( is_author() ) { + $title = sprintf( __( 'Author Archives: %s', 'twentyten' ), ''. esc_html(get_the_author()) .'' ); + if ( get_the_author_meta( 'description' ) ) { + $description = '
' . "\n" . '
' . "\n"; + $description .= get_avatar( get_the_author_meta('user_email'), apply_filters('twentyten_author_bio_avatar_size', 60) ); + $description .= '
' . "\n" . '
' . "\n"; + $description .= '

'. sprintf( __( 'About %s', 'twentyten' ), get_the_author() ) .'

'; + $description .= get_the_author_meta( 'description' ) . '
' . "\n" . '
'; + } + + } elseif ( is_day() ) { + $title = sprintf( __( 'Daily Archives: %s', 'twentyten' ), get_the_time(get_option('date_format')) ); + + } elseif ( is_month() ) { + $title = sprintf( __( 'Monthly Archives: %s', 'twentyten' ), get_the_time('F Y') ); + + } elseif ( is_year() ) { + $title = sprintf( __( 'Yearly Archives: %s', 'twentyten' ), get_the_time('Y') ); + + } elseif ( isset($_GET['paged']) && !empty($_GET['paged']) ) { + $title = __( 'Archives', 'twentyten' ); + } + echo apply_filters( 'twentyten_page_title', '

'. $title .'

' . $description ); +} +// Displays the Newer Posts|Older Posts links +function twentyten_page_links() { + global $wp_query; + $total_pages = $wp_query->max_num_pages; + $pagelinks = ''; + + if ( $total_pages > 1 ) { + $pagelinks = '' . "\n"; + } + echo apply_filters( 'twentyten_page_links', $pagelinks ); +} + // Template for comments and pingbacks -function twentyten_comment($comment, $args, $depth) { - $GLOBALS ['comment'] = $comment; ?> - comment_type) { ?> -
  • id="li-comment-"> +function twentyten_list_comments( $comment, $args, $depth ) { + $GLOBALS['comment'] = $comment; ?> + comment_type ) { ?> +
  • id="li-comment-">
    - + - %s says:'), get_comment_author_link()) ?> + %s says:', 'twentyten' ), get_comment_author_link() ); ?>
    comment_approved == '0') : ?> - +
    -
    +
    -
    +
    - $depth, 'max_depth' => $args['max_depth']))) ?> + $depth, 'max_depth' => $args['max_depth'])) ); ?>
  • -

    +

    "; +function twentyten_remove_gallery_css() { + return '
    '; } -add_filter('gallery_style', 'remove_gallery_css'); +add_filter( 'gallery_style', 'twentyten_remove_gallery_css' ); - -// For category lists on category archives: Returns other categories except the current one (redundant) -function cats_meow($glue) { - $current_cat = single_cat_title( '', false ); +// Displays a list of all the terms the post has +function twentyten_terms_lists( $args = array() ) { + global $wp_query; + + $defaults = array( + 'category' => __( 'Also posted in ', 'twentyten' ), + 'post_tag' => __( 'Tagged ', 'twentyten' ), + 'glue' => ', ', + 'sep' => ' | ', + 'end' => ' | ', + ); + + $args = wp_parse_args( $args, $defaults ); + + $taxonomies = get_the_taxonomies(); + $current_tax = $wp_query->get_queried_object(); + $current_tax = isset($current_tax->name) ? $current_tax->name : ' '; $separator = "\n"; - $cats = explode( $separator, get_the_category_list($separator) ); - foreach ( $cats as $i => $str ) { - if ( strstr( $str, ">$current_cat<" ) ) { - unset($cats[$i]); - break; - } - } - if ( empty($cats) ) + + if ( empty($taxonomies) ) return false; - - return trim(join( $glue, $cats )); -} // end cats_meow - - - -// For tag lists on tag archives: Returns other tags except the current one (redundant) -function tag_ur_it($glue) { - $current_tag = single_tag_title( '', '', false ); - $separator = "\n"; - $tags = explode( $separator, get_the_tag_list( "", "$separator", "" ) ); - foreach ( $tags as $i => $str ) { - if ( strstr( $str, ">$current_tag<" ) ) { - unset($tags[$i]); - break; + + $tax_terms = array(); + $_tax_terms = array(); + + $c = count( $taxonomies ); + $keys = array_keys( $taxonomies ); + foreach ( $taxonomies as $key => $value ) { + $tax_terms[$key] = explode( $separator, get_the_term_list(0, $key, '', $separator, '') ); + foreach ( $tax_terms[$key] as $i => $term ) { + if ( strstr( strip_tags($term), $current_tax ) ) { + unset( $tax_terms[$key][$i] ); + break; + } } + + if ( empty($tax_terms[$key]) ) + continue; + + $tax_name = isset($args[$key]) ? $args[$key] : ' ' . ucwords($key) .' '; + + $_tax_terms[$key] = ''; + $_tax_terms[$key] .= ''. $tax_name .''; + $_tax_terms[$key] .= trim( join( $args['glue'], $tax_terms[$key] ) ) . ''; } - if ( empty($tags) ) - return false; + echo apply_filters( 'twenty_terms_lists', join( $args['sep'], $_tax_terms ) . $args['end'] ); +} - return trim(join( $glue, $tags )); -} // end tag_ur_it - // Register widgetized areas -function theme_widgets_init() { +function twentyten_widgets_init() { // Area 1 - register_sidebar( array ( + register_sidebar( array( 'name' => 'Primary Widget Area', 'id' => 'primary-widget-area', 'description' => __('The primary widget area' , 'twentyten'), @@ -180,7 +307,7 @@ ) ); // Area 2 - register_sidebar( array ( + register_sidebar( array( 'name' => 'Secondary Widget Area', 'id' => 'secondary-widget-area', 'description' => __('The secondary widget area' , 'twentyten'), @@ -191,7 +318,7 @@ ) ); // Area 3 - register_sidebar( array ( + register_sidebar( array( 'name' => 'First Footer Widget Area', 'id' => 'first-footer-widget-area', 'description' => __('The first footer widget area' , 'twentyten'), @@ -202,7 +329,7 @@ ) ); // Area 4 - register_sidebar( array ( + register_sidebar( array( 'name' => 'Second Footer Widget Area', 'id' => 'second-footer-widget-area', 'description' => __('The second footer widget area' , 'twentyten'), @@ -213,7 +340,7 @@ ) ); // Area 5 - register_sidebar( array ( + register_sidebar( array( 'name' => 'Third Footer Widget Area', 'id' => 'third-footer-widget-area', 'description' => __('The third footer widget area' , 'twentyten'), @@ -224,7 +351,7 @@ ) ); // Area 6 - register_sidebar( array ( + register_sidebar( array( 'name' => 'Fourth Footer Widget Area', 'id' => 'fourth-footer-widget-area', 'description' => __('The fourth footer widget area' , 'twentyten'), @@ -234,9 +361,7 @@ 'after_title' => '', ) ); -} // end theme_widgets_init +} - - // Add all the groovy widget areas -add_action( 'init', 'theme_widgets_init' ); +add_action( 'init', 'twentyten_widgets_init' ); \ No newline at end of file Index: wp-content/themes/twentyten/sidebar.php =================================================================== --- wp-content/themes/twentyten/sidebar.php (revision 13052) +++ wp-content/themes/twentyten/sidebar.php (working copy) @@ -6,20 +6,18 @@
  • -

    +

  • -

    +

    • @@ -29,7 +27,7 @@
    \ No newline at end of file Index: wp-content/themes/twentyten/tag.php =================================================================== --- wp-content/themes/twentyten/tag.php (revision 13052) +++ wp-content/themes/twentyten/tag.php (working copy) @@ -3,41 +3,29 @@
    - + + + + -

    - - - -max_num_pages; if ( $total_pages > 1 ) { ?> - - -
    >

    - - - - + + + +
    -→', 'twentyten' ) ); ?> + →', 'twentyten' ) ); ?>
    - - | - - - + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?>
    @@ -45,12 +33,7 @@ -max_num_pages; if ( $total_pages > 1 ) { ?> - - +
    Index: wp-content/themes/twentyten/page.php =================================================================== --- wp-content/themes/twentyten/page.php (revision 13052) +++ wp-content/themes/twentyten/page.php (working copy) @@ -8,13 +8,13 @@
    >

    - -' . __( 'Pages:', 'twentyten' ) . '&after=
    ') ?> -', '' ) ?> + + ' . __( 'Pages:', 'twentyten' ) . '&after=
    ' ); ?> + ', '' ); ?>
    - + Index: wp-content/themes/twentyten/category.php =================================================================== --- wp-content/themes/twentyten/category.php (revision 13052) +++ wp-content/themes/twentyten/category.php (working copy) @@ -1,46 +1,31 @@ -
    - + + + + -

    - ' . $categorydesc . '
    ' ); ?> - - - -max_num_pages; if ( $total_pages > 1 ) { ?> - - -
    >

    - - - - + + + +
    →', 'twentyten' ) ); ?>
    - +
    - - - | - - ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ) ?> + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?>
    @@ -48,12 +33,7 @@ -max_num_pages; if ( $total_pages > 1 ) { ?> - - +
    Index: wp-content/themes/twentyten/archive.php =================================================================== --- wp-content/themes/twentyten/archive.php (revision 13052) +++ wp-content/themes/twentyten/archive.php (working copy) @@ -3,37 +3,20 @@
    - + + + + - -

    %s', 'twentyten' ), get_the_time(get_option('date_format')) ) ?>

    - -

    %s', 'twentyten' ), get_the_time('F Y') ) ?>

    - -

    %s', 'twentyten' ), get_the_time('Y') ) ?>

    - -

    - - - - -max_num_pages; if ( $total_pages > 1 ) { ?> - - -
    >

    - - - + + +
    @@ -42,22 +25,15 @@
    - - | - ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ) ?> - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ) ?> + + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?>
    -max_num_pages; if ( $total_pages > 1 ) { ?> - - +
    Index: wp-content/themes/twentyten/single.php =================================================================== --- wp-content/themes/twentyten/single.php (revision 13052) +++ wp-content/themes/twentyten/single.php (working copy) @@ -6,35 +6,34 @@
    >

    - - - - + + + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t" ) ?>
    - -' . __( 'Pages:', 'twentyten' ) . '&after=
    ') ?> + + ' . __( 'Pages:', 'twentyten' ) . '&after=
    ' ); ?>
    - +

    - + @@ -43,23 +42,38 @@
    - permalink. Follow any comments here with the RSS feed for this post.', 'twentyten' ), - get_the_category_list(', '), - get_the_tag_list( __( ' and tagged ', 'twentyten' ), ', ', '' ), - get_permalink(), - the_title_attribute('echo=0'), - get_post_comments_feed_link() ) ?> - -", "" ) ?> + __( 'This entry was posted in ', 'twentyten' ), + 'post_tag' => __( ' and tagged ', 'twentyten' ), + 'glue' => ', ', + 'sep' => '', + 'end' => '. ', + ) ); + printf( __( 'Bookmark the permalink. Follow any comments here with the RSS feed for this post.', 'twentyten' ), + get_permalink(), + the_title_attribute( 'echo=0' ), + get_post_comments_feed_link() + ); ?> + + + Post a comment or leave a trackback: Trackback URL.', 'twentyten' ), get_trackback_url() ); ?> + + Trackback URL.', 'twentyten' ), get_trackback_url() ); ?> + + post a comment.', 'twentyten' ); ?> + + + + ", "" ); ?>
    Index: wp-content/themes/twentyten/comments.php =================================================================== --- wp-content/themes/twentyten/comments.php (revision 13052) +++ wp-content/themes/twentyten/comments.php (working copy) @@ -1,12 +1,12 @@
    -
    +
    1 ) : // are there comments to navigate through ?>
    -
    -
    +
    +
      - 'twentyten_comment') ); ?> + 'twentyten_list_comments') ); ?>
    1 ) : // are there comments to navigate through ?>
    -
    -
    +
    +
    @@ -44,7 +44,7 @@ -

    +

    Index: wp-content/themes/twentyten/header.php =================================================================== --- wp-content/themes/twentyten/header.php (revision 13052) +++ wp-content/themes/twentyten/header.php (working copy) @@ -1,28 +1,16 @@ > - <?php - if ( is_single() ) { single_post_title(); print ' | '; bloginfo('name'); } - elseif ( is_home() || is_front_page() ) { bloginfo('name'); print ' | '; bloginfo('description'); get_page_number(); } - elseif ( is_page() ) { single_post_title(''); print ' | '; bloginfo('name'); } - elseif ( is_search() ) { print 'Search results for ' . wp_specialchars($s); get_page_number(); print ' | '; bloginfo('name'); } - elseif ( is_404() ) { print 'Not Found | '; bloginfo('name'); } - else { bloginfo('name'); wp_title('|'); get_page_number(); } - ?> + <?php twentyten_document_title(); ?> - - + - - - - - + - - - + + + > @@ -32,20 +20,13 @@
    -
    -
    - - ID ) ) { - echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' ); - } else { ?> - - +
    +
    +
    - +
    Index: wp-content/themes/twentyten/attachment.php =================================================================== --- wp-content/themes/twentyten/attachment.php (revision 13052) +++ wp-content/themes/twentyten/attachment.php (working copy) @@ -5,64 +5,68 @@ -

    ← post_parent) ?>

    +

    ← post_parent ); ?>

    >

    - - - | - - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t" ) ?> + + + + + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t" ); ?>
    - +
    -id ) ) : $att_image = wp_get_attachment_image_src( $post->id, array(640,640)); ?> -

    <?php $post->post_excerpt; ?> -

    - - - +id ) ) : $att_image = wp_get_attachment_image_src( $post->id, array(640,640) ); ?> +

    <?php $post->post_excerpt; ?>

    + + - guid) ?> + guid); ?> -
    -
    post_excerpt) ) the_excerpt() ?>
    +
    +
    post_excerpt) ) the_excerpt(); ?>
    -→', 'twentyten' ) ); ?> -' . __( 'Pages:', 'twentyten' ) . '&after=
    ') ?> + →', 'twentyten' ) ); ?> + ' . __( 'Pages:', 'twentyten' ) . '&after=
    ' ); ?>
    - permalink. Follow any comments here with the RSS feed for this post.', 'twentyten' ), - get_the_category_list(', '), - get_the_tag_list( __( ' and tagged ', 'twentyten' ), ', ', '' ), - get_permalink(), - the_title_attribute('echo=0'), - comments_rss() ) ?> - - - Post a comment or leave a trackback: Trackback URL.', 'twentyten' ), get_trackback_url() ) ?> - - Trackback URL.', 'twentyten' ), get_trackback_url() ) ?> - - post a comment.', 'twentyten' ) ?> - - - -", "" ) ?> + __( 'This entry was posted in ', 'twentyten' ), + 'post_tag' => __( ' and tagged ', 'twentyten' ), + 'glue' => ', ', + 'sep' => '', + 'end' => '. ', + ) ); + printf( __( 'Bookmark the permalink. Follow any comments here with the RSS feed for this post.', 'twentyten' ), + get_permalink(), + the_title_attribute( 'echo=0' ), + get_post_comments_feed_link() + ); ?> + + + Post a comment or leave a trackback: Trackback URL.', 'twentyten' ), get_trackback_url() ); ?> + + Trackback URL.', 'twentyten' ), get_trackback_url() ); ?> + + post a comment.', 'twentyten' ); ?> + + + + ", "" ); ?>
    - +