Merge pull request #87 from Voog/52_year_number_behind_articles

Year number behind articles
Voog · Apr 21, 2017 · d37a201 · d37a201
2 parents dfffb09 + 672171f
commit d37a201
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 22 deletions.
diff --git a/components/blog-article-variables.tpl b/components/blog-article-variables.tpl
@@ -0,0 +1,3 @@
+{% capture dont_render %}
+  {% assign current_year = "now" | date: "%Y" | to_num %}
+{% endcapture %}
diff --git a/components/post-box.tpl b/components/post-box.tpl
@@ -1,7 +1,15 @@
 <article class="post">
   <header class="post-header">
     <h2 class="post-title">{% if post-box == "article" %}{% editable article.title %}{% else %}<a href="{{ article.url }}">{{ article.title }}</a>{% endif %}</h2>
-    <time class="post-date" datetime="{{ article.created_at | date : "%Y-%m-%d" }}">{{ article.created_at | format_date : "long" }}</time>
+    {% assign article_year = article.created_at | format_date: "%Y" | to_num %}
+
+    {% if article_year == current_year %}
+      {% assign article_date_format = "long_without_year" %}
+    {% else %}
+      {% assign article_date_format = "long" %}
+    {% endif %}
+
+    <time class="post-date" datetime="{{ article.created_at | date: '%Y-%m-%d' }}">{{ article.created_at | format_date: article_date_format }}</time>
     <div class="post-author">{{ article.author.name }}</div>
   </header>
 

diff --git a/layouts/blog___news.tpl b/layouts/blog___news.tpl
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+{% include "blog-article-variables" %}
 <html class="{% if editmode %}editmode{% else %}public{% endif %}" lang="{{ page.language_code }}">
 <head prefix="og: http://ogp.me/ns#">
   {% include "template-variables" %}

diff --git a/layouts/blog_article.tpl b/layouts/blog_article.tpl
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+{% include "blog-article-variables" %}
 <html class="{% if editmode %}editmode{% else %}public{% endif %}" lang="{{ page.language_code }}">
 <head prefix="og: http://ogp.me/ns#">
   {% assign blog_article_page = true %}

diff --git a/manifest.json b/manifest.json
@@ -33,6 +33,27 @@
       "layout_name": "blog_article",
       "title": "Blog article"
     },
+    {
+      "content_type": "component",
+      "component": true,
+      "file": "components/post-box.tpl",
+      "layout_name": "post-box",
+      "title": "post-box"
+    },
+    {
+      "content_type": "component",
+      "component": true,
+      "file": "components/footer.tpl",
+      "layout_name": "footer",
+      "title": "footer"
+    },
+    {
+      "content_type": "component",
+      "component": true,
+      "file": "components/header.tpl",
+      "layout_name": "header",
+      "title": "header"
+    },
     {
       "content_type": "component",
       "component": true,
@@ -85,9 +106,9 @@
     {
       "content_type": "component",
       "component": true,
-      "file": "components/post-box.tpl",
-      "layout_name": "post-box",
-      "title": "post-box"
+      "file": "components/comment-form.tpl",
+      "layout_name": "comment-form",
+      "title": "comment-form"
     },
     {
       "content_type": "component",
@@ -181,25 +202,11 @@
       "title": "topbar"
     },
     {
+      "title": "blog-article-variables",
+      "layout_name": "blog-article-variables",
       "content_type": "component",
       "component": true,
-      "file": "components/comment-form.tpl",
-      "layout_name": "comment-form",
-      "title": "comment-form"
-    },
-    {
-      "content_type": "component",
-      "component": true,
-      "file": "components/footer.tpl",
-      "layout_name": "footer",
-      "title": "footer"
-    },
-    {
-      "content_type": "component",
-      "component": true,
-      "file": "components/header.tpl",
-      "layout_name": "header",
-      "title": "header"
+      "file": "components/blog-article-variables.tpl"
     }
   ],
   "assets": [

diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
   "devDependencies": {
     "autoprefixer": "^6.7.7",
     "grunt": "^1.0.1",
-    "grunt-contrib-clean": "^1.0.0",
+    "grunt-contrib-clean": "^1.1.0",
     "grunt-contrib-concat": "^1.0.1",
     "grunt-contrib-copy": "^1.0.0",
     "grunt-contrib-cssmin": "^2.0.0",