From 300898d0f7b3eac864857390a5d3a65a0e6328e7 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Tue, 17 Jan 2017 16:45:49 +0100
Subject: [PATCH 1/3] Added the post date and author to the blog index

---
 app/Resources/views/blog/index.html.twig | 5 +++++
 web/css/main.css                         | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/app/Resources/views/blog/index.html.twig b/app/Resources/views/blog/index.html.twig
index cdc2b8901..622c5d89e 100644
--- a/app/Resources/views/blog/index.html.twig
+++ b/app/Resources/views/blog/index.html.twig
@@ -11,6 +11,11 @@
                 </a>
             </h2>
 
+            <p class="post-metadata">
+                <i class="fa fa-calendar"></i> {{ post.publishedAt|localizeddate('long', 'medium', null, 'UTC') }}
+                <i class="fa fa-user"></i> {{ post.authorEmail }}
+            </p>
+
             {{ post.summary|md2html }}
         </article>
     {% else %}
diff --git a/web/css/main.css b/web/css/main.css
index 739731cff..16d049ef3 100644
--- a/web/css/main.css
+++ b/web/css/main.css
@@ -217,6 +217,15 @@ body#blog_index article.post {
     margin-bottom: 3em
 }
 
+body#blog_index article.post .post-metadata {
+    color: #b4bcc2;
+    font-size: 16px;
+    margin-bottom: 8px;
+}
+body#blog_index article.post .post-metadata .fa-user {
+    margin-left: 1.5em;
+}
+
 /* Page: 'Blog post show'
    ------------------------------------------------------------------------- */
 body#blog_post_show h3 {

From 039bf7604bccd1a71ba5528d4ba1293698b422c9 Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Tue, 17 Jan 2017 16:49:37 +0100
Subject: [PATCH 2/3] Display the same information in the blog post show view

---
 app/Resources/views/blog/post_show.html.twig | 5 +++++
 web/css/main.css                             | 9 +++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/Resources/views/blog/post_show.html.twig b/app/Resources/views/blog/post_show.html.twig
index f481448c3..f96a38876 100644
--- a/app/Resources/views/blog/post_show.html.twig
+++ b/app/Resources/views/blog/post_show.html.twig
@@ -5,6 +5,11 @@
 {% block main %}
     <h1>{{ post.title }}</h1>
 
+    <p class="post-metadata">
+        <i class="fa fa-calendar"></i> {{ post.publishedAt|localizeddate('long', 'medium', null, 'UTC') }}
+        <i class="fa fa-user"></i> {{ post.authorEmail }}
+    </p>
+
     {{ post.content|md2html }}
 
     <div id="post-add-comment" class="well">
diff --git a/web/css/main.css b/web/css/main.css
index 16d049ef3..335a5bbaa 100644
--- a/web/css/main.css
+++ b/web/css/main.css
@@ -217,12 +217,12 @@ body#blog_index article.post {
     margin-bottom: 3em
 }
 
-body#blog_index article.post .post-metadata {
+.post-metadata {
     color: #b4bcc2;
     font-size: 16px;
     margin-bottom: 8px;
 }
-body#blog_index article.post .post-metadata .fa-user {
+.post-metadata .fa-user {
     margin-left: 1.5em;
 }
 
@@ -232,6 +232,11 @@ body#blog_post_show h3 {
     margin-bottom: 0.75em
 }
 
+body#blog_post_show .post-metadata {
+    font-size: 19px;
+    margin-bottom: 16px;
+}
+
 body#blog_post_show #post-add-comment {
     margin: 2em 0
 }

From ddd40012cbc6835543766b8c951d7e8bb6ceb56e Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Thu, 19 Jan 2017 11:50:08 +0100
Subject: [PATCH 3/3] Minor tweaks for the post metadata

---
 app/Resources/views/admin/blog/show.html.twig |  4 ++--
 app/Resources/views/blog/index.html.twig      |  4 ++--
 app/Resources/views/blog/post_show.html.twig  |  4 ++--
 web/css/main.css                              | 22 ++++++++++---------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/Resources/views/admin/blog/show.html.twig b/app/Resources/views/admin/blog/show.html.twig
