From 4b4a938d7bac32d55b1230296818d0f282850fe7 Mon Sep 17 00:00:00 2001
From: Jens Timmerman <jens.timmerman@gmail.com>
Date: Mon, 12 Oct 2020 21:22:10 +0200
Subject: [PATCH 1/6] added helper function to get modification time from git

---
 layouts/blogpost.erb |  2 +-
 lib/helpers/blog.rb  | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/layouts/blogpost.erb b/layouts/blogpost.erb
index 50043cb..d1326cd 100644
--- a/layouts/blogpost.erb
+++ b/layouts/blogpost.erb
@@ -9,7 +9,7 @@
 <meta name="twitter:label1" value="Author" />
 <meta name="twitter:data1" value="<%= @item[:author] %>" />
 <meta name="twitter:label2" value="Created at" />
-<meta name="twitter:data2" value="<%= @item[:created_at] %>" />
+<meta name="twitter:data2" value="<%= gitmtime item %>" />
 <meta name="twitter:card" content="summary_large_image" />
 
 <!-- Animate.css -->
diff --git a/lib/helpers/blog.rb b/lib/helpers/blog.rb
index 96db131..0adee5e 100644
--- a/lib/helpers/blog.rb
+++ b/lib/helpers/blog.rb
@@ -25,4 +25,15 @@ module BlogHelper
       </figure>
     HTML
   end
+
+  def gitmtime
+    # find file extension
+    filepath=@item[:content_filename]
+    str=`git log -1 --format='%ci' -- #{filepath}`
+    if str == ""
+        return @item[:created_at]
+    else
+        return DateTime.parse( str )
+    end
+end
 end

From fbc76e8f7df1f9e4b2a9435b33b28fd448b31178 Mon Sep 17 00:00:00 2001
From: Jens Timmerman <jens.timmerman@gmail.com>
Date: Mon, 12 Oct 2020 22:52:40 +0200
Subject: [PATCH 2/6] fixes

---
 layouts/blogpost.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/layouts/blogpost.erb b/layouts/blogpost.erb
index d1326cd..9b06796 100644
--- a/layouts/blogpost.erb
+++ b/layouts/blogpost.erb
@@ -9,7 +9,7 @@
 <meta name="twitter:label1" value="Author" />
 <meta name="twitter:data1" value="<%= @item[:author] %>" />
 <meta name="twitter:label2" value="Created at" />
-<meta name="twitter:data2" value="<%= gitmtime item %>" />
+<meta name="twitter:data2" value="<%= gitmtime  %>" />
 <meta name="twitter:card" content="summary_large_image" />
 
 <!-- Animate.css -->
@@ -28,7 +28,7 @@
     <% end %>
     <div class="details animated fadeInRight">
       <small>
-        Geschreven op <%= item[:created_at] %><br>
+        Geschreven op <%= gitmtime %><br>
         Leestijd: <%= reading_time @item %>
       </small>
     </div>

From 804c0b103857453dd8d0c78725dba17244badeac Mon Sep 17 00:00:00 2001
From: Jens Timmerman <jens.timmerman@gmail.com>
Date: Mon, 12 Oct 2020 23:47:58 +0200
Subject: [PATCH 3/6] only show date, not hours, show 'laast aangepast op'
 instead of geschreven op

---
 layouts/blogpost.erb | 2 +-
 lib/helpers/blog.rb  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/layouts/blogpost.erb b/layouts/blogpost.erb
index 9b06796..6584e92 100644
--- a/layouts/blogpost.erb
+++ b/layouts/blogpost.erb
@@ -28,7 +28,7 @@
     <% end %>
     <div class="details animated fadeInRight">
       <small>
-        Geschreven op <%= gitmtime %><br>
+        Laatst aangepast op <%= gitmtime %><br>
         Leestijd: <%= reading_time @item %>
       </small>
     </div>
diff --git a/lib/helpers/blog.rb b/lib/helpers/blog.rb
index 0adee5e..b122e9d 100644
--- a/lib/helpers/blog.rb
+++ b/lib/helpers/blog.rb
@@ -27,13 +27,13 @@ module BlogHelper
   end
 
   def gitmtime
-    # find file extension
+    # find file last modification time
     filepath=@item[:content_filename]
-    str=`git log -1 --format='%ci' -- #{filepath}`
+    str=`git log -1 --format=%cd --date=short -- #{filepath}`
     if str == ""
         return @item[:created_at]
     else
