More massive updates and cleanup.

git-svn-id: http://svn.locallylost.com/themes/hybrid/trunk@548 dba0f204-706d-4bc1-bc29-8b92e0485636

404.php

@@ -7,11 +7,9 @@
  * is active, its widgets will be displayed instead. This allows users to customize their error
  * pages in any way they want.
  *
- * For more information on how WordPress handles 404 errors:
- * @link http://codex.wordpress.org/Creating_an_Error_404_Page
- *
  * @package Hybrid
  * @subpackage Template
+ * @link http://codex.wordpress.org/Creating_an_Error_404_Page
  */
 
 @header( 'HTTP/1.1 404 Not found', true, 404 );

attachment.php

@@ -5,11 +5,11 @@
  * The attachment template is a general template that displays attachments if no other 
  * attachment-type template is found.  Also see application.php, audio.php, image.php, 
  * text.php, and video.php.
- * @link http://themehybrid.com/themes/hybrid/attachments
- * @link http://codex.wordpress.org/Using_Image_and_File_Attachments
  *
  * @package Hybrid
  * @subpackage Template
+ * @link http://themehybrid.com/themes/hybrid/attachments
+ * @link http://codex.wordpress.org/Using_Image_and_File_Attachments
  */
 
 get_header(); // Loads the header.php template. ?>
@@ -44,10 +44,6 @@
 
 					<?php the_content( sprintf( __( 'Continue reading %1$s', hybrid_get_textdomain() ), the_title( ' "', '"', false ) ) ); ?>
 
-					<p class="download">
-						<a href="<?php echo wp_get_attachment_url(); ?>" title="<?php the_title_attribute(); ?>" rel="enclosure" type="<?php echo get_post_mime_type(); ?>"><?php printf( __( 'Download &quot;%1$s&quot;', hybrid_get_textdomain() ), the_title( '<span class="fn">', '</span>', false) ); ?></a>
-					</p><!-- .download -->
-
 					<?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
 
 				</div><!-- .entry-content -->
@@ -65,7 +61,7 @@
 
 			<?php do_atomic( 'after_singular' ); // hybrid_after_singular ?>
 
-			<?php comments_template( '/comments.php', true ); ?>
+			<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
 
 			<?php endwhile; ?>
 

functions.php

@@ -23,7 +23,7 @@
  * @version 0.9.0
  * @author Justin Tadlock <justin@justintadlock.com>
  * @copyright Copyright (c) 2008 - 2011, Justin Tadlock
- * @link http://themehybrid.com/themes/retro_fitted
+ * @link http://themehybrid.com/themes/hybrid
  * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  */
 

index.php

@@ -2,12 +2,12 @@
 /**
  * Index Template
  *
- * This template should not be shown.  It is a placeholder.
- * Specific templates for each type of content are available.
- * @link http://themehybrid.com/themes/hybrid/template-hierarchy
+ * This template should not be shown.  It is a placeholder. Specific templates for each type 
+ * of content are available.
  *
  * @package Hybrid
  * @subpackage Template
+ * @link http://themehybrid.com/themes/hybrid/template-hierarchy
  */
 
 get_header(); // Loads the header.php template. ?>
@@ -35,7 +35,7 @@
 
 				<?php do_atomic( 'after_singular' ); // hybrid_after_singular ?>
 
-				<?php comments_template( '/comments.php', true ); ?>
+				<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
 
 			<?php } ?>
 

loop-meta.php

@@ -18,7 +18,7 @@
 			<h1 class="loop-title"><?php echo get_post_field( 'post_title', $wp_query->get_queried_object_id() ); ?></h1>
 		</div><!-- .loop-meta -->
 
-	<?php if ( is_category() ) : ?>
+	<?php elseif ( is_category() ) : ?>
 
 		<div class="loop-meta archive-info category-info">
 

menu-primary.php

@@ -3,10 +3,10 @@
  * Primary Menu Template
  *
  * Displays the Primary Menu if it has active menu items.
- * @link http://themehybrid.com/themes/hybrid/menus
  *
  * @package Hybrid
  * @subpackage Template
+ * @link http://themehybrid.com/themes/hybrid/menus
  */
 
 if ( has_nav_menu( 'primary' ) ) : ?>

page-archives.php

@@ -2,16 +2,15 @@
 /**
  * Template Name: Archives
  *
- * This will list your categories and monthly archives by default.
- * @link http://themehybrid.com/themes/hybrid/page-templates/archives
+ * This will list your categories and monthly archives by default.  Alternatively, you can activate 
+ * an archives plugin.
  *
- * Alternately, you can activate an archives plugin.
+ * @package Hybrid
+ * @subpackage Template
+ * @link http://themehybrid.com/themes/hybrid/page-templates/archives
  * @link http://justinblanton.com/projects/smartarchives
  * @link http://wordpress.org/extend/plugins/clean-archives-reloaded
  * @link http://www.geekwithlaptop.com/projects/clean-archives
- *
- * @package Hybrid
- * @subpackage Template
  */
 
 get_header(); // Loads the header.php template. ?>
