From f8ace2653d90c2529fdf4b90c0d5210dfca60980 Mon Sep 17 00:00:00 2001
From: Michael Kohlhase <m.kohlhase@jacobs-university.de>
Date: Sat, 6 May 2017 12:23:53 +0200
Subject: [PATCH] reorg
---
_layouts/project.html | 24 ++++++++++++++++++++++--
projects/README.md | 2 +-
projects/jem.md | 2 +-
projects/odk.md | 16 ++++++++++++----
projects/openmath-tn.md | 2 +-
{projects => systems}/arXMLiv.md | 0
{projects => systems}/mws.md | 0
{projects => systems}/sTeX.md | 0
{projects => systems}/smglom.md | 0
9 files changed, 37 insertions(+), 9 deletions(-)
rename {projects => systems}/arXMLiv.md (100%)
rename {projects => systems}/mws.md (100%)
rename {projects => systems}/sTeX.md (100%)
rename {projects => systems}/smglom.md (100%)
diff --git a/_layouts/project.html b/_layouts/project.html
index e6a1479..e12bfbd 100644
--- a/_layouts/project.html
+++ b/_layouts/project.html
@@ -9,10 +9,30 @@ layout: default
{{page.start}} - {% if page.end %} {{page.end}}{% endif %}
{% endif %}
</h1>
- {{ content }}
+{% if page.subtitle %}<h2>{{page.subtitle}}</h2>{% endif %}
+{% if page.funding %}
+ <p>funded by {{page.funding}}
+ {% if page.program or page.grantid %}({% endif %}
+ {% if page.program %}{{page.program}}{% endif %}
+ {% if page.grantid %} - {{page.grantid}}{% endif %}
+ {% if page.program or page.grantid %}){% endif %}
+ </p>
+{% endif %}
+
+{{ content }}
{% if page.people %}
- <h3>People:</h3>
+ <h3>People</h3>
{{page.people}}
{% endif %}
+
+ {% if page.collaborators %}
+ <h3>Collaborators</h3>
+ {{page.collaborators}}
+ {% endif %}
+
+ {% if page.phomepage %}
+ <h3>Project Home Page</h3>
+ <a href="{{page.url}}">{{page.phomepage}}</a>
+ {% endif %}
</div>
diff --git a/projects/README.md b/projects/README.md
index 2933bed..9532123 100644
--- a/projects/README.md
+++ b/projects/README.md
@@ -22,4 +22,4 @@ Each post needs some specific parameters:
* **funding** (optional): the funding body, *DFG*, *Leibniz Foundation*, *EU*, *Industry*
* **program** (optional): the funding program
* **grantid** (optional): the project identifier of the funder, e.g. `KO 2428/13-1`
- * **url** (optional): the project home page
+ * **phomepage** (optional): the project home page
diff --git a/projects/jem.md b/projects/jem.md
index a53d599..04c94c0 100644
--- a/projects/jem.md
+++ b/projects/jem.md
@@ -7,7 +7,7 @@ start: 2006
end: 2009
funding: EU
program: eContentPlus Thematic Network
-url: http://calc.mathstat.helsinki.fi/jem/en/about/
+phomepage: http://calc.mathstat.helsinki.fi/jem/en/about/
people: mkohlhase
---
The network assembles leading developers of semantic web technologies for the
diff --git a/projects/odk.md b/projects/odk.md
index 3a7deb5..edf0edb 100644
--- a/projects/odk.md
+++ b/projects/odk.md
@@ -7,10 +7,18 @@ start: 2015-09
end: 2019-08
funding: EU
program: Research Infrastructure
-grantid: #676541
-url: http://opendreamkit.org
+grantid: 676541
+phomepage: http://opendreamkit.org
people: mkohlhase,frabe,twiesing
---
-OpenDreamKit is a Horizon 2020 European Research Infrastructure project (#676541) that will run for four years, starting from September 2015. It provides substantial funding to the open source computational mathematics ecosystem, and in particular popular tools such as LinBox, MPIR, SageMath, GAP, Pari/GP, LMFDB, Singular, MathHub, and the IPython/Jupyter interactive computing environment.
-From this ecosystem, OpenDreamKit will deliver a flexible toolkit enabling research groups to set up Virtual Research Environments, customised to meet the varied needs of research projects in pure mathematics and applications, and supporting the full research life-cycle from exploration, through proof and publication, to archival and sharing of data and code.
+OpenDreamKit is a Horizon 2020 European Research Infrastructure project (#676541) that
+will run for four years, starting from September 2015. It provides substantial funding to
+the open source computational mathematics ecosystem, and in particular popular tools such
+as LinBox, MPIR, SageMath, GAP, Pari/GP, LMFDB, Singular, MathHub, and the IPython/Jupyter
+interactive computing environment.
+
+From this ecosystem, OpenDreamKit will deliver a flexible toolkit enabling research groups
+to set up Virtual Research Environments, customised to meet the varied needs of research
+projects in pure mathematics and applications, and supporting the full research life-cycle
+from exploration, through proof and publication, to archival and sharing of data and code.
diff --git a/projects/openmath-tn.md b/projects/openmath-tn.md
index 596c543..559cc63 100644
--- a/projects/openmath-tn.md
+++ b/projects/openmath-tn.md
@@ -8,7 +8,7 @@ end: 2004
funding: EU
program: IST Thematic Netork
grantid: IST-2000-29719
-url: http://www.openmath.org/projects/thematic/
+phomepage: http://www.openmath.org/projects/thematic/
people: mkohlhase
---
The OpenMath Thematic Network, was a European Union sponsored project with the following
diff --git a/projects/arXMLiv.md b/systems/arXMLiv.md
similarity index 100%
rename from projects/arXMLiv.md
rename to systems/arXMLiv.md
diff --git a/projects/mws.md b/systems/mws.md
similarity index 100%
rename from projects/mws.md
rename to systems/mws.md
diff --git a/projects/sTeX.md b/systems/sTeX.md
similarity index 100%
rename from projects/sTeX.md
rename to systems/sTeX.md
diff --git a/projects/smglom.md b/systems/smglom.md
similarity index 100%
rename from projects/smglom.md
rename to systems/smglom.md
--
GitLab