-        return DateTime.parse( str )
+        return str
     end
 end
 end

From 4292cb42a7dbf03d44ddf217995cc0e9d5297b70 Mon Sep 17 00:00:00 2001
From: Jens Timmerman <jens.timmerman@gmail.com>
Date: Tue, 13 Oct 2020 00:19:42 +0200
Subject: [PATCH 4/6] no more errors when a blog has no created_at line, parse
 str as date instead of datetime

---
 lib/helpers/blog.rb       | 8 ++------
 lib/helpers/preprocess.rb | 2 --
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/helpers/blog.rb b/lib/helpers/blog.rb
index b122e9d..4b8be72 100644
--- a/lib/helpers/blog.rb
+++ b/lib/helpers/blog.rb
@@ -30,10 +30,6 @@ module BlogHelper
     # find file last modification time
     filepath=@item[:content_filename]
     str=`git log -1 --format=%cd --date=short -- #{filepath}`
-    if str == ""
-        return @item[:created_at]
-    else
-        return str
-    end
-end
+    return Date.parse(str)
+  end
 end
diff --git a/lib/helpers/preprocess.rb b/lib/helpers/preprocess.rb
index 07ff4a9..9ecb2bc 100644
--- a/lib/helpers/preprocess.rb
+++ b/lib/helpers/preprocess.rb
@@ -52,12 +52,10 @@ module PreprocessHelper
 
   def update_blog_attributes
     @items.find_all('/blog/**/*.md').each do |i|
-      raise "#{i.identifier} doesn't have 'created_at'" unless i[:created_at]
       i.update_attributes(
         # Tag all posts with article (for Blogging helper)
         kind: 'article',
         academic_year: i.identifier.to_s[/\d\d-\d\d/],
-        created_at: Date.parse(i[:created_at])
       )
     end
   end

From 0fa066fb1b96422b425a866a1ef19c7bbdc58e2e Mon Sep 17 00:00:00 2001
From: Jens Timmerman <jens.timmerman@gmail.com>
Date: Tue, 13 Oct 2020 00:37:54 +0200
Subject: [PATCH 5/6] added 'laast aangepast' AND 'geschreven op'

---
 layouts/blogpost.erb | 1 +
 lib/helpers/blog.rb  | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/layouts/blogpost.erb b/layouts/blogpost.erb
index 6584e92..b4d775a 100644
--- a/layouts/blogpost.erb
+++ b/layouts/blogpost.erb
@@ -28,6 +28,7 @@
     <% end %>
     <div class="details animated fadeInRight">
       <small>
+        Geschreven op <%= gitctime %><br>
         Laatst aangepast op <%= gitmtime %><br>
         Leestijd: <%= reading_time @item %>
       </small>
diff --git a/lib/helpers/blog.rb b/lib/helpers/blog.rb
index 4b8be72..55b932b 100644
--- a/lib/helpers/blog.rb
+++ b/lib/helpers/blog.rb
@@ -26,10 +26,19 @@ module BlogHelper
     HTML
   end
 
+  def gitctime
+    # find file last modification time
+    filepath=@item[:content_filename]
+    str=`git log --format=%cd --date=short -- #{filepath} | tail -1`
+    return Date.parse(str)
+  end
+  
   def gitmtime
     # find file last modification time
     filepath=@item[:content_filename]
     str=`git log -1 --format=%cd --date=short -- #{filepath}`
     return Date.parse(str)
   end
+  
+
 end

From 4065178451f0801ddf378638bf8abb83235371f8 Mon Sep 17 00:00:00 2001
From: mcbloch <maxime.bloch@ugent.be>
Date: Thu, 18 Mar 2021 01:44:36 +0100
Subject: [PATCH 6/6] Fix merge

---
 lib/helpers/preprocess.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/helpers/preprocess.rb b/lib/helpers/preprocess.rb
index 9ca6bd7..dd3f3bb 100644
--- a/lib/helpers/preprocess.rb
+++ b/lib/helpers/preprocess.rb
@@ -56,7 +56,6 @@ module PreprocessHelper
         # Tag all posts with article (for Blogging helper)
         kind: 'article',
         academic_year: i.identifier.to_s[/\d\d-\d\d/],
-        created_at: Date.parse(i[:created_at])
       )
     end
   end