Index: wp-content/themes/pub/wporg-p2/category.php
===================================================================
--- wp-content/themes/pub/wporg-p2/category.php	(revision 0)
+++ wp-content/themes/pub/wporg-p2/category.php	(working copy)
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Category Archive Template.
+ */
+?>
+<?php get_header(); ?>
+<?php $tag_obj = $wp_query->get_queried_object(); ?>
+
+<div class="sleeve_main">
+
+	<?php if ( 30 == get_current_blog_id() && p2_user_can_post() ) : // 30 is /community ?>
+		<?php locate_template( array( 'post-form.php' ), true ); ?>
+	<?php endif; ?>
+
+	<div id="main">
+		<h2><?php printf( __( 'Category: %s', 'p2' ), single_cat_title( '', false) ); ?>
+			<span class="controls">
+				<a href="#" id="togglecomments"> <?php _e( 'Toggle Comment Threads', 'p2' ); ?></a> | <a href="#directions" id="directions-keyboard"><?php _e( 'Keyboard Shortcuts', 'p2' ); ?></a>
+			</span>
+		</h2>
+
+		<?php if ( 30 == get_current_blog_id() ) : // 30 is /community ?>
+			<div id="category-description"><?php echo category_description(); ?></div>
+		<?php endif; ?>
+
+		<?php if ( have_posts() ) : ?>
+
+			<ul id="postlist">
+			<?php while ( have_posts() ) : the_post(); ?>
+
+				<?php p2_load_entry(); ?>
+
+			<?php endwhile; ?>
+			</ul>
+
+		<?php else : ?>
+
+			<div class="no-posts">
+			    <h3><?php _e( 'No posts found!', 'p2' ); ?></h3>
+			</div>
+
+		<?php endif ?>
+
+		<div class="navigation">
+			<p class="nav-older"><?php next_posts_link( __( '&larr; Older posts', 'p2' ) ); ?></p>
+			<p class="nav-newer"><?php previous_posts_link( __( 'Newer posts &rarr;', 'p2' ) ); ?></p>
+		</div>
+
+	</div> <!-- main -->
+
+</div> <!-- sleeve -->
+
+<?php get_footer(); ?>
\ No newline at end of file

