Permalink
Browse files

Cleaning up template formatting

  • Loading branch information...
1 parent 2add9e2 commit 052723c841f2cd34a26fa0f3a9f5b6facd8f4d13 @rachelbaker committed Jan 14, 2013
Showing with 89 additions and 118 deletions.
  1. +1 −2 404.php
  2. +7 −10 author.php
  3. +2 −5 comments.php
  4. +1 −3 index.php
  5. +12 −18 page.php
  6. +35 −36 search.php
  7. +11 −14 sidebar-blog.php
  8. +1 −2 sidebar.php
  9. +16 −18 single.php
  10. +1 −2 templates-documentation/page-base-css.php
  11. +1 −5 templates-pages/page-blog.php
  12. +1 −3 templates-pages/page-full-width.php
View
@@ -3,8 +3,7 @@
* The template for displaying 404 pages (Not Found).
*
* @package WordPress
- * @subpackage WP-Bootstrap
- * @since WP-Bootstrap 0.7
+ * @subpackage BootstrapWP
*/
get_header(); ?>
<div class="row">
View
@@ -3,17 +3,14 @@
* The template for displaying Author Archive pages.
*
* @package WordPress
- * @subpackage WP-Bootstrap
- * @since WP-Bootstrap 0.1
- *
+ * @subpackage BootstrapWP
*/
get_header(); ?>
-<?php if (have_posts()) : ?>
-<?php
-// Queue the first post, that way we know what author we're dealing with (if that is the case).
- the_post();
- ?>
+<?php if (have_posts()) :
+ // Queue the first post.
+ the_post(); ?>
+
<div class="container">
<div class="row">
<div class="span12">
@@ -33,8 +30,8 @@
); ?></h1>
</header>
<?php
-// Rewind the loop back to the beginning that way we can run the loop properly, in full.
- rewind_posts();
+ // Rewind the loop back
+ rewind_posts();
?>
<div class="row content">
<div class="span8">
View
@@ -8,15 +8,12 @@
* located in the functions.php file.
*
* @package WordPress
- * @subpackage WP-Bootstrap
- * @since WP-Bootstrap 0.1
- *
+ * @subpackage BootstrapWP
*/
/*
* If the current post is protected by a password and
- * the visitor has not yet entered the password we will
- * return early without loading the comments.
+ * the visitor has not yet entered the password return early.
*/
if (post_password_required()) {
return;
View
@@ -3,10 +3,8 @@
* Description: Default Index template to display loop of blog posts
*
* @package WordPress
- * @subpackage WP-Bootstrap
- * @since WP-Bootstrap 0.1
+ * @subpackage BootstrapWP
*/
-
get_header(); ?>
<div class="container">
<div class="row">
View
@@ -1,40 +1,34 @@
<?php
/**
- * The template for displaying all pages.
- *
* Template Name: Default Page
- * Description: Page template with a content container and right sidebar
+ * Description: Page template with a content container and right sidebar.
*
* @package WordPress
- * @subpackage WP-Bootstrap
- * @since WP-Bootstrap 0.1
- *
+ * @subpackage BootstrapWP
*/
get_header(); ?>
<?php while (have_posts()) : the_post(); ?>
+
<div class="container">
<div class="row">
<div class="span12">
<?php if (function_exists('bootstrapwp_breadcrumbs')) {
bootstrapwp_breadcrumbs();
} ?>
- </div>
- <!--/.span12 -->
+ </div><!--/.span12 -->
</div><!--/.row -->
<header class="page-title">
<h1><?php the_title();?></h1>
</header>
+
<div class="row content">
<div class="span8">
+ <?php the_content(); ?>
+ <?php wp_link_pages( array('before' => '<div class="page-links">' . __('Pages:', 'bootstrapwp'), 'after' => '</div>')); ?>
+ <?php edit_post_link(__('Edit', 'bootstrapwp'), '<span class="edit-link">', '</span>'); ?>
+ <?php endwhile; // end of the loop. ?>
+ </div><!-- /.span8 -->
- <?php the_content(); ?>
- <?php wp_link_pages(
- array('before' => '<div class="page-links">' . __('Pages:', 'bootstrapwp'), 'after' => '</div>')
- ); ?>
- <?php edit_post_link(__('Edit', 'bootstrapwp'), '<span class="edit-link">', '</span>'); ?>
- <?php endwhile; // end of the loop. ?>
- </div><!-- /.span8 -->
-
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+ <?php get_sidebar(); ?>
+ <?php get_footer(); ?>
View
@@ -1,45 +1,44 @@
<?php
/**
- *
* Search Results Template
*
- * @package WP-Bootstrap
- * @subpackage Default_Theme
- * @since WP-Bootstrap 0.7
- *
+ * @package WordPress
+ * @subpackage BootstrapWP
*/
get_header(); ?>
+
<div class="container">
<?php if (have_posts()) : ?>
- <header class="subhead" id="overview">
- <h1><?php printf(
- __('Search Results for: %s', 'bootstrapwp'),
- '<span>' . get_search_query() . '</span>'
- ); ?></h1>
- </header>
- <div class="row content">
- <div class="span8">
- <?php while (have_posts()) : the_post(); ?>
- <a href="<?php the_permalink(); ?>" title="<?php the_title();?>"><h2> <?php the_title();?></h2></a>
- <p><?php the_excerpt();?></p>
- <hr/>
- <?php endwhile; ?>
- <?php else : ?>
- <header class="subhead" id="overview">
- <h1><?php _e('No Results Found', 'bootstrapwp'); ?></h1>
- <p class="lead"><?php _e(
- 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps you should try again with a different search term.',
- 'bootstrapwp'
- ); ?></p>
- </header>
- <div class="row content">
- <div class="span8">
- <div class="well">
- <?php get_search_form(); ?>
- </div><!--/.well -->
- <?php endif;?>
- <?php bootstrapwp_content_nav('nav-below'); ?>
- </div><!--/.span8 -->
+ <header class="post-title">
+ <h1><?php printf( __('Search Results for: %s', 'bootstrapwp'),'<span>' . get_search_query() . '</span>'); ?></h1>
+ </header>
+
+ <div class="row content">
+ <div class="span8">
+ <?php while (have_posts()) : the_post(); ?>
+
+ <a href="<?php the_permalink(); ?>" title="<?php the_title();?>">
+ <h2> <?php the_title();?></h2></a>
+ <p><?php the_excerpt();?></p>
+ <hr/>
+ <?php endwhile; ?>
+ <?php else : ?>
+
+ <header class="post-title">
+ <h1><?php _e('No Results Found', 'bootstrapwp'); ?></h1>
+ <p class="lead"><?php _e(
+ 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps you should try again with a different search term.',
+ 'bootstrapwp'); ?></p>
+ </header>
+
+ <div class="row content">
+ <div class="span8">
+ <div class="well">
+ <?php get_search_form(); ?>
+ </div><!--/.well -->
+ <?php endif;?>
+ <?php bootstrapwp_content_nav('nav-below'); ?>
+ </div><!--/.span8 -->
-<?php get_sidebar(); ?>
-<?php get_footer(); ?>
+ <?php get_sidebar(); ?>
+ <?php get_footer(); ?>
View
@@ -1,21 +1,18 @@
<?php
/**
- * The Right Sidebar displayed on blog templates.
+ * Right Sidebar displayed on post and blog templates.
*
* @package WordPress
- * @subpackage WP-Bootstrap
- * @since WP-Bootstrap 0.1
+ * @subpackage BootstrapWP
*/
?>
-<div class="span4">
- <div class="well sidebar-nav">
- <?php
- if (function_exists('dynamic_sidebar')) {
- dynamic_sidebar("sidebar-posts");
- }
- ?>
- </div>
- <!--/.well .sidebar-nav -->
-</div><!-- /.span4 -->
-</div><!-- /.row .content -->
+ <div class="span4">
+ <div class="well sidebar-nav">
+ <?php
+ if (function_exists('dynamic_sidebar')) {
+ dynamic_sidebar("sidebar-posts");
+ } ?>
+ </div><!--/.well .sidebar-nav -->
+ </div><!-- /.span4 -->
+ </div><!-- /.row .content -->
</div><!--/.container -->
View
@@ -3,8 +3,7 @@
* The Right Sidebar displayed on page templates.
*
* @package WordPress
- * @subpackage WP-Bootstrap
- * @since WP-Bootstrap 0.1
+ * @subpackage BootstrapWP
*/
?>
<div class="span4">
View
@@ -1,18 +1,14 @@
<?php
/**
- * The template for displaying all posts.
- *
* Default Post Template
- *
- * Page template with a fixed 940px container and right sidebar layout
+ * Description: Post template with a content container and right sidebar.
*
* @package WordPress
- * @subpackage WP-Bootstrap
- * @since WP-Bootstrap 0.1
+ * @subpackage BootstrapWP
*/
-
get_header(); ?>
<?php while (have_posts()) : the_post(); ?>
+
<div class="container">
<div class="row">
<div class="span12">
@@ -22,20 +18,22 @@
</div>
<!--/.span12 -->
</div><!--/.row -->
+
<header class="post-title">
- <h1><?php the_title();?></h1>
+ <h1><?php the_title();?></h1>
</header>
- <div class="row content">
- <div class="span8">
- <p class="meta"><?php echo bootstrapwp_posted_on();?></p>
- <?php the_content(); ?>
- <?php the_tags('<p>Tags: ', ', ', '</p>'); ?>
- <?php endwhile; // end of the loop. ?>
- <hr/>
-<?php comments_template(); ?>
-<?php bootstrapwp_content_nav('nav-below'); ?>
+ <div class="row content">
+ <div class="span8">
+ <p class="meta"><?php echo bootstrapwp_posted_on();?></p>
+ <?php the_content(); ?>
+ <?php the_tags('<p>Tags: ', ', ', '</p>'); ?>
+ <?php endwhile; // end of the loop. ?>
+ <hr/>
+
+ <?php comments_template(); ?>
+ <?php bootstrapwp_content_nav('nav-below'); ?>
+ </div><!-- /.span8 -->
- </div><!-- /.span8 -->
<?php get_sidebar('blog'); ?>
<?php get_footer(); ?>
@@ -3,8 +3,7 @@
* Template Name: Documentation - Core CSS Styles
*
* @package WordPress
- * @subpackage WP-Bootstrap
- * @since WP-Bootstrap 0.7
+ * @subpackage BootstrapWP
*/
get_header();
wp_enqueue_script('prettify-js');
@@ -4,10 +4,8 @@
* Description: Displays blog posts with pagination and featured image.
*
* @package WordPress
- * @subpackage WP-Bootstrap
- * @since WP-Bootstrap 0.1
+ * @subpackage BootstrapWP
*/
-
get_header(); ?>
<?php while (have_posts()) : the_post(); ?>
@@ -47,10 +45,8 @@
<div class="row">
<div class="span2">
-
<a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>">
<?php echo bootstrapwp_autoset_featured_img(); ?></a>
-
</div>
<!-- /.span2 -->
<div class="span6">
@@ -4,10 +4,8 @@
* Description: Displays a page title and content without displaying a sidebar.
*
* @package WordPress
- * @subpackage WP-Bootstrap
- * @since WP-Bootstrap 0.1
+ * @subpackage BootstrapWP
*/
-
get_header(); ?>
<?php while (have_posts()) : the_post(); ?>
<div class="container">

0 comments on commit 052723c

Please sign in to comment.