From 164d71bb3bb942987960fd83579fdd0ea850c6cb Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Thu, 13 Jun 2013 22:14:00 +0200
Subject: [PATCH] Blogg og nyheter og div

---
 wp-content/themes/studio13/content.php        |  4 ++--
 wp-content/themes/studio13/css/app.css        |  4 ++--
 wp-content/themes/studio13/front-page.php     |  2 +-
 wp-content/themes/studio13/sass/app.scss      | 10 +++-------
 .../themes/studio13/template-artists.php      | 14 +++++++++++---
 wp-content/themes/studio13/template-blogg.php | 19 +++++++++++++++++++
 .../themes/studio13/template-nyheter.php      | 19 +++++++++++++++++++
 7 files changed, 57 insertions(+), 15 deletions(-)
 create mode 100644 wp-content/themes/studio13/template-blogg.php
 create mode 100644 wp-content/themes/studio13/template-nyheter.php

diff --git a/wp-content/themes/studio13/content.php b/wp-content/themes/studio13/content.php
index 62f453f..4ce1332 100644
--- a/wp-content/themes/studio13/content.php
+++ b/wp-content/themes/studio13/content.php
@@ -5,8 +5,8 @@
         </div>
         <div class="small-6 columns">
             <header class="article-header">
-                    <h4><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php the_title_attribute(); ?>"><?php the_title(); ?></a></h4>
-                    <p class="byline vcard"><time class="updated" datetime="<?php echo get_the_time('Y-m-j'); ?>" pubdate><?php echo get_the_time(get_option('date_format'));?></time> av <span class="author"><?php the_author(); ?></span></p>
+                <h4 class="no-margin"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php the_title_attribute(); ?>"><?php the_title(); ?></a></h4>
+                <p class="byline vcard"><time class="updated" datetime="<?php echo get_the_time('Y-m-j'); ?>" pubdate><?php echo get_the_time(get_option('date_format'));?></time> av <span class="author"><?php the_author(); ?></span></p>
             </header> <!-- end article header -->
             <section class="entry-content">
                 <?php the_excerpt(); ?>
