janispagel.de

commit 3105dc1d2bb835d9334cdf61f98b2da1fed1b6d1
parent 0ac114f3beb8ecbece3572b1bb9db39c61809085
Author: Janis Pagel <janis.pagel@ims.uni-stuttgart.de>
Date:   Fri, 27 Nov 2020 21:38:41 +0100

Unify layout

Diffstat:
M
_includes/course.md
 | 
2
+-
M
_layouts/home.html
 | 
6
+++++-
M
projects.md
 | 
2
++
M
teaching.md
 | 
13
+++++++++----

4 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/_includes/course.md b/_includes/course.md
@@ -5,4 +5,4 @@
 {% assign inst = c.inst %}
 {% endif %}
 
-- {{c.date}}: **{{ c.title }}** at {% if c.venue.link %}[{{c.venue.name}}]({{c.venue.link}}){% else %}{{c.venue.name}}{% endif %}{% if c.inst %}, {% if inst.link %}[{{inst.name}}]({{inst.link}}){% else %}{{inst.name}}{% if inst.city %}, {{inst.city}}{% if inst.country %}, {{inst.country}}{% endif %}{% endif %}{% endif %}{% endif %}. {% if c.program %} ({{ c.program | join: ", " }}). {% endif %}{% if c.with %}Taught jointly with {{c.with | join: ", " }}.{% endif %}<br/>{% if c.material %}[[material]]({{c.material}}){% endif %}
+{{c.date}}: **{{ c.title }}** at {% if c.venue.link %}[{{c.venue.name}}]({{c.venue.link}}){% else %}{{c.venue.name}}{% endif %}{% if c.inst %}, {% if inst.link %}[{{inst.name}}]({{inst.link}}){% else %}{{inst.name}}{% if inst.city %}, {{inst.city}}{% if inst.country %}, {{inst.country}}{% endif %}{% endif %}{% endif %}{% endif %}. {% if c.program %} ({{ c.program | join: ", " }}). {% endif %}{% if c.with %}Taught jointly with {{c.with | join: ", " }}.{% endif %}<br/>{% if c.material %}[[material]]({{c.material}}){% endif %}
diff --git a/_layouts/home.html b/_layouts/home.html
@@ -7,10 +7,14 @@ layout: default
     <h1 class="page-heading">{{ page.title }}</h1>
   {%- endif -%}
 
+	<div class="post-content">
   {{ content }}
+	</div>
+
+	<hr/>
 
   {%- if site.posts.size > 0 -%}
-  <h2 class="post-list-heading"><a href="/news">{{ page.list_title | default: "News" }}</a></h2>
+  <h2><a href="/news">{{ page.list_title | default: "News" }}</a></h2>
 	<h3><div class="feed-subscribe"><a href="/feed.xml"><svg class="svg-icon"><use xlink:href="{{ '/assets/minima-social-icons.svg#rss' | relative_url }}"/></svg> Atom feed</a></div></h3>
     <ul class="post-list">
       {%- for post in site.posts limit: 3 -%}
diff --git a/projects.md b/projects.md
@@ -24,6 +24,8 @@ keywords:
 
 {% endfor %}
 
+<hr/>
+
 ## Past
 
 {% for project in site.data.projects.completed %}
diff --git a/teaching.md b/teaching.md
@@ -12,8 +12,8 @@ permalink: /teaching/
 
 {% for c in courses %}
 
-### {{ c.date }}
-- **{{ c.title }}** {% if c.program %} ({{ c.program | join: ", " }}){% endif %} at [{{ loc[1].name }}]({{ loc[1].link }}){% if c.role %} as a {{ c.role }}{% endif %}. {% if c.with %}Taught jointly with {{c.with | join: ", " }}.{% endif %}
+- ### {{ c.date }}
+  - **{{ c.title }}** {% if c.program %} ({{ c.program | join: ", " }}){% endif %} at [{{ loc[1].name }}]({{ loc[1].link }}){% if c.role %} as a {{ c.role }}{% endif %}. {% if c.with %}Taught jointly with {{c.with | join: ", " }}.{% endif %}
 
 {% endfor %}
 {% endif %}
@@ -23,6 +23,11 @@ permalink: /teaching/
 
 {% assign courses = site.data.courses.external %}
 {% for c in courses %}
-### {{ c.year }}
-{% include course.md course=c %}
+{% assign inst=site.data.locations[c.inst] %}
+{% if inst.name %}
+{% else %}
+{% assign inst = c.inst %}
+{% endif %}
+- ### {{ c.year }}
+  - {{c.date}}: **{{ c.title }}** at {% if c.venue.link %}[{{c.venue.name}}]({{c.venue.link}}){% else %}{{c.venue.name}}{% endif %}{% if c.inst %}, {% if inst.link %}[{{inst.name}}]({{inst.link}}){% else %}{{inst.name}}{% endif %}{% if inst.city %}, {{inst.city}}{% endif %}{% if inst.country %}, {{inst.country}}{% endif %}{% endif %}. {% if c.program %} ({{ c.program | join: ", " }}). {% endif %}{% if c.with %}Taught jointly with {{c.with | join: ", " }}.{% endif %}<br/>{% if c.material %}[[material]]({{c.material}}){% endif %}
 {% endfor %}