diff --git a/projects/meta/completed.md b/projects/meta/completed.md index cb14aee2c80bd5c2c38e6ce210d51087aaa9fab8..da30d982131624772871e4ad1cfc9849f4fd2971 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 5173ed688ade3bf4e21b6e22ba7195a883b5faba..c7097a74aadec5d0356694d91f62366a039145eb 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 cc62b999cdfc8d4d81c1b2550d40781d7970201e..68292c1b70792e180bea6816eb0d7365b2f0fdca 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