Permalink
Browse files

Tons of updates to get Prototype ready for release.

git-svn-id: http://svn.locallylost.com/themes/prototype/trunk@431 dba0f204-706d-4bc1-bc29-8b92e0485636
  • Loading branch information...
1 parent e642ca6 commit b65aeafc5dfa5d010c71766ce283def6cbb8bf51 greenshady committed Oct 19, 2010
Showing with 715 additions and 286 deletions.
  1. +10 −14 404.php
  2. +17 −13 archive.php
  3. +18 −16 attachment.php
  4. +5 −5 comment.php
  5. +10 −10 comments.php
  6. +13 −13 footer.php
  7. +26 −8 functions.php
  8. +18 −17 header.php
  9. +70 −0 home.php
  10. +20 −17 index.php
  11. +19 −0 loop-error.php
  12. +2 −2 loop-meta.php
  13. +4 −4 menu-primary.php
  14. +6 −6 menu-secondary.php
  15. +7 −7 menu-subsidiary.php
  16. +77 −0 page-template-archives.php
  17. +79 −0 page-template-bookmarks.php
  18. +18 −18 page.php
  19. +69 −0 post.php
  20. +16 −12 search.php
  21. +1 −2 sidebar-after-singular.php
  22. +2 −0 sidebar-header.php
  23. +7 −7 sidebar-primary.php
  24. +7 −7 sidebar-secondary.php
  25. +7 −7 sidebar-subsidiary.php
  26. +0 −11 sidebar.php
  27. +14 −16 singular.php
  28. +173 −74 style.dev.css
