From 4c605d628993fd20ada2142349e915b6770749bc Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Sat, 28 Jul 2012 17:14:48 +0200
Subject: [PATCH] Various fixes

---
 wp-content/themes/tn-2012/digest.php             | 2 +-
 wp-content/themes/tn-2012/index.php              | 5 +++--
 wp-content/themes/tn-2012/page-program.php       | 2 +-
 wp-content/themes/tn-2012/sass/screen.scss       | 3 +++
 wp-content/themes/tn-2012/stylesheets/screen.css | 7 +++++++
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/wp-content/themes/tn-2012/digest.php b/wp-content/themes/tn-2012/digest.php
index 14a6338..12480e7 100755
--- a/wp-content/themes/tn-2012/digest.php
+++ b/wp-content/themes/tn-2012/digest.php
@@ -13,7 +13,7 @@
                     ?>">
 					<article id="post-<?php the_ID(); ?>" <?php neuf_post_class(); ?>>
 						<a class="permalink" href="<?php the_permalink(); ?>" title="<?php the_title(); ?>"><?php the_title(); ?></a>
-						<div class="entry-meta byline"><span class="entry-date"><?php the_date('l d. M'); ?>, <?php the_time('G.i'); ?></span></div>
+						<div class="entry-meta byline"><span class="entry-date"><?php the_time(get_option('date_format')); ?>, <?php the_time('G.i'); ?></span></div>
 						<div class="entry-summary"><?php echo linkify(trim_excerpt(get_the_excerpt(), 30), '/\[\.\.\.\]/', get_permalink()); ?></div>
                     </article>
                 </div>
diff --git a/wp-content/themes/tn-2012/index.php b/wp-content/themes/tn-2012/index.php
index e0c74ec..ba84c47 100755
--- a/wp-content/themes/tn-2012/index.php
+++ b/wp-content/themes/tn-2012/index.php
@@ -27,8 +27,9 @@
 
 		<?php endwhile; endif; ?>
 
-
-<?php posts_nav_link(); ?>
+	<div id="posts-nav-link">
+		<?php posts_nav_link(); ?>
+	</div>
 
 </div> <!-- #content -->
 
diff --git a/wp-content/themes/tn-2012/page-program.php b/wp-content/themes/tn-2012/page-program.php
index 631ae41..498364a 100755
--- a/wp-content/themes/tn-2012/page-program.php
+++ b/wp-content/themes/tn-2012/page-program.php
@@ -48,7 +48,7 @@ if ( $events->have_posts() ) :
 		$newmonth = $previous_month != $current_month;
 
 		$datel = date_i18n( 'l j/n' , $date);
-		($price = neuf_get_price( $post )) ? : $price = '';
+		$price = neuf_get_price( $post ) ? neuf_get_price( $post ) : '';
 		$venue = get_post_meta( $post->ID , '_neuf_events_venue' , true );
 		$ticket = get_post_meta( $post->ID , '_neuf_events_bs_url' , true );
                 $ticket = $ticket ? '<a href="'.$ticket.'">Kjøp billett</a>' : '';
diff --git a/wp-content/themes/tn-2012/sass/screen.scss b/wp-content/themes/tn-2012/sass/screen.scss
index 3724687..b086289 100644
--- a/wp-content/themes/tn-2012/sass/screen.scss
+++ b/wp-content/themes/tn-2012/sass/screen.scss
@@ -400,6 +400,9 @@ body {
 			@include clearfix();
 
 		}
+		#posts-nav-link {
+			@include grid(12);
+		}
     }
     #site-footer {
         background-color: $main-color;
diff --git a/wp-content/themes/tn-2012/stylesheets/screen.css b/wp-content/themes/tn-2012/stylesheets/screen.css
index d7779d4..42e422d 100644
--- a/wp-content/themes/tn-2012/stylesheets/screen.css
+++ b/wp-content/themes/tn-2012/stylesheets/screen.css
@@ -516,6 +516,13 @@ body #content .post {
   overflow: hidden;
   *zoom: 1;
 }
+body #content #posts-nav-link {
+  display: inline;
+  float: left;
+  margin-left: 10px;
+  margin-right: 10px;
+  width: 1180px;
+}
 body #site-footer {
   background-color: #7650b3;
   min-width: 100%;