Index: wp-content/themes/twentyten/author.php =================================================================== --- wp-content/themes/twentyten/author.php (revision 13142) +++ wp-content/themes/twentyten/author.php (working copy) @@ -5,20 +5,8 @@ -

%s', 'twentyten' ), "" . get_the_author() . "" ); ?>

+ - -
-
- -
-
-

- -
-
- - Index: wp-content/themes/twentyten/search.php =================================================================== --- wp-content/themes/twentyten/search.php (revision 13142) +++ wp-content/themes/twentyten/search.php (working copy) @@ -4,7 +4,7 @@
-

+
Index: wp-content/themes/twentyten/functions.php =================================================================== --- wp-content/themes/twentyten/functions.php (revision 13142) +++ wp-content/themes/twentyten/functions.php (working copy) @@ -65,7 +65,72 @@ } add_filter( 'excerpt_more', 'twentyten_new_excerpt_more' ); +// Displays the page title +function twentyten_page_title() { + $title = null; + $description = ''; + + if ( 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_search() ) { + $title = sprintf( __( 'Search Results for: %s', 'twentyten' ), esc_attr( apply_filters('the_search_query', get_search_query()) ) ); + } 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_list_comment( $comment, $args, $depth ) { $GLOBALS['comment'] = $comment; ?> @@ -222,4 +287,4 @@ } // end theme_widgets_init // Add all the groovy widget areas -add_action( 'init', 'twentyten_widgets_init' ); +add_action( 'init', 'twentyten_widgets_init' ); \ No newline at end of file Index: wp-content/themes/twentyten/loop.php =================================================================== --- wp-content/themes/twentyten/loop.php (revision 13142) +++ wp-content/themes/twentyten/loop.php (working copy) @@ -1,107 +1,97 @@ -max_num_pages > 1 ) { ?> - - - - - -
> -

- -
- - - - -
- -
-
- $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) ); - $total_images = count($images); - $image = array_shift($images); - echo wp_get_attachment_image( $image->ID, 'thumbnail' ); - ?> -
-

%2$s photos.', 'twentyten'), 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ) . '" rel="bookmark"', $total_images ); ?>

- - -
- -
- - - - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?> -
-
- - - -
> -
- →', 'twentyten' ) ); ?> -
- -
- - - - - - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?> -
-
- - - -
> -

- -
- - - - -
- - -
- →', 'twentyten' ) ); ?> -
- -
- →', 'twentyten' ) ); ?> - ' . __( 'Pages:', 'twentyten' ) . '&after=
'); ?> -
- - -
- - - ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ); ?> - - |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?> -
-
- - - - - - -max_num_pages > 1 ) { ?> - - \ No newline at end of file + + + + +
> +

+ +
+ + + + +
+ +
+
+ $post->ID, 'post_type' => 'attachment', 'post_mime_type' => 'image', 'orderby' => 'menu_order', 'order' => 'ASC', 'numberposts' => 999) ); + $total_images = count($images); + $image = array_shift($images); + echo wp_get_attachment_image( $image->ID, 'thumbnail' ); + ?> +
+

%2$s photos.', 'twentyten'), 'href="' . get_permalink() . '" title="' . sprintf( esc_attr__('Permalink to %s', 'twentyten'), the_title_attribute('echo=0') ) . '" rel="bookmark"', $total_images ); ?>

+ + +
+ +
+ + + + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?> +
+
+ + + +
> +
+ →', 'twentyten' ) ); ?> +
+ +
+ + + + + + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?> +
+
+ + + +
> +

+ +
+ + + + +
+ + +
+ →', 'twentyten' ) ); ?> +
+ +
+ →', 'twentyten' ) ); ?> + ' . __( 'Pages:', 'twentyten' ) . '&after=
'); ?> +
+ + +
+ + + ' . __('Tagged ', 'twentyten' ) . '', ", ", "\n\t\t\t\t\t\t|\n" ); ?> + + |\n\t\t\t\t\t\t", "\n\t\t\t\t\t\n" ); ?> +
+
+ + + + + + + \ No newline at end of file Index: wp-content/themes/twentyten/tag.php =================================================================== --- wp-content/themes/twentyten/tag.php (revision 13142) +++ wp-content/themes/twentyten/tag.php (working copy) @@ -5,7 +5,7 @@ -

+ Index: wp-content/themes/twentyten/category.php =================================================================== --- wp-content/themes/twentyten/category.php (revision 13142) +++ wp-content/themes/twentyten/category.php (working copy) @@ -5,8 +5,7 @@ -

- ' . $categorydesc . '' ); ?> + Index: wp-content/themes/twentyten/archive.php =================================================================== --- wp-content/themes/twentyten/archive.php (revision 13142) +++ wp-content/themes/twentyten/archive.php (working copy) @@ -5,15 +5,7 @@ - -

%s', 'twentyten' ), get_the_date() ); ?>

- -

%s', 'twentyten' ), get_the_date('F Y') ); ?>

- -

%s', 'twentyten' ), get_the_date('Y') ); ?>

- -

- +