From b94ea5976e6a56a6bbec0f9d3709e2f5e0616c76 Mon Sep 17 00:00:00 2001
From: Tom Wiesing <tkw01536@gmail.com>
Date: Sat, 24 Jun 2017 13:13:32 -0400
Subject: [PATCH] Cleanup courses
---
_includes/semester.html | 35 +++++++++++++++++++++++++++++------
_layouts/course.html | 10 +++++++---
courses/AIProj.md | 4 ++--
courses/GenICT1.md | 14 +++++++-------
courses/GenICT2.md | 14 +++++++-------
courses/KRMT.md | 4 ++--
courses/ai.md | 2 +-
courses/ai1.md | 2 +-
courses/ai2.md | 4 ++--
courses/complog.md | 4 ++--
courses/comsem.md | 4 ++--
courses/dbwa.md | 4 ++--
courses/dynamics.md | 6 +++---
courses/gencs.md | 8 ++++----
courses/gencs1.md | 16 ++++++++--------
courses/gencs2.md | 4 ++--
courses/krsw.md | 4 ++--
courses/lbs.md | 4 ++--
courses/meta/README.md | 3 ++-
courses/meta/upcoming.md | 2 +-
courses/tdm.md | 2 +-
courses/ttt.md | 4 ++--
courses/wuv.md | 4 ++--
23 files changed, 93 insertions(+), 65 deletions(-)
diff --git a/_includes/semester.html b/_includes/semester.html
index 490cb51..c3095c4 100644
--- a/_includes/semester.html
+++ b/_includes/semester.html
@@ -2,14 +2,37 @@
Renders the name of a single semester. Expects 'semester' as a parameter.
{% endcomment %}
+<!-- check if we are a summer semester -->
{% assign nosummer = semester | remove: "SS" %}
-{% assign semesteryear = nosummer | remove: "WS" %}
+{% unless nosummer == semester %}
+ Summer
+{% endunless %}
-<!-- string.contains doesn't work, neither does substring -->
-{% if nosummer == semester %}
+<!-- check if we are a winter semester -->
+{% assign nowinter = semester | remove: "WS" %}
+{% unless nowinter == semester %}
Winter
-{% else %}
- Summer
-{% endif %}
+{% endunless %}
+
+<!-- check if we are a fall semester -->
+{% assign nofall = semester | remove: "Fall" %}
+{% unless nofall == semester %}
+ Fall
+{% endunless %}
+
+<!-- check if we are a spring semester -->
+{% assign nospring = semester | remove: "Spring" %}
+{% unless nospring == semester %}
+ Spring
+{% endunless %}
+
+<!-- check if we are an intersession semester -->
+{% assign nointer = semester | remove: "Intersession" %}
+{% unless nointer == semester %}
+ Intersession
+{% endunless %}
+
+<!-- find the year only -->
+{% assign semesteryear = nosummer | remove: "WS" | remove: "SS" | remove: "Fall" | remove: "Spring" | remove: "Intersession" %}
20{{semesteryear}}
\ No newline at end of file
diff --git a/_layouts/course.html b/_layouts/course.html
index d594acb..4bf030a 100644
--- a/_layouts/course.html
+++ b/_layouts/course.html
@@ -7,11 +7,15 @@ layout: default
<div class="card">
<div class="card-content">
<span class="card-title">{{page.title}}</span>
-
- {% assign person = page.instructor %}
- {% include people_chip.html %}
+ {% for person in page.instructors %}
+ {% include people_chip.html %}<br />
+ {% endfor %}
<hr />
+ {% if page.organization %}
+ <b>{{page.organization}}</b> <br />
+ {% endif %}
+
{% for semester in page.semesters %}
{% include semester.html %}<br />
{% endfor %}
diff --git a/courses/AIProj.md b/courses/AIProj.md
index 3bf756e..db973a7 100644
--- a/courses/AIProj.md
+++ b/courses/AIProj.md
@@ -2,8 +2,8 @@
layout: course
title: Projekt zur Künstlichen Intelligenz
-instructor:
- - mkohlhase
+instructors:
+ - mkohlhase
semesters:
- WS17/18
diff --git a/courses/GenICT1.md b/courses/GenICT1.md
index 90bbc84..4fb5918 100644
--- a/courses/GenICT1.md
+++ b/courses/GenICT1.md
@@ -2,15 +2,15 @@
layout: course
title: General Information and Communication Technology I
-instructor:
-- mkohlhase
-- Prof. Jürgen Schönwälder
-- Prof. Peter Baumann
-- Prof. Herbert Jaeger
+instructors:
+ - mkohlhase
+ - Prof. Jürgen Schönwälder
+ - Prof. Peter Baumann
+ - Prof. Herbert Jaeger
organization: Jacobs University
semesters:
-- Fall14
-- Fall15
+ - Fall14
+ - Fall15
---
An Introduction to Computer Science for students of all subjects.
diff --git a/courses/GenICT2.md b/courses/GenICT2.md
index 5e6e3b6..09e5437 100644
--- a/courses/GenICT2.md
+++ b/courses/GenICT2.md
@@ -2,14 +2,14 @@
layout: course
title: General Information and Communication Technology II
-instructor:
-- mkohlhase
-- Prof. Jürgen Schönwälder
-- Prof. Peter Baumann
-- Prof. Herbert Jaeger
-
+instructors:
+ - mkohlhase
+ - Prof. Jürgen Schönwälder
+ - Prof. Peter Baumann
+ - Prof. Herbert Jaeger
+
organization: Jacobs University
semesters:
-- Spring15
+ - Spring15
---
An Introduction to Computer Science for students of all subjects.
diff --git a/courses/KRMT.md b/courses/KRMT.md
index 82df600..b8d682b 100644
--- a/courses/KRMT.md
+++ b/courses/KRMT.md
@@ -2,8 +2,8 @@
layout: course
title: Logik-Basierte Wissensrepräsentation für Mathematisch/Technisches Wissen
-instructor:
- - omkohlhase
+instructors:
+ - mkohlhase
semesters:
- SS17
diff --git a/courses/ai.md b/courses/ai.md
index ce07f6b..12a128a 100644
--- a/courses/ai.md
+++ b/courses/ai.md
@@ -2,7 +2,7 @@
layout: course
title: Artificial Intelligence
-instructor:
+instructors:
- mkohlhase
organization: Jacobs University
diff --git a/courses/ai1.md b/courses/ai1.md
index b3e4125..c54ea4d 100644
--- a/courses/ai1.md
+++ b/courses/ai1.md
@@ -2,7 +2,7 @@
layout: course
title: Künstliche Intelligenz I
-instructor:
+instructors:
- mkohlhase
semesters:
diff --git a/courses/ai2.md b/courses/ai2.md
index 7bf7ebd..8e3192a 100644
--- a/courses/ai2.md
+++ b/courses/ai2.md
@@ -2,8 +2,8 @@
layout: course
title: Künstliche Intelligenz II
-instructor:
- - mkohlhase
+instructors:
+ - mkohlhase
semesters:
- SS17
diff --git a/courses/complog.md b/courses/complog.md
index 0cdfb89..3a7b139 100644
--- a/courses/complog.md
+++ b/courses/complog.md
@@ -2,8 +2,8 @@
layout: course
title: Computational Logic
-instructor:
- - mkohlhase
+instructors:
+ - mkohlhase
- frabe
- dmueller
diff --git a/courses/comsem.md b/courses/comsem.md
index 6d122e0..0856695 100644
--- a/courses/comsem.md
+++ b/courses/comsem.md
@@ -2,8 +2,8 @@
layout: course
title: Computational Natural Language Semantics
-instructor:
- - mkohlhase
+instructors:
+ - mkohlhase
organization: Jacobs University
semesters:
diff --git a/courses/dbwa.md b/courses/dbwa.md
index 914c28f..698f239 100644
--- a/courses/dbwa.md
+++ b/courses/dbwa.md
@@ -2,8 +2,8 @@
layout: course
title: Data Bases and Web Applications
-instructor:
- - mkohlhase
+instructors:
+ - mkohlhase
organization: Jacobs University
semesters:
diff --git a/courses/dynamics.md b/courses/dynamics.md
index de9437c..baf5432 100644
--- a/courses/dynamics.md
+++ b/courses/dynamics.md
@@ -2,9 +2,9 @@
layout: course
title: Representing Dynamics and Dynamic Representation
-instructor:
- - mkohlhase
- - Herber Jaeger, Jacocbs University
+instructors:
+ - mkohlhase
+ - Herber Jaeger, Jacobs University
organization: Jacobs University
semesters:
diff --git a/courses/gencs.md b/courses/gencs.md
index 879c138..9659593 100644
--- a/courses/gencs.md
+++ b/courses/gencs.md
@@ -2,13 +2,13 @@
layout: course
title: General Computer Science
-instructor:
- - mkohlhase
+instructors:
+ - mkohlhase
organization: Jacobs University
semesters:
- - Fall015
- - Fall016
+ - Fall15
+ - Fall16
---
General Computer Science I is the first semester, introductory course taught at Jacobs University. Starting the Fall Semester 2015 (when GenCS II was dropped). It is really still the same as GenCS I.
diff --git a/courses/gencs1.md b/courses/gencs1.md
index 4409046..f383d67 100644
--- a/courses/gencs1.md
+++ b/courses/gencs1.md
@@ -2,8 +2,8 @@
layout: course
title: General Computer Science I
-instructor:
- - mkohlhase
+instructors:
+ - mkohlhase
organization: Jacobs University
semesters:
@@ -14,11 +14,11 @@ semesters:
- Fall07
- Fall08
- Fall09
- - Fall010
- - Fall011
- - Fall012
- - Fall013
- - Fall014
----p
+ - Fall10
+ - Fall11
+ - Fall12
+ - Fall13
+ - Fall14
+---
General Computer Science I is the first semester, introductory course taught at Jacobs University. It focuses on representation issues for objects, and uses SML as an programming language to equalize over a diverse student body.
diff --git a/courses/gencs2.md b/courses/gencs2.md
index b549737..1b6a542 100644
--- a/courses/gencs2.md
+++ b/courses/gencs2.md
@@ -2,8 +2,8 @@
layout: course
title: General Computer Science II
-instructor:
- - mkohlhase
+instructors:
+ - mkohlhase
organization: Jacobs University
semesters:
diff --git a/courses/krsw.md b/courses/krsw.md
index a5f5ce8..f531d40 100644
--- a/courses/krsw.md
+++ b/courses/krsw.md
@@ -2,8 +2,8 @@
layout: course
title: Research Seminar - Knowledge Representation and Semantic Web
-instructor:
- - mkohlhase
+instructors:
+ - mkohlhase
- frabe
organization: Jacobs University
diff --git a/courses/lbs.md b/courses/lbs.md
index 5a42c47..c15ebc9 100644
--- a/courses/lbs.md
+++ b/courses/lbs.md
@@ -2,8 +2,8 @@
layout: course
title: Logik-Basierte Sprachverarbeitung (LBS)
-instructor:
- - mkohlhase
+instructors:
+ - mkohlhase
semesters:
- WS17/18
diff --git a/courses/meta/README.md b/courses/meta/README.md
index daf67be..c4923bf 100644
--- a/courses/meta/README.md
+++ b/courses/meta/README.md
@@ -9,8 +9,9 @@ Each file needs some specific parameters:
* **layout** use *course*
* **title** the title of the course/seminar
- * **instructor** instructor of the course
+ * **instructors** instructor(s) of the course
+* **organization** (optional) organization in which the course was taught
* **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/upcoming.md b/courses/meta/upcoming.md
index 193ad34..2b02574 100644
--- a/courses/meta/upcoming.md
+++ b/courses/meta/upcoming.md
@@ -1,6 +1,6 @@
---
layout: default
-title: Upcoming ({% site.upcoming %})
+title: Upcoming Courses
permalink: /courses/upcoming/
---
diff --git a/courses/tdm.md b/courses/tdm.md
index 27fe692..6cee66e 100644
--- a/courses/tdm.md
+++ b/courses/tdm.md
@@ -2,7 +2,7 @@
layout: course
title: "University Study Course: Text and Digital Media"
-instructor:
+instructors:
- mkohlhase
- Prof. Thomas Rommel, Jacobs University
diff --git a/courses/ttt.md b/courses/ttt.md
index 8053417..a8fa086 100644
--- a/courses/ttt.md
+++ b/courses/ttt.md
@@ -2,13 +2,13 @@
layout: course
title: "University Study Course - From the Textual to the Technological: Documents and Structure in a Digital Age"
-instructor:
+instructors:
- mkohlhase
- Dr. Giselda Baudin
organization: Jacobs University
semesters:
- - Intersession 2014
+ - Intersession14
---
An interdisciplinary Introduction to the structure and management of Text and Digial
Media.
diff --git a/courses/wuv.md b/courses/wuv.md
index da72a17..a150a1b 100644
--- a/courses/wuv.md
+++ b/courses/wuv.md
@@ -2,8 +2,8 @@
layout: course
title: Seminar Wissensrepräsentation und -verarbeitung
-instructor:
- - mkohlhase
+instructors:
+ - mkohlhase
semesters:
- SS17
--
GitLab