From 49c58e0374ee6ba604b433ed7c67f7b7ff212c82 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Sun, 2 Jun 2013 13:20:37 +0200
Subject: [PATCH] Byline with date

---
 wp-content/themes/studio13/archive.php        | 18 ++----------
 wp-content/themes/studio13/content-full.php   |  1 -
 wp-content/themes/studio13/content-sticky.php |  2 +-
 wp-content/themes/studio13/content.php        |  2 +-
 wp-content/themes/studio13/css/app.css        |  7 +++++
 wp-content/themes/studio13/sass/app.scss      | 28 +++++++++++++++++++
 wp-content/themes/studio13/sidebar.php        |  3 ++
 7 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/wp-content/themes/studio13/archive.php b/wp-content/themes/studio13/archive.php
index bf0e91e..fe9383d 100644
--- a/wp-content/themes/studio13/archive.php
+++ b/wp-content/themes/studio13/archive.php
@@ -1,7 +1,7 @@
 <?php get_header(); ?>
 <div id="content">
-    <div id="inner-content">
-        <div id="main" role="main">
+    <div id="inner-content" class="row">
+        <div id="main" role="main" class="small-8 columns">
             <?php if (is_category()) { ?>
                 <h1 class="archive-title">
                     <span>Innlegg kategorisert:</span> <?php single_cat_title(); ?>
@@ -32,19 +32,7 @@
             <?php } ?>
 
             <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
-            <article id="post-<?php the_ID(); ?>" <?php post_class(''); ?> role="article">
-                <header class="article-header">
-                    <h3 class="h2"><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php the_title_attribute(); ?>"><?php the_title(); ?></a></h3>
-                        <p class="byline vcard"><time class="updated" datetime="<?php echo get_the_time('Y-m-j'); ?>" pubdate><?php get_the_time(get_option('date_format'));?></time> av <span class="author"><?php the_author_posts_link(); ?></span></p>
-                </header> <!-- end article header -->
-                <section class="entry-content">
-                    <?php the_post_thumbnail(; ?>
-                    <?php the_excerpt(); ?>
-                </section> <!-- end article section -->
-                <footer class="article-footer">
-                </footer> <!-- end article footer -->
-            </article> <!-- end article -->
-
+                    <?php get_template_part( 'content' ); ?>
             <?php endwhile; ?>
                 <nav class="wp-prev-next">
                     <?php posts_nav_link(); ?>
diff --git a/wp-content/themes/studio13/content-full.php b/wp-content/themes/studio13/content-full.php
index 86b4549..abf6635 100644
--- a/wp-content/themes/studio13/content-full.php
+++ b/wp-content/themes/studio13/content-full.php
@@ -3,7 +3,6 @@
         <div class="small-12 columns">
             <a href="<?php the_permalink() ?>" class="colored" title="<?php the_title_attribute(); ?>"><?php the_post_thumbnail('eight-columns'); ?></a>
             <h1><a href="<?php the_permalink() ?>" rel="bookmark"><?php the_title(); ?></a></h1>
-            <!--<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_posts_link(); ?></span></p>-->
         </div>
     </header> <!-- end article header -->
     <section class="entry-content">
diff --git a/wp-content/themes/studio13/content-sticky.php b/wp-content/themes/studio13/content-sticky.php
index 25a66cd..26fa82f 100644
--- a/wp-content/themes/studio13/content-sticky.php
+++ b/wp-content/themes/studio13/content-sticky.php
@@ -4,7 +4,7 @@
         <div class="small-12 columns">
             <a href="<?php the_permalink() ?>" class="colored primary" title="<?php the_title_attribute(); ?>"><?php the_post_thumbnail('eight-columns'); ?></a>
             <h1><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php the_title_attribute(); ?>"><?php the_title(); ?></a></h1>
-            <!--<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_posts_link(); ?></span></p>-->
+            <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>
         </div>
     </header> <!-- end article header -->
     <section class="entry-content">
diff --git a/wp-content/themes/studio13/content.php b/wp-content/themes/studio13/content.php
index 4bec7d7..62f453f 100644
--- a/wp-content/themes/studio13/content.php
+++ b/wp-content/themes/studio13/content.php
@@ -6,7 +6,7 @@
         <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_posts_link(); ?></span></p>-->
+                    <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 fa5103f..66afd52 100644
--- a/wp-content/themes/studio13/css/app.css
+++ b/wp-content/themes/studio13/css/app.css
@@ -601,6 +601,8 @@ body .secondary:hover, body .button:hover { color: white; background-color: #007
 /* Images */
 .attachment-eight-columns, .attachment-four-columns { width: 100%; }
 
+.vcard { padding: 0; margin: 0; border: 0; }
+
 /* Image hovers */
 /* Note: Disabled automatic generation of :hover for fade transition */
 .hover { position: relative; }
@@ -664,9 +666,14 @@ article .article-header h1 a { color: #ff8200; background-color: white; }
 article .article-header h1 a:hover { color: #007aff; }
 article .article-header h4 a { color: #ff8200; background-color: white; }
 article .article-header h4 a:hover { color: #007aff; }
+article .byline { color: #999; font-size: 0.75em; margin-bottom: 0.5em; }
+article .byline a { color: #4da2ff; }
+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; }
+
 .moretag { font-weight: bold; }
 
 .bluebordered { border-left: 2px solid #007aff; }
diff --git a/wp-content/themes/studio13/sass/app.scss b/wp-content/themes/studio13/sass/app.scss
index 1944a58..f5d8e12 100644
--- a/wp-content/themes/studio13/sass/app.scss
+++ b/wp-content/themes/studio13/sass/app.scss
@@ -145,6 +145,12 @@ body {
 .attachment-four-columns {
     width: 100%;
 }
+.vcard {
+    padding: 0;
+    margin: 0;
+    border: 0;
+
+}
 /* Image hovers */
 /* Note: Disabled automatic generation of :hover for fade transition */
 $disable-magic-sprite-selectors:true;
@@ -338,6 +344,18 @@ article {
             &:hover { color: $primary-color; }
         }
     }
+    .byline {
+        color: #999;
+        font-size: emCalc(12px);
+        margin-bottom: 0.5em;
+        a {
+            color: lighten($primary-color, 15%);
+            &:hover {
+                color: $primary-color;
+            }
+        }
+
+    }
     .entry-content {
         font-size: 0.9em;
     }
@@ -346,6 +364,16 @@ article {
         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;
+}
 .moretag {
     font-weight: bold;
 }
diff --git a/wp-content/themes/studio13/sidebar.php b/wp-content/themes/studio13/sidebar.php
index 597ec8a..54ad87e 100644
--- a/wp-content/themes/studio13/sidebar.php
+++ b/wp-content/themes/studio13/sidebar.php
@@ -5,6 +5,9 @@
                 <?php
                 /* Print our custom post type */
                 $query = new WP_Query( array ( 'post_type' => 'artist', 'tag' => 'headliner' ) );
+                if( !$query->have_posts() ) { ?>
+                Artister vil snart bli lansert.
+                <?php }
                 while ( $query->have_posts() ):
                     $query->the_post();
                     echo '<li><a href="'.get_permalink().'">' . get_the_title() . '</a></li>';