Permalink
Browse files

Code cleanup, a little easter egg, updated scripts and other improvem…

…ents
  • Loading branch information...
1 parent 95fe7fb commit 98d2d96976bd0cb116b4efd06e52796920a57fb2 @jayj committed Apr 19, 2011
Showing with 396 additions and 361 deletions.
  1. +8 −8 404.php
  2. +10 −11 archive.php
  3. +7 −5 attachment.php
  4. +2 −2 comment.php
  5. +58 −56 functions.php
  6. +11 −16 functions/admin.php
  7. +18 −19 functions/shortcodes.php
  8. +9 −7 header.php
  9. +1 −1 home.php
  10. +2 −2 index.php
  11. +0 −30 js/modernizr-1.6.min.js
  12. +2 −0 js/modernizr-1.7.min.js
  13. +7 −9 js/script.js
  14. +3 −20 js/slides.min.jquery.js
  15. +9 −2 loop-meta.php
  16. +1 −1 loop-nav.php
  17. +97 −72 post-format.php
  18. +2 −2 post.php
  19. +1 −1 sidebar-subsidiary.php
  20. +20 −13 singular.php
  21. +13 −10 slider.php
  22. +18 −4 style.dev.css
  23. +52 −34 template-archives.php
  24. +37 −28 template-bookmarks.php
  25. +8 −8 template-front-page.php
View
16 404.php
@@ -19,25 +19,25 @@
<div id="main">
<?php do_atomic( 'open_main' ); // cakifo_open_main ?>
-
+
<div id="post-0" class="<?php hybrid_entry_class(); ?>">
-
+
<h1 class="error-404-title entry-title"><?php _e( 'Not Found', hybrid_get_textdomain() ); ?></h1>
-
+
<div class="entry-content">
<p>
<?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(); // Loads the searchform.php template. ?>
</div> <!-- .entry-content -->
-
+
</div> <!-- .hentry -->
-
+
<?php do_atomic( 'close_main' ); // cakifo_close_main ?>
-
- </div> <!-- #main -->
+ </div> <!-- #main -->
+
<?php do_atomic( 'after_main' ); // cakifo_after_main ?>
<?php get_footer(); // Loads the footer.php template ?>
View
@@ -17,33 +17,32 @@
<?php do_atomic( 'open_main' ); // cakifo_open_main ?>
<?php get_template_part( 'loop-meta' ); // Loads the loop-meta.php template ?>
-
+
<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
-
+
<?php do_atomic( 'before_entry' ); //cakifo_before_entry ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
-
+
<?php do_atomic( 'open_entry' ); //cakifo_open_entry ?>
-
+
<?php echo apply_atomic_shortcode( 'entry_title', '[entry-title]' ); ?>
-
+
<?php echo apply_atomic_shortcode( 'byline', '<div class="byline">' . __( 'By [entry-author] on [entry-published] [entry-edit-link before=" | "]', hybrid_get_textdomain() ) . '</div>' ); ?>
-
+
<?php if ( current_theme_supports( 'get-the-image' ) ) get_the_image( array( 'meta_key' => 'Thumbnail', 'size' => 'thumbnail', 'attachment' => false ) ); ?>
-
+
<div class="entry-content">
<?php the_excerpt(); ?>
<?php wp_link_pages( array( 'before' => '<p class="page-links">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
</div> <!-- .entry-content -->
-
- <?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=" | "] [entry-edit-link before=" | "]', hybrid_get_textdomain() ) . '</div>' ); ?>
+ <?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=" | "] [entry-edit-link before=" | "]', hybrid_get_textdomain() ) . '</div>' ); ?>
<div class="clear"></div>
-
+
<?php do_atomic( 'close_entry' ); //cakifo_close_entry ?>
-
+
</div> <!-- #post-<?php the_ID(); ?> -->
<?php do_atomic( 'after_entry' ); //cakifo_after_entry ?>
View
@@ -48,28 +48,30 @@
</div> <!-- .entry-content -->
<?php if ( wp_attachment_is_image( get_the_ID() ) ) : ?>
+
<div id="image-info">
<div class="headline-list">
<?php cakifo_image_info(); ?>
</div> <!-- .headline-list -->
-
+
<div id="attachment-gallery" class="headline-list last">
<h4><?php _e( 'Gallery', hybrid_get_textdomain() ); ?></h4>
<?php
echo apply_atomic_shortcode( 'attachment_gallery', sprintf( '[gallery id="%1$s" exclude="%2$s" columns="5" size="small"]', $post->post_parent, get_the_ID() ) );
- ?>
+ ?>
</div> <!-- #attachment-gallery -->
</div> <!-- #image-info -->
+
<?php endif; ?>
<div class="clear"></div>
<?php do_atomic( 'close_entry' ); //cakifo_close_entry ?>
-
+
</div> <!-- #post-<?php the_ID(); ?> -->
<?php do_atomic( 'after_singular' ); // cakifo_after_singular ?>
-
+
<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
<?php endwhile; ?>
@@ -81,5 +83,5 @@
</div> <!-- #main -->
<?php do_atomic( 'after_main' ); // cakifo_after_main ?>
-
+
<?php get_footer(); // Loads the footer.php template ?>
View
@@ -31,11 +31,11 @@
<?php endif; ?>
<?php comment_text( $comment->comment_ID ); ?>
- </div><!-- .comment-content .comment-text -->
+ </div> <!-- .comment-content .comment-text -->
<?php do_atomic( 'close_comment' ); // cakifo_close_comment ?>
- </div><!-- .comment-wrap -->
+ </div> <!-- .comment-wrap -->
<?php do_atomic( 'after_comment' ); // cakifo_after_comment ?>
Oops, something went wrong.

0 comments on commit 98d2d96

Please sign in to comment.