From d066fab5d1f2dbb9eda959372af42d7bd23b967b Mon Sep 17 00:00:00 2001
From: The Server <theserver@fslab.de>
Date: Wed, 29 Apr 2015 01:02:23 +0200
Subject: [PATCH] use only one layout for blog-posts and events, mark events
as... well... events.
---
_layouts/event.html | 21 -------------------
_layouts/post.html | 11 +++++++++-
.../events/2015-05-15-chaos-cologne.markdown | 2 +-
index.html | 2 +-
4 files changed, 12 insertions(+), 24 deletions(-)
delete mode 100644 _layouts/event.html
diff --git a/_layouts/event.html b/_layouts/event.html
deleted file mode 100644
index 8fb8897..0000000
--- a/_layouts/event.html
+++ /dev/null
@@ -1,21 +0,0 @@
----
-layout: default
----
-<div class="post">
-
- <header class="post-header">
- <h1 class="post-title">{{ page.title }}</h1>
- <p class="post-meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
- <p class="event-date">
- Anfang: {{ page.eventstart | date: "%d.%m.%Y %H:%M" }}<br />
- Ende: {{ page.eventend | date: "%d.%m.%Y %H:%M" }}<br />
- Ort: {% if page.location %}{{ page.location }}{% else %}Free Software Lab{% endif %}
- {% if page.organizer %}<br />Organisation: {{ page.organizer }}{% endif %}
- </p>
- </header>
-
- <article class="post-content">
- {{ content }}
- </article>
-
-</div>
diff --git a/_layouts/post.html b/_layouts/post.html
index a2b4e52..a7a8904 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -4,8 +4,17 @@ layout: default
<div class="post">
<header class="post-header">
- <h1 class="post-title">{{ page.title }}</h1>
+ <h1 class="post-title">{% if page.categories contains 'event' %}Termin: {% endif %}{{ page.title }}</h1>
<p class="post-meta">{{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</p>
+ {% if page.categories contains 'event' %}
+ <p class="event-date">
+ Anfang: {{ page.eventstart | date: "%d.%m.%Y %H:%M" }}<br />
+ Ende: {{ page.eventend | date: "%d.%m.%Y %H:%M" }}<br />
+ Ort: {% if page.location %}{{ page.location }}{% else %}Free Software Lab{% endif %}
+ {% if page.organizer %}<br />Organisation: {{ page.organizer }}{% endif %}
+ </p>
+ {% endif %}
+
</header>
<article class="post-content">
diff --git a/_posts/events/2015-05-15-chaos-cologne.markdown b/_posts/events/2015-05-15-chaos-cologne.markdown
index c054a67..02cd3f9 100644
--- a/_posts/events/2015-05-15-chaos-cologne.markdown
+++ b/_posts/events/2015-05-15-chaos-cologne.markdown
@@ -1,5 +1,5 @@
---
-layout: event
+layout: post
title: "Chaos Cologne"
date: 2015-04-28 17:20:36
eventstart: 2015-05-15 20:00:00
diff --git a/index.html b/index.html
index cd5532d..6930837 100644
--- a/index.html
+++ b/index.html
@@ -35,7 +35,7 @@ layout: default
<span class="post-meta">{{ post.date | date: "%b %-d, %Y" }}</span>
<h2>
- <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a>
+ <a class="post-link" href="{{ post.url | prepend: site.baseurl }}">{% if post.categories contains 'event' %}Termin: {% endif %}{{ post.title }}</a>
</h2>
</li>
{% endfor %}
--
GitLab