Property changes on: wp-content/themes/pub/wporg-p2/category.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: wp-content/themes/pub/wporg-p2/entry.php
===================================================================
--- wp-content/themes/pub/wporg-p2/entry.php	(revision 0)
+++ wp-content/themes/pub/wporg-p2/entry.php	(working copy)
@@ -0,0 +1,145 @@
+<?php
+/**
+ * Displays the content and meta information for a post object.
+ *
+ * @package P2
+ */
+?>
+<li id="prologue-<?php the_ID(); ?>" <?php post_class(); ?>>
+	<?php
+
+	/*
+	 * Post meta
+	 */
+
+	if ( ! is_page() ):
+		$author_posts_url = get_author_posts_url( get_the_author_meta( 'ID' ) );
+		$posts_by_title   = sprintf(
+			__( 'Posts by %1$s ( @%2$s )', 'p2' ),
+			get_the_author_meta( 'display_name' ),
+			get_the_author_meta( 'user_nicename' )
+		); ?>
+
+		<a href="<?php echo esc_attr( $author_posts_url ); ?>" title="<?php echo esc_attr( $posts_by_title ); ?>" class="post-avatar">
+			<?php echo get_avatar( get_the_author_meta('user_email'), 48 ); ?>
+		</a>
+	<?php endif; ?>
+	<h4>
+		<?php if ( ! is_page() ): ?>
+			<a href="<?php echo esc_attr( $author_posts_url ); ?>" title="<?php echo esc_attr( $posts_by_title ); ?>"><?php the_author(); ?></a>
+		<?php endif; ?>
+		<span class="meta">
+			<?php
+			if ( ! is_page() ) {
+				echo p2_date_time_with_microformat();
+			} ?>
+			<span class="actions">
+				<a href="<?php the_permalink(); ?>" class="thepermalink<?php if ( is_singular() ) { ?> printer-only<?php } ?>" title="<?php esc_attr_e( 'Permalink', 'p2' ); ?>"><?php _e( 'Permalink', 'p2' ); ?></a>
+				<?php
+				if ( ! is_singular() )
+					$before_reply_link = ' | ';
+
+				if ( comments_open() && ! post_password_required() ) {
+						echo post_reply_link( array(
+							'before'        => isset( $before_reply_link ) ? $before_reply_link : '',
+							'after'         => '',
+							'reply_text'    => __( 'Reply', 'p2' ),
+							'add_below'     => 'comments'
+						), get_the_ID() );
+				}
+
+				if ( current_user_can( 'edit_post', get_the_ID() ) ) : ?> | <a href="<?php echo ( get_edit_post_link( get_the_ID() ) ); ?>" class="edit-post-link" rel="<?php the_ID(); ?>" title="<?php esc_attr_e( 'Edit', 'p2' ); ?>"><?php _e( 'Edit', 'p2' ); ?></a>
+				<?php endif; ?>
+
+				<?php do_action( 'p2_action_links' ); ?>
+			</span>
+
+			<?php if ( is_object_in_taxonomy( get_post_type(), 'post_tag' ) ) : ?>
+				<span class="tags">
+					<?php tags_with_count( '', __( '<br />Tags:' , 'p2' ) .' ', ', ', ' &nbsp;' ); ?>&nbsp;
+				</span>
+			<?php endif; ?>
+
+			<?php if ( 30 == get_current_blog_id() && is_object_in_taxonomy( get_post_type(), 'category' ) ) : // 30 is /community ?>
+				<span class="categories">
+					<?php echo wporg_p2_get_cats_with_count( $post, '', __( '<br />Categories: ' , 'p2' ), ', ', '' ); ?>
+				</span>
+			<?php endif; ?>
+		</span>
+	</h4>
+
+	<?php
+	/*
+	 * Content
+	 */
+	?>
+
+	<div id="content-<?php the_ID(); ?>" class="postcontent">
+	<?php
+	/*
+	 * Check the post format and display content accordingly.
+	 * The value should be a valid post format or one of the back compat categories.
+	 */
+	switch ( p2_get_post_format( $post->ID ) ) {
+		case 'status':
+		case 'link':
+			the_content( __( '(More ...)' , 'p2' ) );
+			break;
+		case 'quote':
+			p2_quote_content();
+			break;
+		case 'post':
+		case 'standard':
+		default:
+			p2_title();
+			the_content( __( '(More ...)' , 'p2' ) );
+			break;
+	} ?>
+	</div>
+
+	<?php
+	/*
+	 * Comments
+	 */
+
+	$comment_field = '<div class="form"><textarea id="comment" class="expand50-100" name="comment" cols="45" rows="3"></textarea></div> <label class="post-error" for="comment" id="commenttext_error"></label>';
+
+	$comment_notes_before = '<p class="comment-notes">' . ( get_option( 'require_name_email' ) ? sprintf( ' ' . __( 'Required fields are marked %s', 'p2' ), '<span class="required">*</span>' ) : '' ) . '</p>';
+
+	$p2_comment_args = array(
+		'title_reply'           => __( 'Reply', 'p2' ),
+		'comment_field'         => $comment_field,
+		'comment_notes_before'  => $comment_notes_before,
+		'comment_notes_after'   => '<span class="progress spinner-comment-new"></span>',
+		'label_submit'          => __( 'Reply', 'p2' ),
+		'id_submit'             => 'comment-submit',
+	);
+
+	?>
+
+	<?php if ( get_comments_number() > 0 && ! post_password_required() ) : ?>
+		<div class="discussion" style="display: none">
+			<p>
+				<?php p2_discussion_links(); ?>
+				<a href="#" class="show-comments"><?php _e( 'Toggle Comments', 'p2' ); ?></a>
+			</p>
+		</div>
+	<?php endif;
+
+	wp_link_pages( array( 'before' => '<p class="page-nav">' . __( 'Pages:', 'p2' ) ) ); ?>
+
+	<div class="bottom-of-entry">&nbsp;</div>
+
+	<?php if ( p2_is_ajax_request() ) : ?>
+		<ul id="comments-<?php the_ID(); ?>" class="commentlist inlinecomments"></ul>
+	<?php else :
+		comments_template();
+		$pc = 0;
+		if ( p2_show_comment_form() && $pc == 0 && ! post_password_required() ) :
+			$pc++; ?>
+			<div class="respond-wrap" <?php echo ( ! is_singular() ) ? 'style="display: none; "' : ''; ?>>
+				<?php comment_form( $p2_comment_args ); ?>
+			</div><?php
+		endif;
+	endif; ?>
+</li>