diff --git a/wp-content/themes/studio13/css/app.css b/wp-content/themes/studio13/css/app.css
index 66afd52..7e1d8cc 100644
--- a/wp-content/themes/studio13/css/app.css
+++ b/wp-content/themes/studio13/css/app.css
@@ -654,7 +654,7 @@ header.header .nav-menu a:hover { z-index: 2; background-color: #ff8200; }
 .highlight a.primary, .highlight body a.button.button-primary, body .highlight a.button.button-primary { color: white; background-color: #ff8200; }
 .highlight a.primary:hover, .highlight body a.button.button-primary:hover, body .highlight a.button.button-primary:hover { color: white; background-color: #007aff; }
 .highlight a span { display: inline-block; padding-top: 30px; }
-.highlight a span.larger { padding-top: 62px; font-size: 1.6em; }
+.highlight a span.larger { padding-top: 70px; font-size: 1.4em; }
 .highlight a .number { font-size: 3em; }
 
 .separator { height: 2px; background-color: #ff8200; margin: 2em 0; }
@@ -672,7 +672,7 @@ article .byline a:hover { color: #007aff; }
 article .entry-content { font-size: 0.9em; }
 article .article-footer { text-align: right; }
 
-.search article .article-header h4, .search article .article-header h1, .post-type-archive article .article-header h4, .post-type-archive article .article-header h1, .home article .article-header h4, .home article .article-header h1 { line-height: 1.1; margin-bottom: 0; }
+h4.no-margin, .home article .article-header h1 { line-height: 1.1; margin-bottom: 0; }
 
 .moretag { font-weight: bold; }
 
diff --git a/wp-content/themes/studio13/front-page.php b/wp-content/themes/studio13/front-page.php
index c29a305..41f4d41 100644
--- a/wp-content/themes/studio13/front-page.php
+++ b/wp-content/themes/studio13/front-page.php
@@ -12,7 +12,7 @@
         <a href="/frivillig" class="hover fri-villig" title="Bli Frivillig"><span></span></a>
     </div>
     <div class="highlight small-4 columns">
-        <a href="/billetter" class="primary"><span class="larger">Kjøp billett</span></a>
+        <a href="/program" class="primary"><span class="larger">Hvem spiller?</span></a>
     </div>
 </div>
 <div class="row">
diff --git a/wp-content/themes/studio13/sass/app.scss b/wp-content/themes/studio13/sass/app.scss
index f5d8e12..07ac231 100644
--- a/wp-content/themes/studio13/sass/app.scss
+++ b/wp-content/themes/studio13/sass/app.scss
@@ -304,8 +304,8 @@ header.header {
             display: inline-block;
             padding-top: 30px;
             &.larger {
-                padding-top: 62px;
-                font-size: 1.6em;
+                padding-top: 70px;
+                font-size: 1.4em;
             }
         }
         .number {
@@ -365,11 +365,7 @@ article {
     }
 }
 
-.search article .article-header h4,
-.search article .article-header h1,
-.post-type-archive article .article-header h4,
-.post-type-archive article .article-header h1,
-.home article .article-header h4,
+h4.no-margin,
 .home article .article-header h1 {
     line-height: 1.1;
     margin-bottom: 0;
diff --git a/wp-content/themes/studio13/template-artists.php b/wp-content/themes/studio13/template-artists.php
index 1966c9e..73922a8 100644
--- a/wp-content/themes/studio13/template-artists.php
+++ b/wp-content/themes/studio13/template-artists.php
@@ -19,10 +19,18 @@ Template Name: Artists page
                         <?php the_content(); ?>
                         <ul class="artists headliners small-block-grid-4">
                             <?php
-                            /* Print our custom post type */
-$query = new WP_Query( array ( 'post_type' => 'artist', 'orderby' => 'title', 'order' => 'asc') );
+                            /* Print our artists */
+                            $query = new WP_Query( array(
+                                'post_type' => 'artist',
+                                'orderby' => 'title',
+                                'order' => 'asc') );
                             while ( $query->have_posts() ):
-                                $query->the_post(); ?><li class="artist-box"><a href="<?php the_permalink();?>" class="colored primary"><?php the_post_thumbnail('artist-thumb');?><span><?php the_title(); ?></span></a></li><?php endwhile;
+                                $query->the_post(); 
+                                $artist_thumb = get_the_post_thumbnail($post->ID, 'artist-thumb');
+                                if($artist_thumb == "") {
+                                    $artist_thumb = '<img src="http://placehold.it/228x191" />';
+                                }
+                                ?><li class="artist-box"><a href="<?php the_permalink();?>" class="colored primary"><?php echo $artist_thumb;?><span><?php the_title(); ?></span></a></li><?php endwhile;
                             wp_reset_postdata();?>
                         </ul>
                 </section> <!-- end article section -->
diff --git a/wp-content/themes/studio13/template-blogg.php b/wp-content/themes/studio13/template-blogg.php
new file mode 100644
index 0000000..86a8b6b
--- /dev/null
+++ b/wp-content/themes/studio13/template-blogg.php
@@ -0,0 +1,19 @@
+<?php
+/*
+Template Name: Alle poster i kategorien blogg
+*/
+$query = new WP_Query("category_name=blogg");
+?>
+<?php get_header(); ?>
+<div id="content">
+    <div id="inner-content" class="row">
+        <div id="main" role="main" class="small-8 columns">
+            <?php if ($query->have_posts()) : while ($query->have_posts()) : $query->the_post(); ?>
+                    <?php get_template_part( 'content' ); ?>
+                <?php endwhile; ?>
+                <?php endif; ?>
+            </div> <!-- end #main -->
+            <?php get_sidebar(); ?>
+    </div> <!-- end #inner-content -->
+</div> <!-- end #content -->
+<?php get_footer(); ?>
diff --git a/wp-content/themes/studio13/template-nyheter.php b/wp-content/themes/studio13/template-nyheter.php
new file mode 100644
index 0000000..cb4bfd2
--- /dev/null
+++ b/wp-content/themes/studio13/template-nyheter.php
@@ -0,0 +1,19 @@
+<?php
+/*
+Template Name: Alle poster i kategorien nyheter
+*/
+$query = new WP_Query("category_name=nyheter");
+?>
+<?php get_header(); ?>
+<div id="content">
+    <div id="inner-content" class="row">
+        <div id="main" role="main" class="small-8 columns">
+            <?php if ($query->have_posts()) : while ($query->have_posts()) : $query->the_post(); ?>
+                    <?php get_template_part( 'content' ); ?>
+                <?php endwhile; ?>
+                <?php endif; ?>
+            </div> <!-- end #main -->
+            <?php get_sidebar(); ?>
+    </div> <!-- end #inner-content -->
+</div> <!-- end #content -->
+<?php get_footer(); ?>