diff --git a/README.md b/README.md
index b2c00a394d06fdc29d5ff4fe34f3d9867643e8a9..2bb59f319d553798f9e1c1540bc01653a670548a 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ See the above links for details.
* `public/*.md`: descriptions of the research areas
* `students/*.md`: pages for students
* `systems/*.md`: descriptions of the KWARC sytems
-* `teaching/*.md`: KWARC courses (this may be obsoleted by univis)
+* `courses/*.md`: KWARC courses (this may be obsoleted by univis)
## Performance
This jekyll page is tuned in order to build as fast as possible.
diff --git a/_config.yml b/_config.yml
index 099a4a7ab44da8907306bec9d3e9db7cf5f0185c..100f3fbef9d7e58b31c91b74a5f70d05cc2a8869 100644
--- a/_config.yml
+++ b/_config.yml
@@ -78,8 +78,15 @@ menu:
- title: '4Students'
url: '/students/'
active: '/students/'
- - title: 'Teaching'
- folder: 'teaching'
+
+ - title: 'Courses'
+ active: '/courses/'
+ items:
+ - title: 'Current Courses'
+ url: '/courses/'
+ - title: 'Former Courses'
+ url: '/courses/former/'
+
- title: 'Contact'
url: '/contact/'
diff --git a/_includes/course.html b/_includes/course.html
new file mode 100644
index 0000000000000000000000000000000000000000..86d8d431f2535ef6caa58e38116d6baad1adf0d5
--- /dev/null
+++ b/_includes/course.html
@@ -0,0 +1,7 @@
+{% comment %}
+ Renders a link to a single course. Expects 'item' as a parameter.
+{% endcomment %}
+
+<li class="collection-item">
+ <a href="{{item.url}}" class="title">{{item.title}}</a>
+</li>
\ No newline at end of file
diff --git a/_includes/semester.html b/_includes/semester.html
new file mode 100644
index 0000000000000000000000000000000000000000..490cb51aa44d13f7b3f1305bfee9369ec597a9ef
--- /dev/null
+++ b/_includes/semester.html
@@ -0,0 +1,15 @@
+{% comment %}
+ Renders the name of a single semester. Expects 'semester' as a parameter.
+{% endcomment %}
+
+{% assign nosummer = semester | remove: "SS" %}
+{% assign semesteryear = nosummer | remove: "WS" %}
+
+<!-- string.contains doesn't work, neither does substring -->
+{% if nosummer == semester %}
+ Winter
+{% else %}
+ Summer
+{% endif %}
+
+20{{semesteryear}}
\ No newline at end of file
diff --git a/_layouts/course.html b/_layouts/course.html
index 52bf807774cce359b8fe5d162265ed827c81b8e7..d594acbc296ce4dc07d5cc807c51f2b180b34fb9 100644
--- a/_layouts/course.html
+++ b/_layouts/course.html
@@ -6,9 +6,15 @@ layout: default
<div class="col s12 m5 left">
<div class="card">
<div class="card-content">
- <span class="card-title">{{page.title}} ({{page.taught}})</span>
+ <span class="card-title">{{page.title}}</span>
+
{% assign person = page.instructor %}
- Instructor: {% include people_chip.html %}
+ {% include people_chip.html %}
+ <hr />
+
+ {% for semester in page.semesters %}
+ {% include semester.html %}<br />
+ {% endfor %}
</div>
</div>
</div>
diff --git a/teaching/AIProj.md b/courses/AIProj.md
similarity index 75%
rename from teaching/AIProj.md
rename to courses/AIProj.md
index ddaf9fd8dd59db1efa4b277eddf74037d4a87711..84345e66e7ee1c6953af503a750ac16fcd099fa0 100644
--- a/teaching/AIProj.md
+++ b/courses/AIProj.md
@@ -1,12 +1,16 @@
---
layout: course
-instructor: mkohlhase
+
title: Projekt zur Künstlichen Intelligenz
-menu_title: KI-Projekt
-taught: WS16/17, SS16
+instructor: mkohlhase
+
+semesters:
+ - WS16/17
+ - SS16
+ - SS17
---
-The KWARC group (Wissensrepräsentation und Verarbeitung)conducts research in knowledge representation and reasoning techniques with a view towards applications in knowledge management.
+The KWARC group (Wissensrepräsentation und Verarbeitung) conducts research in knowledge representation and reasoning techniques with a view towards applications in knowledge management.
We extend techniques from formal methods so that they can be used in settings where formalization is either infeasible or too costly.
We concentrate on developing techniques for marking up the structural semantics in technical documents.
This level of markup allows for offering interesting knowledge management services without forcing theauthor to formalize the document contents.
diff --git a/teaching/KRMT.md b/courses/KRMT.md
similarity index 91%
rename from teaching/KRMT.md
rename to courses/KRMT.md
index e4502ee8e436dc939df1866c34701120e7199013..2c38dcb93c3d7a3b5c7ed5953a19dbbf7c1c4d13 100644
--- a/teaching/KRMT.md
+++ b/courses/KRMT.md
@@ -1,9 +1,11 @@
---
layout: course
-instructor: mkohlhase
+
title: Vorlesung *Logik-Basierte Wissensrepräsentation für Mathematisch/Technisches Wissen*
-menu_title: Vorlesung KRMT
-taught: SS16/17
+instructor: mkohlhase
+
+semesters:
+ - SS16/17
---
Dieser Kurs behandelt Grundlagen der Mathematik, Modulare Formalisierung in
diff --git a/teaching/ai1.md b/courses/ai1.md
similarity index 92%
rename from teaching/ai1.md
rename to courses/ai1.md
index e577c3f596a8c3f55571f647f628f255dd98e3b8..cfaa4047c3db959466ad14dfdb90fab31f64b4dd 100644
--- a/teaching/ai1.md
+++ b/courses/ai1.md
@@ -1,9 +1,13 @@
---
layout: course
-instructor: mkohlhase
+
title: Künstliche Intelligenz I
-taught: WS16
+instructor: mkohlhase
+
+semesters:
+ - WS16/17
---
+
Diese Vorlesung beschäftigt sich mit den Grundlagen der Künstlichen Intelligenz (KI),
insbesondere
* Agentenmodelle als Grundlagen der KI
diff --git a/teaching/ai2.md b/courses/ai2.md
similarity index 94%
rename from teaching/ai2.md
rename to courses/ai2.md
index fa32fc6f64d0d20c20f0fc93fde95b0ca056fb55..9590900c6219a6e5cfad9a43ba6a713f51403647 100644
--- a/teaching/ai2.md
+++ b/courses/ai2.md
@@ -1,8 +1,11 @@
---
layout: course
-instructor: mkohlhase
+
title: Künstliche Intelligenz II
-taught: SS16/17
+instructor: mkohlhase
+
+semesters:
+ - SS17
---
Dieser Kurs beschäftigt sich mit den Grundlagen der Künstlichen Intelligenz (KI), insbesondere mit Techniken des Schliessens unter Unsicherheit, des maschinellen Lernens und des Sprachverstehens.
diff --git a/teaching/README.md b/courses/meta/README.md
similarity index 61%
rename from teaching/README.md
rename to courses/meta/README.md
index cd12abe91e7acb1312239a4568af0b741c886a9d..daf67be2d1eafead4f46b05309378ca862d8d6fa 100644
--- a/teaching/README.md
+++ b/courses/meta/README.md
@@ -7,8 +7,10 @@ examples.We keep the pages in the language the course will be in.
Each file needs some specific parameters:
* **layout** use *course*
+
* **title** the title of the course/seminar
- * **subtitle** (optionnal) a subtitle. It will be adjuncted to your title in the post
- link and just under the title in the post page
- * **instructor** instructors
- * **menu_title** the title in the menu
+ * **instructor** instructor of the course
+
+ * **semesters** semesters in which the course was taught
+
+A semester is automatically regarded as active if the current semester matches one of the one in which the course was offered.
\ No newline at end of file
diff --git a/courses/meta/former.md b/courses/meta/former.md
new file mode 100644
index 0000000000000000000000000000000000000000..00e580acbed33af4308cf117924e85b51794ad0f
--- /dev/null
+++ b/courses/meta/former.md
@@ -0,0 +1,15 @@
+---
+layout: default
+title: Former Courses
+permalink: /courses/former/
+---
+
+{% assign courses = site.pages | where: "layout", "course" | sort: "title" %}
+
+<ul class="collection">
+ {% for item in courses %}
+ {% unless item.semesters contains site.semester %}
+ {% include course.html %}
+ {% endunless %}
+ {% endfor %}
+</ul>
\ No newline at end of file
diff --git a/courses/meta/index.md b/courses/meta/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..8ba40bdaddb5fec2a155279605456452c73bad17
--- /dev/null
+++ b/courses/meta/index.md
@@ -0,0 +1,15 @@
+---
+layout: default
+title: Courses
+permalink: /courses/
+---
+
+{% assign courses = site.pages | where: "layout", "course" | sort: "title" %}
+
+<ul class="collection">
+ {% for item in courses %}
+ {% if item.semesters contains site.semester %}
+ {% include course.html %}
+ {% endif %}
+ {% endfor %}
+</ul>
diff --git a/teaching/wuv.md b/courses/wuv.md
similarity index 75%
rename from teaching/wuv.md
rename to courses/wuv.md
index 4d3dce0ba72873b5e6357e0749df6bc7ab4e1c25..fa60f21556c67710b9470f306885a3eecbb0c75e 100644
--- a/teaching/wuv.md
+++ b/courses/wuv.md
@@ -1,10 +1,11 @@
---
layout: course
-instructor: mkohlhase
+
title: Seminar Wissensrepräsentation und -verarbeitung
-menu_title: Seminar WuV
+instructor: mkohlhase
+
+semesters: []
---
This seminar covers topics from knowledge representation and knowledge processing, mostly
-with a focus on mathematical knowledge.
-
+with a focus on mathematical knowledge.
\ No newline at end of file