@@ -62,7 +61,7 @@
 
 			<?php do_atomic( 'after_singular' ); // hybrid_after_singular ?>
 
-			<?php comments_template( '/comments.php', true ); ?>
+			<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
 
 			<?php endwhile; ?>
 

page-authors.php

@@ -4,10 +4,11 @@
  *
  * The Authors page template is for listing the authors of your site.  It shows each author's 
  * biographical information and avatar while linking the author's archive page.
- * @link http://themehybrid.com/themes/hybrid/page-templates/authors
  *
  * @package Hybrid
  * @subpackage Template
+ * @link http://themehybrid.com/themes/hybrid/page-templates/authors
+ * @deprecated 0.9.0 This template will eventually be moved to the Hybrid page templates pack.
  */
 
 get_header(); // Loads the header.php template. ?>
@@ -60,7 +61,7 @@
 
 			<?php do_atomic( 'after_singular' ); // hybrid_after_singular ?>
 
-			<?php comments_template( '/comments.php', true ); ?>
+			<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
 
 			<?php endwhile; ?>
 

page-biography.php

@@ -4,10 +4,11 @@
  *
  * A page template for listing the page author's avatar, biographical info, and other links set in their profile.
  * Should make it easy to create an about page or biography for single-author blogs.
- * @link http://themehybrid.com/themes/hybrid/page-templates/biography
  *
  * @package Hybrid
  * @subpackage Template
+ * @link http://themehybrid.com/themes/hybrid/page-templates/biography
+ * @deprecated 0.9.0 This template will eventually be moved to the Hybrid page templates pack.
  */
 
 get_header(); // Loads the header.php template. ?>
@@ -75,7 +76,7 @@
 
 			<?php do_atomic( 'after_singular' ); // hybrid_after_singular ?>
 
-			<?php comments_template( '/comments.php', true ); ?>
+			<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
 
 			<?php endwhile; ?>
 

page-blog.php

@@ -4,10 +4,10 @@
  *
  * If you want to set up an alternate blog page, just use this template for your page.
  * This template shows your latest posts.
- * @link http://themehybrid.com/themes/hybrid/page-templates/blog
  *
  * @package Hybrid
  * @subpackage Template
+ * @link http://themehybrid.com/themes/hybrid/page-templates/blog
  * @deprecated 0.9.0 Users should no longer be using this template. 'home.php' is used to show posts.
  */
 

page-bookmarks.php

@@ -4,10 +4,10 @@
  *
  * The bookmarks template is a page template that displays a list of all your bookmarks/links
  * by link category below the main content of the page.
- * @link http://themehybrid.com/themes/hybrid/page-templates/bookmarks
  *
  * @package Hybrid
  * @subpackage Template
+ * @link http://themehybrid.com/themes/hybrid/page-templates/bookmarks
  */
 
 get_header(); // Loads the header.php template. ?>
@@ -50,7 +50,7 @@
 
 			<?php do_atomic( 'after_singular' ); // hybrid_after_singular ?>
 
-			<?php comments_template( '/comments.php', true ); ?>
+			<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
 
 			<?php endwhile; ?>
 

page-categories.php

@@ -4,10 +4,11 @@
  *
  * The categories template is a page template that lists your categories along with a link 
  * to the each category's RSS feed and post count.
- * @link http://themehybrid.com/themes/hybrid/page-templates/categories
  *
  * @package Hybrid
  * @subpackage Template
+ * @link http://themehybrid.com/themes/hybrid/page-templates/categories
+ * @deprecated 0.9.0 This template will eventually be moved to the Hybrid page templates pack.
  */
 
 get_header(); // Loads the header.php template. ?>
@@ -40,7 +41,7 @@
 
 			<?php do_atomic( 'after_singular' ); // hybrid_after_singular ?>
 
-			<?php comments_template( '/comments.php', true ); ?>
+			<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
 
 			<?php endwhile; ?>
 

page-daily.php

@@ -7,6 +7,7 @@
  *
  * @package Hybrid
  * @subpackage Template
+ * @deprecated 0.9.0 This template will eventually be moved to the Hybrid page templates pack.
  */
 
 get_header(); // Loads the header.php template. ?>
@@ -39,7 +40,7 @@
 
 			<?php do_atomic( 'after_singular' ); // hybrid_after_singular ?>
 
-			<?php comments_template( '/comments.php', true ); ?>
+			<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
 
 			<?php endwhile; ?>
 

page-logged-in.php

@@ -6,10 +6,11 @@
  * of the page and its comments. If the user isn't logged in, a message to log in with a link to the 
  * WordPress login page will be displayed. If the site has open registration, a link to register will
  * also be displayed.
- * @link http://themehybrid.com/themes/hybrid/page-templates/logged-in
  *
  * @package Hybrid
  * @subpackage Template
