Merge pull request #67 from Voog/30_year_number_behind_articles

Year number behind articles
Voog · Apr 11, 2017 · bac8941 · bac8941
2 parents 756cf4a + 00f255a
commit bac8941
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 17 deletions.
diff --git a/bower.json b/bower.json
@@ -2,6 +2,6 @@
   "name": "voog-design-rotterdam",
   "devDependencies": {
     "bourbon": "^4.3.4",
-    "jquery": "^3.1.1"
+    "jquery": "^3.2.1"
   }
 }
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/layouts/blog___news.tpl b/layouts/blog___news.tpl
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 {% include "template-variables" %}
+{% 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_list = true %}
@@ -22,13 +23,21 @@
         <article class="post">
           <header class="post-header">
             <h1 class="post-title"><a href="{{ article.url }}">{{ article.title }}</a></h1>
-            <time datetime="{{ article.created_at | date : "%Y-%m-%d" }}" class="post-date">{{ article.created_at | format_date : "%b %d, %Y" }}</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>
           </header>
 
           <section class="post-content">
             <div class="post-excerpt content-formatted cfx">{{ article.excerpt }}</div>
             <div class="post-body content-formatted cfx">{{ article.body }}</div>
-            <div class="post-readmore"><a class="post-read-more-btn" href="{{ article.url }}">{{ "read_more" | lc }}</a></div> 
+            <div class="post-readmore"><a class="post-read-more-btn" href="{{ article.url }}">{{ "read_more" | lc }}</a></div>
           </section>
         </article>
       {% endfor %}

diff --git a/layouts/blog_article.tpl b/layouts/blog_article.tpl
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 {% include "template-variables" %}
+{% 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 = true %}
@@ -14,7 +15,15 @@
       <article class="post">
         <header class="post-header content-formatted cfx">
           <h1 class="post-title" data-search-indexing-allowed="true">{% editable article.title %}</h1>
-          <time class="post-date" datetime="{{ article.created_at | date : "%Y-%m-%d" }}">{{ article.created_at | format_date : "%B %d, %Y" }}</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>
         </header>
         <section class="post-content" data-search-indexing-allowed="true">
           <div class="post-excerpt content-formatted cfx" {{ edy_intro_edit_text }}>{% editable article.excerpt %}</div>

diff --git a/manifest.json b/manifest.json
@@ -8,16 +8,16 @@
     {
       "content_type": "page",
       "component": false,
-      "file": "layouts/front_page.tpl",
-      "layout_name": "page_front",
-      "title": "Front page"
+      "file": "layouts/common_page.tpl",
+      "layout_name": "page_default",
+      "title": "Common page"
     },
     {
       "content_type": "page",
       "component": false,
-      "file": "layouts/common_page.tpl",
-      "layout_name": "page_default",
-      "title": "Common page"
+      "file": "layouts/front_page.tpl",
+      "layout_name": "page_front",
+      "title": "Front page"
     },
     {
       "content_type": "blog",
@@ -33,6 +33,13 @@
       "layout_name": "blog_article",
       "title": "Blog article"
     },
+    {
+      "content_type": "component",
+      "component": true,
+      "file": "components/edicy-tools-styles.tpl",
+      "layout_name": "edicy-tools-styles",
+      "title": "edicy-tools-styles"
+    },
     {
       "content_type": "component",
       "component": true,
@@ -222,6 +229,13 @@
       "layout_name": "topbar",
       "title": "topbar"
     },
+    {
+      "content_type": "component",
+      "component": true,
+      "file": "components/blog-article-variables.tpl",
+      "layout_name": "blog-article-variables",
+      "title": "blog-article-variables"
+    },
     {
       "content_type": "component",
       "component": true,
@@ -235,13 +249,6 @@
       "file": "components/comments-article.tpl",
       "layout_name": "comments-article",
       "title": "comments-article"
-    },
-    {
-      "content_type": "component",
-      "component": true,
-      "file": "components/edicy-tools-styles.tpl",
-      "layout_name": "edicy-tools-styles",
-      "title": "edicy-tools-styles"
     }
   ],
   "assets": [