From 6494fe115695b89a13025fc151edf1514dfab821 Mon Sep 17 00:00:00 2001 From: Tom Wiesing <tkw01536@gmail.com> Date: Fri, 23 Jun 2017 22:44:08 -0400 Subject: [PATCH] Get project pages ready for deployment --- _config.yml | 9 +- _includes/projects_list.html | 33 -------- _layouts/project.html | 154 +++++++++++++++++++---------------- projects/FormalCAD.md | 19 +++-- projects/README.md | 21 ----- projects/current.md | 16 ---- projects/former.md | 17 ---- projects/index.html | 9 -- projects/jem.md | 19 +++-- projects/latin.md | 20 +++-- projects/logosphere.md | 20 +++-- projects/mathsearch.md | 19 +++-- projects/meta/README.md | 26 ++++++ projects/meta/completed.md | 19 +++++ projects/meta/index.md | 13 +++ projects/oaf.md | 15 +++- projects/odk.md | 17 +++- projects/omoc.md | 18 ++-- projects/once-cs.md | 13 ++- projects/openmath-tn.md | 17 ++-- projects/sissi.md | 19 +++-- 21 files changed, 289 insertions(+), 224 deletions(-) delete mode 100644 _includes/projects_list.html delete mode 100644 projects/README.md delete mode 100644 projects/current.md delete mode 100644 projects/former.md delete mode 100644 projects/index.html create mode 100644 projects/meta/README.md create mode 100644 projects/meta/completed.md create mode 100644 projects/meta/index.md diff --git a/_config.yml b/_config.yml index 95c7bba..099a4a7 100644 --- a/_config.yml +++ b/_config.yml @@ -67,9 +67,14 @@ menu: - title: 'Historic Systems' url: '/systems/historic/' - - title: 'Projects' - folder: 'projects' + active: '/projects/' + items: + - title: 'Current Projects' + url: '/projects/' + - title: 'Completed Projects' + url: '/projects/completed/' + - title: '4Students' url: '/students/' active: '/students/' diff --git a/_includes/projects_list.html b/_includes/projects_list.html deleted file mode 100644 index 4aaa62e..0000000 --- a/_includes/projects_list.html +++ /dev/null @@ -1,33 +0,0 @@ -{% comment %} - Generates a list of projects. - Expects 'projects' as an argument, representing the list of projects to show. -{% endcomment %} - -{% for role in site.roles %} - {% assign rollers = projects | where: "role", role.id %} - - {% if rollers.size > 0 %} - <ul class="collection with-header"> - <li class="collection-header"><h4>{{role.name}}</h4></li> - {% for project in rollers %} - <li class="collection-item avatar"> - <a href="{{project.url}}" class="title">{{project.fullname}}</a> - <p> - {% if project.start_date %} - from - {% assign date = project.start_date %} - {% include date.html %} - <br/> - {% endif %} - {% if project.end_date %} - until - {% assign date = project.end_date %} - {% include date.html %} - <br/> - {% endif %} - </p> - </li> - {% endfor %} - </ul> - {% endif %} -{% endfor %} diff --git a/_layouts/project.html b/_layouts/project.html index c31e8de..97c49cd 100644 --- a/_layouts/project.html +++ b/_layouts/project.html @@ -2,81 +2,91 @@ layout: default --- - <div class="row"> - <div class="col s12 m5 left"> - <div class="card"> - <div class="card-content"> - <span class="card-title">{{page.title}}</span> - {% if page.subtitle %}<h6>{{page.subtitle}}</h6>{% endif %} - - {% if page.homepage %} - <p> - <a href="{{page.url}}">{{page.homepage}}</a> - </p> - {% endif %} - - {% if page.start %} - <p> - <b>From:</b> - {% assign date = page.start %} - {% include date.html %} - - {% if page.end %} - <b>To:</b> - {% assign date = page.end %} - {% include date.html %} - {% endif %} - </p> - {% endif %} - - </div> - - <div class="card-tabs"> - <ul class="tabs tabs-fixed-width"> - {% if page.funding %} - <li class="tab"><a href="#funding">Funding</a></li> - {% endif %} - {% if page.people %} - <li class="tab"><a href="#people">People</a></li> - {% endif %} - {% if page.collaborators %} - <li class="tab"><a href="#collaborators">Collaborators</a></li> - {% endif %} - </ul> - </div> - <div class="card-content grey lighten-4"> - {% if page.funding %} - <div id="funding"> - 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 %} - </div> - {% endif %} - - {% if page.people %} - <div id="people"> - {% assign people = page.people | split: ',' %} + <div class="col s12 m5 left"> + <div class="card"> + <div class="card-content"> + <span class="card-title">{{page.title}}</span> + {% if page.subtitle %}<h6>{{page.subtitle}}</h6>{% endif %} + + {% if page.start_date %} + <p> + <b>From:</b> + {% assign date = page.start_date %} + {% include date.html %} + + {% if page.end_date %} + <br /> + <b>To:</b> + {% assign date = page.end_date %} + {% include date.html %} + {% endif %} + </p> + <hr /> + {% endif %} + + <!-- Funding etc --> + {% assign needs_break = false %} + + {% if page.funding %} + <b>Funding: </b> {{page.funding}} + <br /> + {% assign needs_break = true %} + {% endif %} + + {% if page.program %} + <b>Program: </b> {{page.program}} + <br /> + {% assign needs_break = true %} + {% endif %} + + {% if page.grantid %} + <b>Grant ID: </b> {{page.grantid}} + <br /> + {% assign needs_break = true %} + {% endif %} + + {% if needs_break %} + <hr /> + {% endif %} + + <!-- check if we need a break after this section --> + {% assign needs_break = false %} + + <!-- list all the people --> + {% for person in page.people %} + {% include people_chip.html %} <br /> + {% assign needs_break = true %} + {% endfor %} + + <!-- if we have collaborators, we need to have a break --> + {% if needs_break %} + {% assign needs_break = false %} + {% for person in page.collaborators %} + {% assign needs_break = true %} + {% endfor %} + {% if needs_break %} + <hr /> + {% endif %} + {% endif %} + + <!-- and print the collaborators --> + {% for person in page.collaborators %} + <div class="chip"> + {{person}} + </div> + <br /> + {% endfor %} + </div> - {% for person in people %} - {% include people_chip.html %} - {% endfor %} - </div> - {% endif %} - - {% if page.collaborators %} - <div id="collaborators"> - {{page.collaborators}} - </div> - {% endif %} - - - </div> + {% if page.website %} + <div class="card-action"> + <a target="_blank" href="{{ page.website }}">Website</a> + </div> + {% endif %} + </div> </div> - </div> <p> {{content}} </p> -</div> +</div \ No newline at end of file diff --git a/projects/FormalCAD.md b/projects/FormalCAD.md index b861545..d1adf62 100644 --- a/projects/FormalCAD.md +++ b/projects/FormalCAD.md @@ -1,16 +1,25 @@ --- layout: project -menu_title: FormalCAD + title: "FormalCAD: Formal Methods and Semantic Technologies for Engineering Design Processes" teaser: Towards a computer-supported, document-oriented process for systematic engineering design and a semantic help system for CAD systems. -start: 2012-04 -end: 2015-02 -people: mkohlhase,akohlhase,cjucovschi + +active: false +start_date: 2012-04 +end_date: 2015-02 + +people: + - mkohlhase + - akohlhase + - cjucovschi + +collaborators: + - Lutz Schröder, FAU Erlangen + funding: DFG program: Normalverfahren grantid: KO 2428/12-1 -collaborators: Lutz Schröder, FAU Erlangen. --- Systematic engineering design processes follow a series of standardized development stages that have many aspects in common with software engineering. In this analogy, CAD/CAM objects replace program code as the implementation stage of the development; however, other recognized development stages such as requirements or principle solutions are currently left largely informal and in fact are typically not laid down in machine-processable form at all. We propose to draw on the mentioned analogy and transfer methods from software engineering to engineering design in order to capture the full engineering design process formally and thus enhance in particular their reliability and reusability. We envision a document-oriented design process that integrates all stages of the development process from requirement specifications to CAD/CAM documents, and moreover incorporates background knowledge such as enterprise ontologies, industrial standards, and formalized geometric principles. In the FormalCAD project, we plan to develop the information architecture for such a process and support it with a tool that interfaces a CAD system with formal specification languages, ontology reasoners, and semantic document management systems, thus allowing for a comprehensive development methodology that supports completely formalized development strands, change and life-cycle management, as well as semantically interlinked semi-formal documents for documentation and certification. FormalCAD is a joint project with Prof. diff --git a/projects/README.md b/projects/README.md deleted file mode 100644 index 2857e48..0000000 --- a/projects/README.md +++ /dev/null @@ -1,21 +0,0 @@ -Technical directions on adding a project ------------------------------------------- - -To add a new project, create a file in this directory, taking the existing files as -examples. - -Each post needs some specific parameters: - - * **layout** use `project` or `software` - * **title** the title of the project - * **subtitle** (optional) a subtitle. It will be adjuncted to your title in the post - link and just under the title in the post page - * **teaser** (optional) a one-line description for the overview - * **people** (optional) the KWARC people involved in this - * **collaborators** (optional) the outside collaborators - * **start** (optional) the project start date - * **end** (optional) the project end date - * **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` - * **homepage** (optional): the project home page diff --git a/projects/current.md b/projects/current.md deleted file mode 100644 index 7b997c5..0000000 --- a/projects/current.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -layout: default -title: Current Projects -menu_title: Current -menu_order: 101 ---- -## Current Projects ([past projects](/projects/past/)) - -to be generated here. - - - - - - - diff --git a/projects/former.md b/projects/former.md deleted file mode 100644 index 37824b4..0000000 --- a/projects/former.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -layout: default -title: Past Projects -menu_title: Past -menu_order: 102 ---- -## Completed Projects ([current projects](/projects/current/)) - -{% assign projects = site.pages | where: "layout", "project" | where_exp: "project", "project.end != null" | sort: "start" %} -{% include projects_list.html %} - - - - - - - diff --git a/projects/index.html b/projects/index.html deleted file mode 100644 index 6039763..0000000 --- a/projects/index.html +++ /dev/null @@ -1,9 +0,0 @@ ---- -layout: default -title: KWARC Projects ---- - -<h2>Current Projects of the KWARC Group</h2> - -{% assign projects = site.pages | where: "layout", "project" | where_exp: "project", "project.end == null" | sort: "start" %} -{% include projects_list.html %} diff --git a/projects/jem.md b/projects/jem.md index 4c03f0f..389b33c 100644 --- a/projects/jem.md +++ b/projects/jem.md @@ -1,14 +1,21 @@ --- layout: project -menu_title: JEM -title: "JEM:JoiningEducationalMathematics" -start: 2006 -end: 2009 + +title: "JEM: JoiningEducationalMathematics" + +active: false +start_date: '2006' +end_date: '2009' + +people: + - mkohlhase + funding: EU program: eContentPlus Thematic Network -homepage: http://calc.mathstat.helsinki.fi/jem/en/about/ -people: mkohlhase + +website: http://calc.mathstat.helsinki.fi/jem/en/about/ --- + The network assembles leading developers of semantic web technologies for the representation of mathematics, mathematics content stakeholders and experienced distributors of software and eLearning solutions. diff --git a/projects/latin.md b/projects/latin.md index 5d04651..e1f66c7 100644 --- a/projects/latin.md +++ b/projects/latin.md @@ -1,14 +1,24 @@ --- layout: project -menu_title: LATIN + title: "LATIN: Logic Atlas & Integrator" -start: 2009 -end: 2012 + +active: false +start_date: '2009' +end_date: '2012' + +people: + - mkohlhase + - frabe + - fhorozal + - miancu + +collaborators: + - Till Mossakowski, DFKI Bremen + funding: DFG program: Normalverfahren grantid: KO 2428/9-1 -people: mkohlhase,frabe,fhorozal,miancu -collaborators: Till Mossakowski, DFKI Bremen --- LATIN aims at developing methods, techniques, and tools for interfacing logics and proof diff --git a/projects/logosphere.md b/projects/logosphere.md index e10aad8..83df700 100644 --- a/projects/logosphere.md +++ b/projects/logosphere.md @@ -1,14 +1,24 @@ --- layout: project -menu_title: Logosphere + title: "Logosphere: Formal Digital Libraries" -start: 2003 -end: 2006 + +active: false +start_date: '2003' +end_date: '2006' + +people: + - mkohlhase + +collaborators: + - Carsten Schürmann, Yale University + - Frank Pfenning, CMU + - Natarajan Shankar + - Sam Owre, SRI International + funding: NSF program: ITR grantid: CCR-ITR-0325808 -people: mkohlhase -collaborators: Carsten Schürmann (Yale University), Frank Pfenning (CMU) Natarajan Shankar, Sam Owre (SRI International) --- Mathematical knowledge is at the core of science and engineering. The quantity of mathematical knowledge is growing faster than our ability to formalize and organize it. The proposed research focuses on developing a Formal Digital Library called Logosphere, a common and open infrastructure for managing and sharing mathematical knowledge and formal proof. Central to this work is the design of a logical framework as a representation language for logical formalisms, individual theories, and proofs, with an interface to theorem proving systems such as PVS or HOL, that have been effective in industrial practice. Logosphere emphasizes interoperability between theorem proving systems, and the exchange and reusability of mathematical facts across different systems. The Logosphere infrastructure is designed to be scalable with respect to the size of the knowledge base as well as the diversity of formalisms. diff --git a/projects/mathsearch.md b/projects/mathsearch.md index b0ae78a..8dfdf6b 100644 --- a/projects/mathsearch.md +++ b/projects/mathsearch.md @@ -1,14 +1,21 @@ --- layout: project -menu_title: MathSearch + + title: "MathSearch: Analyse und Suche in mathematischen Formeln" teaser: Methods for information extraction and information retrieval for mathematical documents with the aim of providing semantically enhanced interaction for Zentralblatt Math and the arXiv. -start: 2012-03 -end: 2015-02 + +active: false +start_date: 2012-03 +end_date: 2015-02 + +people: + - mkohlhase + - dginev + funding: Leibniz Foundation program: SAW grantid: SAW-2012-FIZ_KA-2 -people: mkohlhase,dginev --- The MathSearch Project develops a semantic search engine for mathematics in collaboration @@ -17,6 +24,6 @@ with the [ZBMath Group](https://zbmath.org/about/) at [Leibniz Foundation](https://www.leibniz-gemeinschaft.de/) as SAW project AW-2012-FIZ_KA-2. -We have deployed an instance of [MathWebSearch](/projects/mws/) engine as part of the +We have deployed an instance of [MathWebSearch](/systems/mws/) engine as part of the [ZBMath Information System](http://zbmath.org) (see the "Formulae" tab there), and we have -started the [SMGloM](/projects/smglom/). +started the [SMGloM](/systems/smglom/). diff --git a/projects/meta/README.md b/projects/meta/README.md new file mode 100644 index 0000000..b8aa198 --- /dev/null +++ b/projects/meta/README.md @@ -0,0 +1,26 @@ +Technical directions on adding a project +------------------------------------------ + +To add a new system, create a file in this directory, taking the existing files as +examples. + +Each post needs some specific parameters: + + * **layout** use `project` + + * **title** the title of the project + * **teaser** (optional) a one-line description for the overview + + * **active** boolean indicating if the project is active + * **start_date** the system start date (YYYY[-MM]) + * **end_date** (optional) the system end date (YYYY[-MM]) + + * **people** (optional) a list of KWARC people involved in this + + * **collaborators** (optional) a list of non-KWARC people involved in this + + * **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` + + * **website** (optional): the project home page \ No newline at end of file diff --git a/projects/meta/completed.md b/projects/meta/completed.md new file mode 100644 index 0000000..e68dc19 --- /dev/null +++ b/projects/meta/completed.md @@ -0,0 +1,19 @@ +--- +layout: default +title: Completed Projects +permalink: /projects/completed/ +--- + +{% assign projects = site.pages | where: "layout", "project" | where: "active", false | sort: "start_date" %} + +<ul class="collection"> + {% for item in projects %} + {% include psitem.html %} + {% endfor %} +</ul> + + + + + + diff --git a/projects/meta/index.md b/projects/meta/index.md new file mode 100644 index 0000000..e7df6f2 --- /dev/null +++ b/projects/meta/index.md @@ -0,0 +1,13 @@ +--- +layout: default +title: Projects +permalink: /projects/ +--- + +{% assign projects = site.pages | where: "layout", "project" | where: "active", true | sort: "start_date" %} + +<ul class="collection"> + {% for item in projects %} + {% include psitem.html %} + {% endfor %} +</ul> diff --git a/projects/oaf.md b/projects/oaf.md index 291c1b8..a492f77 100644 --- a/projects/oaf.md +++ b/projects/oaf.md @@ -1,14 +1,21 @@ --- layout: project -menu_title: OAF + title: "OAF: An Open Archive for Formalizations" teaser: The OAF Project builds a theoretical framework for interoperability of theorem prover libraries and implements an information system that host and align multiple libraries in a joint semantic setting. -start: 2014 -end: 2018 + +active: true +start_date: '2014' +end_date: '2018' + +people: + - mkohlhase + - frabe + - dmueller + funding: DFG program: Normalverfahren grantid: KO 2428/13-1 -people: mkohlhase,frabe,dmueller --- OAF is a DFG-funded research project running from 2014-2017 and headed by Michael Kohlhase diff --git a/projects/odk.md b/projects/odk.md index 91b5107..d1827fd 100644 --- a/projects/odk.md +++ b/projects/odk.md @@ -1,13 +1,22 @@ --- layout: project + title: OpenDreamKit -start: 2015-09 -end: 2019-08 + +active: true +start_date: 2015-09 +end_date: 2019-08 + +people: + - mkohlhase + - frabe + - twiesing + funding: EU program: Research Infrastructure grantid: 676541 -homepage: http://opendreamkit.org -people: mkohlhase,frabe,twiesing + +website: http://opendreamkit.org --- OpenDreamKit is a Horizon 2020 European Research Infrastructure project (#676541) that diff --git a/projects/omoc.md b/projects/omoc.md index 03732ac..cef692f 100644 --- a/projects/omoc.md +++ b/projects/omoc.md @@ -1,15 +1,23 @@ --- layout: project -menu_title: OMOC + title: "OMoC: Ontology-based Management of Change" -start: 2008 -end: 2010 + +active: false +start_date: '2008' +end_date: '2010' + +people: + - mkohlhase + +collaborators: + - Dieter Hutter, DFKI Bremen + funding: DFG program: Normalverfahren grantid: KO 2428/8-1 -collaborators: Dieter Hutter, DFKI Bremen -people: mkohlhase --- + The OMOC project studies mechanisms for the Ontology-based Management of Change The idea is to manage dependencies in/between documents (given by document ontology). The target is collaborative editing of mathematical documents (Plugin to Version Control). diff --git a/projects/once-cs.md b/projects/once-cs.md index 4c091d2..432bb2a 100644 --- a/projects/once-cs.md +++ b/projects/once-cs.md @@ -1,12 +1,17 @@ --- layout: project -menu_title: ONCE-CS + title: "ONCE-CS: Open Network of Centres of Excellence in Complex Systems" -start: 2005 -end: 2008 + +active: false +start_date: '2005' +end_date: '2008' + +people: + - mkohlhase + funding: EU program: FET -people: mkohlhase --- The science of complex systems is crucial to FET and the economic success of Europe. But diff --git a/projects/openmath-tn.md b/projects/openmath-tn.md index f98684d..a979371 100644 --- a/projects/openmath-tn.md +++ b/projects/openmath-tn.md @@ -1,15 +1,22 @@ --- layout: project -menu_title: OpenMath TN + title: Thematic Netork "OpenMath" -start: 2001 -end: 2004 + +active: false +start_date: '2001' +end_date: '2004' + +people: + - mkohlhase + funding: EU program: IST Thematic Netork grantid: IST-2000-29719 -homepage: http://www.openmath.org/projects/thematic/ -people: mkohlhase + +website: http://www.openmath.org/projects/thematic/ --- + The OpenMath Thematic Network, was a European Union sponsored project with the following main activities: diff --git a/projects/sissi.md b/projects/sissi.md index 796581b..6c8b338 100644 --- a/projects/sissi.md +++ b/projects/sissi.md @@ -1,15 +1,24 @@ --- layout: project -menu_title: SiSsI + title: "SiSsI: Software Engineering for Spreadsheet Interaction" teaser: Methods and technologies to enhance spreadsheets semantically. -start: 2011-08 -end: 2013-07 + +active: false +start_date: 2011-08 +end_date: 2013-07 + +people: + - mkohlhase + - akohlhase + - cjucovschi + +collaborators: + - Dr. Dieter Hutter, DFKI Bremen + funding: DFG program: Normalverfahren grantid: KO 2428/10-1 -collaborators: Dr. Dieter Hutter, DFKI Bremen -people: mkohlhase,akohlhase,cjucovschi --- Spreadsheets have become very popular to analyze and visualize business and science data, -- GitLab