+ * @link http://themehybrid.com/themes/hybrid/page-templates/logged-in
+ * @deprecated 0.9.0 This template will eventually be moved to the Hybrid page templates pack.
  */
 
 get_header(); // Loads the header.php template. ?>
@@ -35,7 +36,7 @@
 
 			<?php do_atomic( 'after_singular' ); // hybrid_after_singular ?>
 
-			<?php comments_template( '/comments.php', true ); ?>
+			<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
 
 			<?php endwhile; ?>
 

page-monthly.php

@@ -7,6 +7,7 @@
  *
  * @package Hybrid
  * @subpackage Template
+ * @deprecated 0.9.0 This template will eventually be moved to the Hybrid page templates pack.
  */
 
 get_header(); // Loads the header.php template. ?>
@@ -39,7 +40,7 @@
 
 			<?php do_atomic( 'after_singular' ); // hybrid_after_singular ?>
 
-			<?php comments_template( '/comments.php', true ); ?>
+			<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
 
 			<?php endwhile; ?>
 

page-no-widgets.php

@@ -3,10 +3,11 @@
  * Template Name: No Widgets
  *
  * A template to use on pages that disables widgets in all widget areas.
- * @link http://themehybrid.com/themes/hybrid/page-templates/no-widgets
  *
  * @package Hybrid
  * @subpackage Template
+ * @deprecated 0.9.0 This template will eventually be moved to the Hybrid page templates pack.
+ * @link http://themehybrid.com/themes/hybrid/page-templates/no-widgets
  */
 
 get_header(); // Loads the header.php template. ?>
@@ -32,7 +33,7 @@
 
 			<?php do_atomic( 'after_singular' ); // hybrid_after_singular ?>
 
-			<?php comments_template( '/comments.php', true ); ?>
+			<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
 
 			<?php endwhile; ?>
 

page-post_tag-cloud.php

@@ -4,10 +4,11 @@
  *
  * The Tags template is a page template that displays a tag cloud of your post_tag (taxonomy)
  * terms, linking to each term's archive.
- * @link http://themehybrid.com/themes/hybrid/page-templates/tags
  *
  * @package Hybrid
  * @subpackage Template
+ * @link http://themehybrid.com/themes/hybrid/page-templates/tags
+ * @deprecated 0.9.0 This template will eventually be moved to the Hybrid page templates pack.
  */
 
 get_header(); // Loads the header.php template. ?>
@@ -40,7 +41,7 @@
 
 			<?php do_atomic( 'after_singular' ); // hybrid_after_singular ?>
 
-			<?php comments_template( '/comments.php', true ); ?>
+			<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
 
 			<?php endwhile; ?>
 

page-sitemap.php

@@ -4,10 +4,11 @@
  *
  * The Sitemap template is a page template that creates and HTML-based sitemap of your
  * site, listing nearly every page of your site. It lists your feeds, pages, archives, and posts.
- * @link http://themehybrid.com/themes/hybrid/page-templates/sitemap
  *
  * @package Hybrid
  * @subpackage Template
+ * @link http://themehybrid.com/themes/hybrid/page-templates/sitemap
+ * @deprecated 0.9.0 This template will eventually be moved to the Hybrid page templates pack.
  */
 
 get_header(); // Loads the header.php template. ?>
@@ -100,7 +101,7 @@
 
 			<?php do_atomic( 'after_singular' ); // hybrid_after_singular ?>
 
-			<?php comments_template( '/comments.php', true ); ?>
+			<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
 
 			<?php endwhile; ?>
 

page-weekly.php

@@ -7,6 +7,7 @@
  *
  * @package Hybrid
  * @subpackage Template
+ * @deprecated 0.9.0 This template will eventually be moved to the Hybrid page templates pack.
  */
 
 get_header(); // Loads the header.php template. ?>
@@ -39,7 +40,7 @@
 
 			<?php do_atomic( 'after_singular' ); // hybrid_after_singular ?>
 
-			<?php comments_template( '/comments.php', true ); ?>
+			<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
 
 			<?php endwhile; ?>
 

page-widgets.php

@@ -4,10 +4,11 @@
  *
  * The Widgets template is a page template that is completely widgetized. It houses the 
  * 'Widgets Template' widget area. Customizations to this page should be done through widgets.
- * @link http://themehybrid.com/themes/hybrid/page-templates/widgets
  *
  * @package Hybrid
  * @subpackage Template
+ * @link http://themehybrid.com/themes/hybrid/page-templates/widgets
+ * @deprecated 0.9.0 This template will eventually be moved to the Hybrid page templates pack.
  */
 
 get_header(); // Loads the header.php template. ?>
@@ -26,7 +27,7 @@
 
 			<?php do_atomic( 'after_singular' ); // hybrid_after_singular ?>
 
-			<?php comments_template( '/comments.php', true ); ?>
+			<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
 
 			<?php endwhile; ?>