diff options
-rw-r--r-- | _layouts/archive.html | 17 | ||||
-rw-r--r-- | _pages/posts.html | 19 |
2 files changed, 17 insertions, 19 deletions
diff --git a/_layouts/archive.html b/_layouts/archive.html index 4c30f96..c794c22 100644 --- a/_layouts/archive.html +++ b/_layouts/archive.html @@ -10,10 +10,13 @@ layout: default {% for post in page.posts %} {% if post.wip %}{% continue %}{% endif %} - {% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %} - {% capture next_year %}{{ post.previous.date | date: "%Y" }}{% endcapture %} + {% assign this_year = post.date | date: "%Y" %} + + {% if this_year != prev_year %} + {% if forloop.first != true %} + </ul> + {% endif %} - {% if forloop.first %} <h3>{{ this_year }}</h3> <ul> {% endif %} @@ -30,11 +33,7 @@ layout: default {% if forloop.last %} </ul> - {% else %} - {% if this_year != next_year %} - </ul> - <h3>{{ next_year }}</h3> - <ul> - {% endif %} {% endif %} + + {% assign prev_year = post.date | date: "%Y" %} {% endfor %} diff --git a/_pages/posts.html b/_pages/posts.html index 98b61b5..4f10758 100644 --- a/_pages/posts.html +++ b/_pages/posts.html @@ -15,10 +15,13 @@ description: > {% for post in site.posts %} {% if post.wip %}{% continue %}{% endif %} - {% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %} - {% capture next_year %}{{ post.previous.date | date: "%Y" }}{% endcapture %} + {% assign this_year = post.date | date: "%Y" %} + + {% if this_year != prev_year %} + {% if forloop.first != true %} + </ul> + {% endif %} - {% if forloop.first %} <h3>{{ this_year }}</h3> <ul> {% endif %} @@ -28,18 +31,14 @@ description: > <small> {{ post.date | date: "%Y-%m-%d" }} {% for tag in post.tags %} - <a href="{{ site.baseurl | prepend: site.url }}/tag/{{ tag | slugify }}">#{{ tag | slugify}}</a> + <a href="{{ site.baseurl | prepend: site.url }}/tag/{{ tag | slugify }}">#{{ tag | slugify }}</a> {% endfor %} </small> </li> {% if forloop.last %} </ul> - {% else %} - {% if this_year != next_year %} - </ul> - <h3>{{ next_year }}</h3> - <ul> - {% endif %} {% endif %} + + {% assign prev_year = post.date | date: "%Y" %} {% endfor %} |