index 64d919dc7..72a0169aa 100644
--- a/app/Resources/views/admin/blog/show.html.twig
+++ b/app/Resources/views/admin/blog/show.html.twig
@@ -5,8 +5,8 @@
 {% block main %}
     <h1>{{ post.title }}</h1>
     <p class="post-metadata">
-        <i class="fa fa-calendar"></i> {{ post.publishedAt|localizeddate('long', 'medium', null, 'UTC') }}
-        <i class="fa fa-user"></i> {{ post.author.email }}
+        <span class="metadata"><i class="fa fa-calendar"></i> {{ post.publishedAt|localizeddate('long', 'medium', null, 'UTC') }}</span>
+        <span class="metadata"><i class="fa fa-user"></i> {{ post.author.email }}</span>
     </p>
 
     <div class="well">
diff --git a/app/Resources/views/blog/index.html.twig b/app/Resources/views/blog/index.html.twig
index 622c5d89e..6bf2eaa42 100644
--- a/app/Resources/views/blog/index.html.twig
+++ b/app/Resources/views/blog/index.html.twig
@@ -12,8 +12,8 @@
             </h2>
 
             <p class="post-metadata">
-                <i class="fa fa-calendar"></i> {{ post.publishedAt|localizeddate('long', 'medium', null, 'UTC') }}
-                <i class="fa fa-user"></i> {{ post.authorEmail }}
+                <span class="metadata"><i class="fa fa-calendar"></i> {{ post.publishedAt|localizeddate('long', 'medium', null, 'UTC') }}</span>
+                <span class="metadata"><i class="fa fa-user"></i> {{ post.author.email }}</span>
             </p>
 
             {{ post.summary|md2html }}
diff --git a/app/Resources/views/blog/post_show.html.twig b/app/Resources/views/blog/post_show.html.twig
index f96a38876..d1cbf36f0 100644
--- a/app/Resources/views/blog/post_show.html.twig
+++ b/app/Resources/views/blog/post_show.html.twig
@@ -6,8 +6,8 @@
     <h1>{{ post.title }}</h1>
 
     <p class="post-metadata">
-        <i class="fa fa-calendar"></i> {{ post.publishedAt|localizeddate('long', 'medium', null, 'UTC') }}
-        <i class="fa fa-user"></i> {{ post.authorEmail }}
+        <span class="metadata"><i class="fa fa-calendar"></i> {{ post.publishedAt|localizeddate('long', 'medium', null, 'UTC') }}</span>
+        <span class="metadata"><i class="fa fa-user"></i> {{ post.author.email }}</span>
     </p>
 
     {{ post.content|md2html }}
diff --git a/web/css/main.css b/web/css/main.css
index 335a5bbaa..362fc749f 100644
--- a/web/css/main.css
+++ b/web/css/main.css
@@ -207,6 +207,17 @@ body#login #login-users-help p .console {
     padding: 10px
 }
 
+/* Common Blog page elements
+   ------------------------------------------------------------------------- */
+.post-metadata {
+    color: #b4bcc2;
+    font-size: 19px;
+    margin-bottom: 16px;
+}
+.post-metadata .metadata {
+    margin-right: 1.5em;
+}
+
 /* Page: 'Blog index'
    ------------------------------------------------------------------------- */
 body#blog_index h1 {
@@ -217,14 +228,10 @@ body#blog_index article.post {
     margin-bottom: 3em
 }
 
-.post-metadata {
-    color: #b4bcc2;
+body#blog_index .post-metadata {
     font-size: 16px;
     margin-bottom: 8px;
 }
-.post-metadata .fa-user {
-    margin-left: 1.5em;
-}
 
 /* Page: 'Blog post show'
    ------------------------------------------------------------------------- */
@@ -232,11 +239,6 @@ body#blog_post_show h3 {
     margin-bottom: 0.75em
 }
 
-body#blog_post_show .post-metadata {
-    font-size: 19px;
-    margin-bottom: 16px;
-}
-
 body#blog_post_show #post-add-comment {
     margin: 2em 0
 }