Congegni/barebones
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clean up

Browse source
This commit is contained in:
Mike Francis 2012-11-13 23:53:02 +00:00
parent ec269f6128
commit 17ff78b20e
9 changed files with 62 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

56
index.php
View file

@ -1,42 +1,36 @@
<?php get_header(); ?>
<<<<<<< HEAD
<div class="content container">
<div class="main">
<?php while ( have_posts() ) : the_post(); ?>
<article <?php post_class(); ?>>
<header>
<h3 class="title"><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h3>
<p class="date"><time pubdate datetime="<?php echo $post->post_date; ?>"><?php the_time( get_option( 'date_format' ) ); ?></time></p>
<p class="comments"><?php comments_popup_link( 'No comments yet', '1 comment', '% comments' ); ?></p>
</header>
<?php the_content( __( 'Read More' ) ); ?>
</article>
<?php endwhile; ?>
<div class="pagination">
<div class="alignleft"><?php previous_posts_link( 'Previous Entries' ) ?></div>
<div class="alignright"><?php next_posts_link( 'Next Entries','' ) ?></div>
</div>
</div>
<aside class="sidebar">
<?php get_sidebar(); ?>
</aside>
<article <?php post_class(); ?>>
<header>
<h3 class="title"><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h3>
<p class="date"><time pubdate datetime="<?php echo $post->post_date; ?>"><?php the_time( get_option( 'date_format' ) ); ?></time></p>
<p class="comments"><?php comments_popup_link( 'No comments yet', '1 comment', '% comments' ); ?></p>
</header>
<?php the_content( __( 'Read More' ) ); ?>
</article>
<?php endwhile; ?>
<div class="pagination">
<div class="alignleft"><?php previous_posts_link( 'Previous Entries' ) ?></div>
<div class="alignright"><?php next_posts_link( 'Next Entries','' ) ?></div>
</div>
</div>
<aside class="sidebar">
<?php get_sidebar(); ?>
</aside>
</div>
=======
<?php while ( have_posts() ) : the_post(); ?>
<?php endwhile; ?>
>>>>>>> e5b0a5f1e5b29ff6247673f4f848f03a9d4209f2
<?php get_footer(); ?>