Merge branch 'master' of github.com:neuf/studio11-theme

This commit is contained in:
Øyvind Bakkeli committed 2011-07-31 21:45:26 +02:00
commit 27338ca8f3
3 files changed
+13 -1

No files matched your search

+8
View File
@@ -30,6 +30,14 @@
</div><!-- .entry-meta -->
<div class="entry-content">
<?php if ($post->post_type == "event"){
echo '<p class="tid">'.date("H:i d/m", get_post_meta( $post->ID, 'neuf_events_starttime', true)).'</p>';
echo '<p class="venue">'.get_post_meta( $post->ID, 'neuf_events_venue', true ).'</p>';
echo '<p class="type">'.get_post_meta( $post->ID, 'neuf_events_type', true ).'</p>';
echo '<p class="price">'.get_post_meta( $post->ID, 'neuf_events_price', true ).'</p>';
} ?>
<?php the_content(); ?>
<?php wp_link_pages( array( 'before' => '<div class="page-link">' . __( 'Pages:', 'twentyten' ), 'after' => '</div>' ) ); ?>
</div><!-- .entry-content -->
+5 -1
View File
@@ -1,6 +1,10 @@
<?php $first = true; ?>
<?php while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<?php if ($first) { $post_class_stuff = 'first'; $first = false; } else { $post_class_stuff = "" ; } ?>
<div id="post-<?php the_ID(); ?>" <?php post_class( $post_class_stuff ); ?>>
<h2 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'twentyten' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
<div class="loop-image">
<?php echo get_the_post_thumbnail( $post->ID, array (525, 9999) ); ?>
Regular → Executable
View File
File mode changed.