Property changes on: wp-content/themes/pub/wporg-p2/entry.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: wp-content/themes/pub/wporg-p2/functions.php
===================================================================
--- wp-content/themes/pub/wporg-p2/functions.php	(revision 84)
+++ wp-content/themes/pub/wporg-p2/functions.php	(working copy)
@@ -23,3 +23,34 @@
 	return $url;
 }
 
+// Return a list of link categories applied to the current post, unless it is uncategorized
+function wporg_p2_get_cats_with_count( $post, $format = 'list', $before = '', $sep = '', $after = '' ) {
+	$cat_links = array();
+	$post_cats = get_the_terms( $post->ID, 'category' );
+
+	if ( ! $post_cats )
+		return '';
+
+	foreach ( $post_cats as $cat ) {
+		if ( 'uncategorized' == $cat->slug ) {
+			continue;
+		}
+
+		if ( $cat->count > 1 && ! is_category( $cat->slug ) ) {
+			$cat_link = '<a href="' . get_term_link( $cat, 'category' ) . '" rel="category">' . $cat->name . ' ( ' . number_format_i18n( $cat->count ) . ' )</a>';
+		} else {
+			$cat_link = $cat->name;
+		}
+
+		if ( $format == 'list' )
+			$cat_link = '<li>' . $cat_link . '</li>';
+
+		$cat_links[] = $cat_link;
+	}
+
+	if ( empty( $cat_links ) ) {
+		return '';
+	}
+
+	return apply_filters( 'cats_with_count', $before . join( $sep, $cat_links ) . $after, $post );
+}
\ No newline at end of file
Index: wp-content/themes/pub/wporg-p2/style.css
===================================================================
--- wp-content/themes/pub/wporg-p2/style.css	(revision 84)
+++ wp-content/themes/pub/wporg-p2/style.css	(working copy)
@@ -171,6 +171,12 @@
 	vertical-align: top;
 }
 
+/* Add some space below tag/category descriptions */
+#tag-description,
+#category-description {
+	margin-bottom: 2em;
+}
+
 /*- bbPress Specific Styles ----------*/
 body.bbPress #main ul#postlist li {
 	border-top-style: none;
Index: wp-content/themes/pub/wporg-p2/tag.php
===================================================================
--- wp-content/themes/pub/wporg-p2/tag.php	(revision 0)
+++ wp-content/themes/pub/wporg-p2/tag.php	(working copy)
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Tag Archive Template.
+ *
+ * @package P2
+ */
+?>
+<?php get_header(); ?>
+<?php $tag_obj = $wp_query->get_queried_object(); ?>
+
+<div class="sleeve_main">
+
+	<div id="main">
+		<h2><?php printf( __( 'Tagged: %s', 'p2' ), single_tag_title( '', false) ); ?>
+			<span class="controls">
+				<a href="#" id="togglecomments"> <?php _e( 'Toggle Comment Threads', 'p2' ); ?></a> | <a href="#directions" id="directions-keyboard"><?php _e( 'Keyboard Shortcuts', 'p2' ); ?></a>
+			</span>
+		</h2>
+
+		<?php if ( 30 == get_current_blog_id() ) : // 30 is /community ?>
+			<div id="tag-description"><?php echo tag_description(); ?></div>
+		<?php endif; ?>
+
+		<?php if ( have_posts() ) : ?>
+
+			<ul id="postlist">
+			<?php while ( have_posts() ) : the_post(); ?>
+
+				<?php p2_load_entry(); ?>
+
+			<?php endwhile; ?>
+			</ul>
+
+		<?php else : ?>
+
+			<div class="no-posts">
+			    <h3><?php _e( 'No posts found!', 'p2' ); ?></h3>
+			</div>
+
+		<?php endif ?>
+
+		<div class="navigation">
+			<p class="nav-older"><?php next_posts_link( __( '&larr; Older posts', 'p2' ) ); ?></p>
+			<p class="nav-newer"><?php previous_posts_link( __( 'Newer posts &rarr;', 'p2' ) ); ?></p>
+		</div>
+
+	</div> <!-- main -->
+
+</div> <!-- sleeve -->
+
+<?php get_footer(); ?>
\ No newline at end of file

Property changes on: wp-content/themes/pub/wporg-p2/tag.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property