From 7e6950e053412f07664d8fdca1104faac997920d Mon Sep 17 00:00:00 2001
From: Michael Kohlhase <m.kohlhase@jacobs-university.de>
Date: Sat, 24 Jun 2017 11:38:12 +0200
Subject: [PATCH] more
---
projects/meta/completed.md | 15 +++++++++++----
projects/meta/index.md | 9 ++++-----
projects/tetrapod.md | 5 ++---
3 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/projects/meta/completed.md b/projects/meta/completed.md
index cb14aee..da30d98 100644
--- a/projects/meta/completed.md
+++ b/projects/meta/completed.md
@@ -6,17 +6,24 @@ permalink: /projects/completed/
{% assign projects = site.pages | where: "layout", "project" | where: "active", false | sort: "end_date" | reverse %}
-This page lists the completed projects of the KWARC group
-([projects with current, external funding](../).
+#### Completed, externally funded Projects ([projects with current funding](../).
<ul class="collection">
{% for item in projects %}
- {% include psitem.html %}
+ {% if item.funding %} {% include psitem.html %} {% endif %}
{% endfor %}
</ul>
+#### Completed Internal Projects
+We also organize some of our research and development into Projects,
+<ul class="collection">
+ {% for item in projects %}
+ {% unless item.funding %} {% include psitem.html %} {% endunless %}
+ {% endfor %}
+</ul>
-
+#### System Projects
+Completed projects that focused on building particular systems can be found under [KWARC Systems](../../systems/completed/).
diff --git a/projects/meta/index.md b/projects/meta/index.md
index 5173ed6..c7097a7 100644
--- a/projects/meta/index.md
+++ b/projects/meta/index.md
@@ -4,23 +4,22 @@ title: Projects
permalink: /projects/
---
+{% assign projects = site.pages | where: "layout", "project" | where: "active", true | sort: "start_date" %}
#### Projects with current, external funding ([completed projects](../completed)).
-{% assign projects = site.pages | where: "layout", "project" | where: "active", true | sort: "start_date" %}
<ul class="collection">
{% for item in projects %}
- {% include psitem.html %}
+ {% if item.funding %} {% include psitem.html %} {% endif %}
{% endfor %}
</ul>
#### Internal Projects
We also organize some of our research and development into Projects,
-{% assign internal = site.pages | where: "layout", "project" | where: "active", true | where: "funding" | sort: "start_date" %}
<ul class="collection">
- {% for item in internal %}
- {% include psitem.html %}
+ {% for item in projects %}
+ {% unless item.funding %} {% include psitem.html %} {% endunless %}
{% endfor %}
</ul>
diff --git a/projects/tetrapod.md b/projects/tetrapod.md
index cc62b99..68292c1 100644
--- a/projects/tetrapod.md
+++ b/projects/tetrapod.md
@@ -2,11 +2,10 @@
layout: project
title: Tetrapod
-teaser:
+teaser: All four dimensions of Mathematical Knowledge Processing
active: false
-start_date: '22005'
-end_date: '2008'
+start_date: '2011-12'
people:
- mkohlhase
--
GitLab