Cleanup courses

_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

_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 %}

courses/AIProj.md

@@ -2,7 +2,7 @@
 layout: course
 
 title: Projekt zur Künstlichen Intelligenz
-instructor:
+instructors:
     - mkohlhase
 
 semesters: 

courses/GenICT1.md

@@ -2,7 +2,7 @@
 layout: course
 
 title: General Information and Communication Technology I 
-instructor:
+instructors:
     - mkohlhase
     - Prof.  Jürgen Schönwälder
     - Prof. Peter Baumann

courses/GenICT2.md

@@ -2,7 +2,7 @@
 layout: course
 
 title: General Information and Communication Technology II 
-instructor:
+instructors:
     - mkohlhase
     - Prof.  Jürgen Schönwälder
     - Prof. Peter Baumann

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

courses/ai.md

@@ -2,7 +2,7 @@
 layout: course
 
 title: Artificial Intelligence
-instructor:
+instructors:
     - mkohlhase
 
 organization: Jacobs University

courses/ai1.md

@@ -2,7 +2,7 @@
 layout: course
 
 title: Künstliche Intelligenz I
-instructor:
+instructors:
     - mkohlhase
 
 semesters:

courses/ai2.md

@@ -2,7 +2,7 @@
 layout: course
 
 title: Künstliche Intelligenz II
-instructor:
+instructors:
     - mkohlhase
 
 semesters:

courses/complog.md

@@ -2,7 +2,7 @@
 layout: course
 
 title: Computational Logic
-instructor:
+instructors:
     - mkohlhase
     - frabe
     - dmueller

courses/comsem.md

@@ -2,7 +2,7 @@
 layout: course
 
 title: Computational Natural Language Semantics
-instructor:
+instructors:
     - mkohlhase
     
 organization: Jacobs University

courses/dbwa.md

@@ -2,7 +2,7 @@
 layout: course
 
 title: Data Bases and Web Applications
-instructor:
+instructors:
     - mkohlhase
 
 organization: Jacobs University

courses/dynamics.md

@@ -2,9 +2,9 @@
 layout: course
 
 title: Representing Dynamics and Dynamic Representation 
-instructor:
+instructors:
     - mkohlhase
-    - Herber Jaeger, Jacocbs University
+    - Herber Jaeger, Jacobs University
 
 organization: Jacobs University
 semesters:

courses/gencs.md

@@ -2,13 +2,13 @@
 layout: course
 
 title: General Computer Science
-instructor:
+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. 

courses/gencs1.md

@@ -2,7 +2,7 @@
 layout: course
 
 title: General Computer Science I
-instructor:
+instructors:
     - mkohlhase
 
 organization: Jacobs University
@@ -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. 

courses/gencs2.md

@@ -2,7 +2,7 @@
 layout: course
 
 title: General Computer Science II
-instructor:
+instructors:
     - mkohlhase
 
 organization: Jacobs University

courses/krsw.md

@@ -2,7 +2,7 @@
 layout: course
 
 title: Research Seminar -  Knowledge Representation and Semantic Web
-instructor:
+instructors:
     - mkohlhase
     - frabe
 

courses/lbs.md

@@ -2,7 +2,7 @@
 layout: course
 
 title: Logik-Basierte Sprachverarbeitung (LBS)
-instructor:
+instructors:
     - mkohlhase
 
 semesters:

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

courses/meta/upcoming.md

 ---
 layout: default
-title: Upcoming ({% site.upcoming %})
+title: Upcoming Courses
 permalink: /courses/upcoming/
 ---