View
24 404.php
@@ -2,27 +2,23 @@
/**
* 404 Template
*
- * The 404 template is used when a reader visits an invalid URL on your site. By default,
- * the template will display a generic message. However, if the '404 Template' widget area
- * 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
+ * The 404 template is used when a reader visits an invalid URL on your site. By default, the template will
+ * display a generic message.
*
* @package Prototype
* @subpackage Template
+ * @link http://codex.wordpress.org/Creating_an_Error_404_Page
*/
@header( 'HTTP/1.1 404 Not found', true, 404 );
-get_header(); ?>
+get_header(); // Loads the header.php template. ?>
- <?php do_atomic( 'before_content' ); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // prototype_before_content ?>
<div id="content">
- <?php do_atomic( 'open_content' ); // Open content hook ?>
+ <?php do_atomic( 'open_content' ); // prototype_open_content ?>
<div class="hfeed">
@@ -36,18 +32,18 @@
<?php printf( __( 'You tried going to %1$s, and it doesn\'t exist. All is not lost! You can search for what you\'re looking for.', hybrid_get_textdomain() ), '<code>' . site_url( esc_url( $_SERVER['REQUEST_URI'] ) ) . '</code>' ); ?>
</p>
- <?php get_search_form(); ?>
+ <?php get_search_form(); // Loads the searchform.php template. ?>
</div><!-- .entry-content -->
</div><!-- .hentry -->
</div><!-- .hfeed -->
- <?php do_atomic( 'close_content' ); // Close content hook ?>
+ <?php do_atomic( 'close_content' ); // prototype_close_content ?>
</div><!-- #content -->
- <?php do_atomic( 'after_content' ); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // prototype_after_content ?>
-<?php get_footer(); ?>
+<?php get_footer(); // Loads the footer.php template. ?>
View
@@ -2,33 +2,33 @@
/**
* Archive Template
*
- * The archive template is a placeholder for archives views without a more specific template.
+ * The archive template is the default template used for archives pages without a more specific template.
*
* @package Prototype
* @subpackage Template
*/
-get_header(); ?>
+get_header(); // Loads the header.php template. ?>
- <?php do_atomic( 'before_content' ); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // prototype_before_content ?>
<div id="content">
- <?php do_atomic( 'open_content' ); // Open content hook ?>
+ <?php do_atomic( 'open_content' ); // prototype_open_content ?>
<div class="hfeed">
- <?php get_template_part( 'loop-meta' ); // Get the loop meta box ?>
+ <?php get_template_part( 'loop-meta' ); // Loads the loop-meta.php template. ?>
<?php if ( have_posts() ) : ?>
<?php while ( have_posts() ) : the_post(); ?>
- <?php do_atomic( 'before_entry' ); // Before loop hook ?>
+ <?php do_atomic( 'before_entry' ); // prototype_before_entry ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php do_atomic( 'open_entry' ); // Open loop hook ?>
+ <?php do_atomic( 'open_entry' ); // prototype_open_entry ?>
<?php if ( current_theme_supports( 'get-the-image' ) ) get_the_image( array( 'meta_key' => array( 'Thumbnail' ), 'size' => 'thumbnail' ) ); ?>
@@ -42,24 +42,28 @@
<?php echo apply_atomic_shortcode( 'entry_meta', '<div class="entry-meta">' . __( '[entry-terms taxonomy="category" before="Posted in "] [entry-terms before="| Tagged "] [entry-comments-link before=" | "]', hybrid_get_textdomain() ) . '</div>' ); ?>
- <?php do_atomic( 'close_entry' ); // Close loop hook ?>
+ <?php do_atomic( 'close_entry' ); // prototype_close_entry ?>
</div><!-- .hentry -->
- <?php do_atomic( 'after_entry' ); // After loop hook ?>
+ <?php do_atomic( 'after_entry' ); // prototype_after_entry ?>
<?php endwhile; ?>
+ <?php else : ?>
+
+ <?php get_template_part( 'loop-error' ); // Loads the loop-error.php template. ?>
+
<?php endif; ?>
</div><!-- .hfeed -->
- <?php do_atomic( 'close_content' ); // Close content hook ?>
+ <?php do_atomic( 'close_content' ); // prototype_close_content ?>
- <?php get_template_part( 'loop-nav' ); ?>
+ <?php get_template_part( 'loop-nav' ); // Loads the loop-nav.php template. ?>
</div><!-- #content -->
- <?php do_atomic( 'after_content' ); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // prototype_after_content ?>
-<?php get_footer(); ?>
+<?php get_footer(); // Loads the footer.php template. ?>
View
@@ -9,38 +9,38 @@
* @subpackage Template
*/
-get_header(); ?>
+get_header(); // Loads the header.php template. ?>
- <?php do_atomic( 'before_content' ); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // prototype_before_content ?>
<div id="content">
- <?php do_atomic( 'open_content' ); // Open content hook ?>
+ <?php do_atomic( 'open_content' ); // prototype_open_content ?>
<div class="hfeed">
<?php if ( have_posts() ) : ?>
<?php while ( have_posts() ) : the_post(); ?>
- <?php do_atomic( 'before_entry' ); // Before loop hook ?>
+ <?php do_atomic( 'before_entry' ); // prototype_before_entry ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php do_atomic( 'open_entry' ); // Open loop hook ?>
+ <?php do_atomic( 'open_entry' ); // prototype_open_entry ?>
<?php echo apply_atomic_shortcode( 'entry_title', '[entry-title]' ); ?>
<div class="entry-content">
<?php if ( wp_attachment_is_image( get_the_ID() ) ) : ?>
<p class="attachment-image">
- <img class="aligncenter" src="<?php echo wp_get_attachment_url(); ?>" alt="<?php the_title_attribute(); ?>" title="<?php the_title_attribute(); ?>" />
+ <?php echo wp_get_attachment_image( get_the_ID(), 'full', false, array( 'class' => 'aligncenter' ) ); ?>
</p><!-- .attachment-image -->
<?php else : ?>
- <?php hybrid_attachment(); ?>
+ <?php hybrid_attachment(); // Function for handling non-image attachments. ?>
<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>
@@ -52,30 +52,32 @@
<?php wp_link_pages( array( 'before' => '<p class="page-links">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
- <?php do_atomic( 'close_loop' ); // Close loop hook ?>
+ <?php if ( wp_attachment_is_image( get_the_ID() ) ) echo do_shortcode( sprintf( '[gallery id="%1$s" exclude="%2$s" columns="8"]', $post->post_parent, get_the_ID() ) ); ?>
+
+ <?php do_atomic( 'close_entry' ); // prototype_close_entry ?>
</div><!-- .hentry -->
- <?php do_atomic( 'after_entry' ); // After loop hook ?>
+ <?php do_atomic( 'after_entry' ); // prototype_after_entry ?>
- <?php get_sidebar( 'after-singular' ); ?>
+ <?php get_sidebar( 'after-singular' ); // Loads the sidebar-after-singular.php template. ?>
- <?php do_atomic( 'after_singular' ); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // prototype_after_singular ?>
- <?php comments_template( '/comments.php', true ); ?>
+ <?php comments_template( '/comments.php', true ); // Loads the comments.php template. ?>
<?php endwhile; ?>
<?php endif; ?>
</div><!-- .hfeed -->
- <?php do_atomic( 'close_content' ); // Close content hook ?>
+ <?php do_atomic( 'close_content' ); // prototype_close_content ?>
- <?php get_template_part( 'loop-nav' ); ?>
+ <?php get_template_part( 'loop-nav' ); // Loads the loop-nav.php template. ?>
</div><!-- #content -->
- <?php do_atomic( 'after_content' ); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // prototype_after_content ?>
-<?php get_footer(); ?>
+<?php get_footer(); // Loads the footer.php template. ?>
View
@@ -15,15 +15,15 @@
<li id="comment-<?php comment_ID(); ?>" class="<?php hybrid_comment_class(); ?>">
- <?php do_atomic( 'before_comment' ); // Before comment hook ?>
+ <?php do_atomic( 'before_comment' ); // prototype_before_comment ?>
<div class="comment-wrap">
- <?php do_atomic( 'open_comment' ); // Open comment hook ?>
+ <?php do_atomic( 'open_comment' ); // prototype_open_comment ?>
<?php echo hybrid_avatar(); ?>
- <?php echo apply_atomic_shortcode( 'comment_meta', '<div class="comment-meta comment-meta-data">[comment-author] [comment-published] [comment-permalink before="| "] [comment-edit-link before="| "] [comment-reply-link before="| "]</div>' ); ?>
+ <?php echo apply_atomic_shortcode( 'comment_meta', '<div class="comment-meta">[comment-author] [comment-published] [comment-permalink before="| "] [comment-edit-link before="| "] [comment-reply-link before="| "]</div>' ); ?>
<div class="comment-content comment-text">
<?php if ( '0' == $comment->comment_approved ) : ?>
@@ -33,10 +33,10 @@
<?php comment_text( $comment->comment_ID ); ?>
</div><!-- .comment-content .comment-text -->
- <?php do_atomic( 'close_comment' ); // Close comment hook ?>
+ <?php do_atomic( 'close_comment' ); // prototype_close_comment ?>
</div><!-- .comment-wrap -->
- <?php do_atomic( 'after_comment' ); // After comment hook ?>
+ <?php do_atomic( 'after_comment' ); // prototype_after_comment ?>
<?php /* No closing </li> is needed. WordPress will know where to add it. */ ?>
View
@@ -2,16 +2,18 @@
/**
* Comments Template
*
- * Lists comments and calls the comment form. Individual comments have their own
- * templates. The hierarchy for these templates is $comment_type.php, comment.php.
+ * Lists comments and calls the comment form. Individual comments have their own templates. The
+ * hierarchy for these templates is $comment_type.php, comment.php.
*
* @package Prototype
* @subpackage Template
*/
+/* Kill the page if trying to access this template directly. */
if ( 'comments.php' == basename( $_SERVER['SCRIPT_FILENAME'] ) )
die( __( 'Please do not load this page directly. Thanks!', hybrid_get_textdomain() ) );
+/* If a post password is required or no comments are given and comments/pings are closed, return. */
if ( post_password_required() || ( !have_comments() && !comments_open() && !pings_open() ) )
return;
?>
@@ -26,26 +28,26 @@
<h3 id="comments-number" class="comments-header"><?php comments_number( __( 'No Responses', hybrid_get_textdomain() ), __( 'One Response', hybrid_get_textdomain() ), __( '% Responses', hybrid_get_textdomain() ) ); ?></h3>
- <?php do_atomic( 'before_comment_list' );// Before comment list hook ?>
+ <?php do_atomic( 'before_comment_list' );// prototype_before_comment_list ?>
<ol class="comment-list">
<?php wp_list_comments( hybrid_list_comments_args() ); ?>
</ol><!-- .comment-list -->
- <?php do_atomic( 'after_comment_list' ); // After comment list hook ?>
+ <?php do_atomic( 'after_comment_list' ); // prototype_after_comment_list ?>
<?php if ( get_option( 'page_comments' ) ) : ?>
- <div class="comment-navigation paged-navigation">
+ <div class="comment-navigation comment-pagination">
<?php paginate_comments_links(); ?>
</div><!-- .comment-navigation -->
<?php endif; ?>
- <?php else : ?>
+ <?php endif; ?>
<?php if ( pings_open() && !comments_open() ) : ?>
<p class="comments-closed pings-open">
- <?php printf( __( 'Comments are closed, but <a href="%1$s" title="Trackback URL for this post">trackbacks</a> and pingbacks are open.', hybrid_get_textdomain() ), trackback_url( '0' ) ); ?>
+ <?php printf( __( 'Comments are closed, but <a href="%1$s" title="Trackback URL for this post">trackbacks</a> and pingbacks are open.', hybrid_get_textdomain() ), get_trackback_url() ); ?>
</p><!-- .comments-closed .pings-open -->
<?php elseif ( !comments_open() ) : ?>
@@ -56,11 +58,9 @@
<?php endif; ?>
- <?php endif; ?>
-
</div><!-- #comments -->
- <?php comment_form(); // Load the comment form. ?>
+ <?php comment_form(); // Loads the comment form. ?>
</div><!-- .comments-wrap -->
View
@@ -11,46 +11,46 @@
* @subpackage Template
*/
?>
- <?php get_sidebar( 'primary' ); ?>
+ <?php get_sidebar( 'primary' ); // Loads the sidebar-primary.php template. ?>
- <?php get_sidebar( 'secondary' ); ?>
+ <?php get_sidebar( 'secondary' ); // Loads the sidebar-secondary.php template. ?>
- <?php do_atomic( 'close_main' ); // Close main hook ?>
+ <?php do_atomic( 'close_main' ); // prototype_close_main ?>
</div><!-- .wrap -->
</div><!-- #main -->
- <?php do_atomic( 'after_main' ); // After main hook ?>
+ <?php do_atomic( 'after_main' ); // prototype_after_main ?>
- <?php get_sidebar( 'subsidiary' ); // Load the sidebar-subsidiary.php template. ?>
+ <?php get_sidebar( 'subsidiary' ); // Loads the sidebar-subsidiary.php template. ?>
- <?php get_template_part( 'menu', 'subsidiary' ); // Load the menu-subsidiary.php template. ?>
+ <?php get_template_part( 'menu', 'subsidiary' ); // Loads the menu-subsidiary.php template. ?>
- <?php do_atomic( 'before_footer' ); // Before footer hook ?>
+ <?php do_atomic( 'before_footer' ); // prototype_before_footer ?>
<div id="footer">
- <?php do_atomic( 'open_footer' ); // Open footer hook ?>
+ <?php do_atomic( 'open_footer' ); // prototype_open_footer ?>
<div class="wrap">
<?php echo apply_atomic_shortcode( 'footer_content', hybrid_get_setting( 'footer_insert' ) ); ?>
- <?php do_atomic( 'footer' ); // Footer hook ?>
+ <?php do_atomic( 'footer' ); // prototype_footer ?>
</div><!-- .wrap -->
- <?php do_atomic( 'close_footer' ); // Close footer hook ?>
+ <?php do_atomic( 'close_footer' ); // prototype_close_footer ?>
</div><!-- #footer -->
- <?php do_atomic( 'after_footer' ); // After footer hook ?>
+ <?php do_atomic( 'after_footer' ); // prototype_after_footer ?>
</div><!-- #container -->
- <?php wp_footer(); // WordPress footer hook ?>
- <?php do_atomic( 'close_body' ); // After HTML hook ?>
+ <?php wp_footer(); // wp_footer ?>
+ <?php do_atomic( 'close_body' ); // prototype_close_body ?>
</body>
</html>
Oops, something went wrong.

0 comments on commit b65aeaf

Please sign in to comment.