diff --git a/Rules b/Rules
index 71a24fb..b8a1757 100644
--- a/Rules
+++ b/Rules
@@ -41,7 +41,7 @@ end
# ARCHIVES
#
compile '/blog/*' do
- layout '/archive_page.*'
+ layout '/blogs.*'
layout '/generic.*'
layout '/default.*'
filter :erb
diff --git a/layouts/archive_page.erb b/layouts/blogs.erb
similarity index 81%
rename from layouts/archive_page.erb
rename to layouts/blogs.erb
index 7a93594..41f6de0 100644
--- a/layouts/archive_page.erb
+++ b/layouts/blogs.erb
@@ -34,6 +34,14 @@
<%= render '/partials/_blog_preview.*', post: post %>
<% end %>
+
+ <% if posts_in_year(@item[:academic_year]).empty? %>
+
+
Sorry.
+ No blog posts yet this year.
+ Soon TM.
+
+ <% end %>
diff --git a/layouts/events.erb b/layouts/events.erb
index e8e1d62..14478c5 100644
--- a/layouts/events.erb
+++ b/layouts/events.erb
@@ -52,5 +52,13 @@
<% end %>
<% end %>
+
+ <% if past_events(@item[:academic_year]).empty? and upcoming_events(@item[:academic_year]).empty? %>
+
+
Sorry.
+ No events planned yet this year.
+ Soon TM.
+
+ <% end %>
diff --git a/lib/helpers/archives.rb b/lib/helpers/archives.rb
index 5c15ccc..68ec04f 100644
--- a/lib/helpers/archives.rb
+++ b/lib/helpers/archives.rb
@@ -6,6 +6,8 @@ module ArchiveHelper
.map { |i| i.identifier.to_s[/\d\d-\d\d/] })
.to_a
.sort
+ .push(@config[:academic_year])
+ .uniq
end
def academic_years_blog_items
diff --git a/lib/helpers/preprocess.rb b/lib/helpers/preprocess.rb
index 7553844..3574b6a 100644
--- a/lib/helpers/preprocess.rb
+++ b/lib/helpers/preprocess.rb
@@ -46,7 +46,10 @@ module PreprocessHelper
def create_yearly_items(type)
type = type.to_s
- years = @items.find_all("/#{type.downcase}/*/*").map { |i| i.identifier.to_s[/\d\d-\d\d/] }.uniq
+ years = @items.find_all("/#{type.downcase}/*/*")
+ .map { |i| i.identifier.to_s[/\d\d-\d\d/] }
+ .push(@config[:academic_year])
+ .uniq
years.each do |year|
@items.create(