From 4b7c4a55796c998a8211175029a38cf8c5cbd823 Mon Sep 17 00:00:00 2001
From: Jannik Beyerstedt <code@jannikbeyerstedt.de>
Date: Mon, 18 Apr 2016 00:26:23 +0200
Subject: [PATCH] [SITE] blog: add meta (date, tags) to blogarticle as well

---
 .brackets.json                 |  4 ++--
 assets/scss/blog.scss          | 13 ++++++++++++-
 site/blueprints/blog.yaml      |  2 +-
 site/templates/blogarticle.php |  8 ++++++++
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/.brackets.json b/.brackets.json
index 083120f..c1a10ac 100644
--- a/.brackets.json
+++ b/.brackets.json
@@ -10,7 +10,7 @@
                 ],
                 "sourceComments": false,
                 "outputStyle": "nested"
-            },
+            }
         },
         "assets/scss/templates/*": {
             "sass.enabled": true,
@@ -21,7 +21,7 @@
                 ],
                 "sourceComments": false,
                 "outputStyle": "nested"
-            },
+            }
         },
         "assets/vendors/bootstrap/scss/*": {
             "sass.enabled": true,
diff --git a/assets/scss/blog.scss b/assets/scss/blog.scss
index 20cf861..5ce74d7 100644
--- a/assets/scss/blog.scss
+++ b/assets/scss/blog.scss
@@ -62,9 +62,20 @@ main.blog {
   article.blogarticle {
     margin-top: 30px;
 
-    padding-bottom: 60px;
+    h1 {
+      margin-bottom: 0;
+    }
+    div.meta.title {
+      margin-bottom: 20px;
+    }
+
+    padding-bottom: 15px;
     border-bottom: 2px solid lighten($blog_color_meta, 10%);
     margin-bottom: 50px;
+
+    div.meta.bottom {
+      margin-top: 45px;
+    }
   }
 
   div.teasers {
diff --git a/site/blueprints/blog.yaml b/site/blueprints/blog.yaml
index 55055b1..37c249f 100644
--- a/site/blueprints/blog.yaml
+++ b/site/blueprints/blog.yaml
@@ -5,7 +5,7 @@ pages:
   num: date
   sort: flip
 
-files: true
+files: false
 
 fields:
   title:
diff --git a/site/templates/blogarticle.php b/site/templates/blogarticle.php
index db5b2c4..e841678 100644
--- a/site/templates/blogarticle.php
+++ b/site/templates/blogarticle.php
@@ -32,7 +32,15 @@ snippet('base/cont-header');
     <article class="blogarticle">
 
       <h1><?php echo $page->title()->html() ?></h1>
+      <div class="meta title">
+        <time datetime="<?php echo $page->date('Y-m-d') ?>"><?php echo $page->date('d. M. Y') ?></time>
+      </div>
       <?php echo $page->text()->kirbytext(); ?>
+      
+      <div class="meta bottom">
+        <time datetime="<?php echo $page->date('Y-m-d') ?>"><?php echo $page->date('d. M. Y') ?></time>
+        <?php echo tags($base_url, $page); ?>
+      </div>
 
     </article>