.gitignore

@@ -50,3 +50,8 @@ node_modules
 *.toc
 *.out
 *.nav
+auto
+
+# bundle
+.bundle
+vendor

.gitlab-ci.yml

@@ -36,6 +36,6 @@ deploy_staging:
     # build the website
     - bundle exec jekyll build -d _site
     # copy over all the files into the deployment folder
-    - cd _site && rsync -rv -e "ssh -p $SSH_DEPLOY_PORT" --checksum --exclude='Gemfile' --delete-excluded --delete ./ root@static.kwarc.info:/root/data --delete
+    - cd _site && rsync -rv -e "ssh -p $SSH_DEPLOY_PORT" --checksum --exclude='Gemfile' --delete-excluded --delete ./ root@deploy.kwarc.info:/root/data --delete
   only:
     - master
\ No newline at end of file

Gemfile

 source 'https://rubygems.org'
 gem 'github-pages', group: :jekyll_plugins
+
+gem "sprockets", "~> 3.7"
+gem "webrick", "~> 1.7"
+
+# Fix ffi version to fix the following bug:
+#   ffi-1.17.0-x86_64-linux-musl requires rubygems version >= 3.3.22, which is
+#   incompatible with the current version, 2.7.6.2
+gem "ffi", "< 1.17.0"

_config.yml

@@ -3,7 +3,7 @@ permalink:        /news/:year/:month/:day/:title/
 # Setup
 title:               KWARC
 tagline:             'Knowledge Adaptation and Reasoning for Content '
-description:         'The Research Group of the Professorship for Knowledge Representation and Processing at <a href="https://fau.de" class="black-text">FAU Erlangen-Nürnberg</a> - <a href="https://cs.fau.de" class="black-text">Computer Science</a> (previously <a href="https://jacobs-university.de/" class="black-text">Jacobs University</a>). '
+description:         'The Research Group of the Professorship for Knowledge Representation and Processing at <a href="https://fau.de" class="black-text">FAU Erlangen-Nürnberg</a> - <a href="https://cs.fau.de" class="black-text">Computer Science</a>. '
 url:                 https://kwarc.info
 baseurl:             ''
 paginate:            10
@@ -28,7 +28,7 @@ exclude:
 author:
   name:              'The KWARC Group'
   url:               http://kwarc.info
-  email:             kohlhase@kwarc.info
+  email:             michael.kohlhase@fau.de
 
 semesters:
     former:
@@ -64,15 +64,27 @@ semesters:
         - WS16/17
         - SS17
         - WS17/18
-    current: SS18
-    upcoming: WS18/19
+        - SS18
+        - WS18/19
+        - SS19
+        - WS19/20
+        - SS20
+        - WS20/21
+        - SS21
+        - WS21/22
+        - SS22
+        - WS22/23
+        - SS23 
+    current: WS24/25  
+    upcoming: SS25
 
 # Custom vars
 version:             0.3.0
-repository:          https://gl.kwarc.info/static/www.kwarc.info
+repository:          https://gl.kwarc.info/kwarc/kwarc.info/www
 tagfolder:           tag
 
 materialize:         materialize
+material-icons:      material-icons
 jquery:              jquery-3.2.1
 fontawesome:         font-awesome-4.7.0
 
@@ -161,6 +173,15 @@ roles:
     -
         id: bachelor-student
         name: "Bachelor Student"
+    -
+        id: support-staff
+        name: "Support Staff "
+
+        id: technical-staff
+        name: "Technical Staff "
+
+        id: administrator-staff
+        name: "Administrator Staff "
 
 
 # default values -- the one for all **must** be first

_includes/footer.html

@@ -21,7 +21,7 @@
       
       <div class="col l2 s12">
         <h5 class="white-text">Editing</h5>
-        <a href="{{site.repository}}/edit/master/{% if page.source %}{{ page.source }}{% else %}{{ page.path }}{% endif %}" title="Edit this page" class="waves-effect waves-teal btn-flat">
+        <a href="{{site.repository}}/-/edit/master/{% if page.source %}{{ page.source }}{% else %}{{ page.path }}{% endif %}" title="Edit this page" class="waves-effect waves-teal btn-flat">
           <i class="fa fa-pencil-square-o" aria-hidden="true"></i> Edit this page
         </a>
         <a href="{{site.repository}}/#repository-holding-the-sources-of-the-kwarcinfo-website"
@@ -34,11 +34,9 @@
   </div>
   <div class="footer-copyright">
     <div class="container">
-      &copy; 2017 The KWARC Group
-      <span class="right">
-        <a href="mailto:{{ site.author.email }}" title="E-Mail" class="black-text">
-          <i class="fa fa-envelope" aria-hidden="true"></i> Contact E-Mail
-        </a>
+      &copy; {{ site.time | date: '%Y' }} The KWARC Group
+      <span class="right legal-links">
+        <script src="https://privacy.kwarc.info/legal.js"></script>
       </span>
     </div>
   </div>

_includes/head.html

@@ -14,8 +14,8 @@
         {% endif %}
     </title>
     
-    <!--Import Google Icon Font -->
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+    <!-- Material CSS font -->
+    <link type="text/css" rel="stylesheet" href="{{ site.baseurl }}/public/{{ site.material-icons }}/font.css">
     
     <!-- Import materialize -->
     <link type="text/css" rel="stylesheet" href="{{ site.baseurl }}/public/{{ site.materialize }}/css/materialize.min.css"  media="screen,projection"/>

_includes/header.html

@@ -21,7 +21,7 @@
     <div class="userView">
       <a href="{{ site.baseurl }}/">
           <img src="{{ site.baseurl }}/public/kwarc_logo.svg" width="180px" height="180px" /> 
-          <img src="{{ site.baseurl }}/public/fau_logo.png" width="180px" height="37px" style="position: relative; left: 30px; "/>
+          <img src="{{ site.baseurl }}/public/fau_logo_hoch.svg" width="180px" style="position: relative; left: 30px; "/>
       </a>
     </div>
   </li>

_includes/people_list.html

@@ -14,7 +14,7 @@
             <h5>{{role.name}}(s)</h5></li>
             {% for person in rollers %}
                 <li class="collection-item avatar">
-                    <img src="/{{person.pic}}" alt="" class="circle"/>
+                    {% if person.pic %}<img src="/{{person.pic}}" alt="" class="circle"/>{% endif %}
                     <a href="{{person.url}}" class="title">{{person.fullname}}</a>
                     <p>
                       {% if person.start_date %}

_includes/project_chip.html

+{% comment %}
+    This page creates a single 'chip' for linking to a project. 
+    It expects the name of the project as the 'project' variable
+{% endcomment %}
+
+{% capture purl %}/projects/{{include.project}}/{% endcapture %}
+{% assign pp = site.pages | where: "url", purl | first %}
+
+{% if pp %}
+    <a href="{{ site.baseurl }}{{purl}}">
+        <div class="chip">
+            {% if pp.logo %}
+                <img src="{{ site.baseurl }}/{{pp.logo}}"/>
+            {% endif %}
+            {{pp.shorttitle}}
+        </div>
+    </a>
+{% else %}
+    <div class="chip">
+        {{include.project}}
+    </div>
+{% endif %}

_includes/psitem.html

@@ -4,7 +4,8 @@
 
 {% assign item = include.item %}
 
-<li class="collection-item">
+<li class="collection-item avatar">
+    {% if item.logo %} <img src="/{{item.logo}}" alt="{{item.title}} logo" class="circle" style="border-radius: 0;" /> {% endif %}
     <a href="{{item.url}}" class="title">{{item.title}}</a>
     {% if item.funding %} ({{item.funding}}) {% endif %}
     {% if item.orphan %}<b>(up for adoption)</b>{% endif %}
@@ -23,6 +24,15 @@
           <br />
         {% endif %}
 
+        {% if item.supported-by %}
+            <b>funded by</b>
+            
+            {% for project in item.supported-by %}
+                {% include project_chip.html project=project %}
+            {% endfor %}
+            <br />
+        {% endif %}
+
         {{item.teaser | safe}}
     </div>
 </li>

_includes/system_chip.html

+{% comment %}
+    This page creates a single 'chip' for linking to a system. 
+    It expects the name of the system as the 'system' variable
+{% endcomment %}
+
+{% capture surl %}/systems/{{include.system}}/{% endcapture %}
+{% assign sp = site.pages | where: "url", surl | first %}
+
+{% if sp %}
+    <a href="{{ site.baseurl }}{{surl}}">
+        <div class="chip">
+            {% if sp.logo %}
+                <img src="{{ site.baseurl }}/{{sp.logo}}"/>
+            {% endif %}
+            {{sp.shorttitle}}
+        </div>
+    </a>
+{% else %}
+    <div class="chip">
+        {{include.system}}
+    </div>
+{% endif %}

_layouts/default.html

+---
+layout: compress
+---
+
 {% assign sorted_pages = site.pages | sort: "menu_order" %}
 
 <!DOCTYPE html>

_layouts/person.html

@@ -2,12 +2,16 @@
 layout: default
 ---
 
+{% assign username = page.url | replace: '/people/', '' | replace: '/', '' %}
+
 <div class="row">
     
     <div class="col s12 m5 right">
         <div class="card">
             <div class="card-image">
-                <img src="/{{page.pic}}" width="300"/>
+                {% if page.pic %}
+                    <img src="/{{page.pic}}" width="{% if page.picwidth %}{{ page.picwidth }}{% else %}300{% endif %}" {% if page.picwidth %}class="picwidth"{% endif %} />
+                {% endif %}
             </div>
             <div class="card-content">
                 <span class="card-title">{{ page.fullname }}</span>
@@ -17,9 +21,9 @@ layout: default
                 {% assign role = site.roles | where: "id", page.role %}
                 {% assign role = role[0] %}
                 
-                {{role.name}}
+                {{role.name}}, 
                 {% if page.start_date %}
-                    <br />
+                    KWARCie
                     {% unless page.end_date %}
                         since
                     {% endunless %}
@@ -37,17 +41,80 @@ layout: default
                     {{ page.affiliation }}
                 {% endif %}
             </div>
+
             <div class="card-action">
+                {% if page.publink == "auto" %}
+                <a href="http://kwarc.github.io/bibs/{{username}}/">
+		  <img style="width:70px;height:70px" src="/public/pubs.jpg" title="Publications"/>
+		</a>
+                {% elsif page.publink %}
+                <a href="{{page.publink}}">
+		  <img style="width:70px;height:70px" src="/public/pubs.jpg" title="Publications"/>
+		</a>
+                {% endif %}
                 {% if page.website %}
-                <a target="_blank" href="{{page.website}}">Website</a>
-                &nbsp;
+                <a target="_blank" href="{{page.website}}">
+		  <img style="width:50px;height:50px" src="/public/www.jpg" title="Website"/>
+		</a>
+                {% endif %}
+                {% if page.orcid %}
+                <a target="_blank" href="http://orcid.org/{{page.orcid}}">
+		  <img style="width:50px;height:50px" src="/public/orcid.png" title="ORCID"/>
+		</a>
+                {% endif %}
+                {% if page.dblp %}
+                <a target="_blank" href="https://dblp.uni-trier.de/pers/hd/{{page.dblp}}">
+		  <img style="width:50px;height:50px" src="/public/dblp.png" title="DBLP"/>
+		</a>
+                {% endif %}
+                {% if page.zbmath %}
+                <a target="_blank"
+		   href="https://zbmath.org/authors/?q=ai:{{page.zbmath}}">
+		  <img style="width:50px;height:50px" src="/public/zbmath.png" title="zbMATH"/>
+		</a>
                 {% endif %}
+                {% if page.researchgate %}
+                <a target="_blank"
+		   href="https://www.researchgate.net/profile/{{page.researchgate}}">
+		  <img style="width:50px;height:50px" src="/public/researchgate.jpg" title="ResearchGate"/>
+		</a>
+                {% endif %}
+                {% if page.github %}
+                <a target="_blank" href="http://github.com/{{page.github}}">
+		  <img style="width:50px;height:50px" src="/public/github.png" title="GitHub"/>
+		</a>
+                {% endif %}
+                {% if page.gitlab %}
+                <a target="_blank" href="http://gitlab.com/{{page.gitlab}}">
+		  <img style="width:50px;height:50px" src="/public/gitlab.png" title="GitLab"/>
+		</a>
+                {% endif %}
+                {% if page.mathhub %}
+                <a target="_blank" href="http://gl.mathhub.info/{{page.mathhub}}">
+		  <img style="width:50px;height:50px" src="/public/mathHubLogo.png" title="MathHub"/>
+		</a>
+                {% endif %}
+              <!-- Projects -->
+                {% assign projects = site.pages | where: "layout", "project" | where: "active", true %}
+		{% if projects %}<hr />{% endif %}
+                {% for project in projects %}
+                    {% if project.people contains username %}
+                        {% assign pid = project.url | replace: '/projects/', '' | replace: '/', '' %}
+                        {% include project_chip.html project=pid %}
+                    {% endif %}
+                {% endfor %}
 
-                {% if page.publink == "auto" %}
-                  <a href="http://kwarc.github.io/bibs/{{ page.url | replace: '/people/', '' | replace: '/', '' }}/">Publications</a>
-                {% elsif page.publink %}
-                  <a href="{{page.publink}}">Publications</a>
+                <!-- Systems -->
+                {% assign systems = site.pages | where: "layout", "system" %}
+		{% if systems %}<hr />{% endif %}
+                {% for system in systems %}
+                    {% unless system.end_date %}
+                        {% if system.people contains username %}
+                            {% assign sid = system.url | replace: '/systems/', '' | replace: '/', '' %}
+                            {% include system_chip.html system=sid %}
                         {% endif %}
+                    {% endunless %}
+                {% endfor %}
             </div>
         </div>
         

_layouts/project.html

@@ -2,9 +2,16 @@
 layout: default
 ---
 
+{% assign id = page.url | replace: '/projects/', '' | replace: '/', '' %}
+
 <div class="row">
     <div class="col s12 m5 right">
         <div class="card">
+            {% if page.logo %}
+                <div class="card-image">
+                    <img src="/{{page.logo}}" width="300"/>
+                </div>
+            {% endif %}
             <div class="card-content">
                 <span class="card-title">{{page.title}}</span>
                 {% if page.subtitle %}<h6>{{page.subtitle}}</h6>{% endif %}
@@ -76,6 +83,18 @@ layout: default
                     </div>
                     <br />
                 {% endfor %}
+
+                <!-- and list the systems it supports -->
+                <hr />
+                <b>Funds: </b>
+                {% assign systems = site.pages | where: "layout", "system" %}
+                {% for system in systems %}
+                        {% if system.supported-by contains id %}
+                            {% assign sid = system.url | replace: '/systems/', '' | replace: '/', '' %}
+                            {% include system_chip.html system=sid %}
+                        {% endif %}
+                {% endfor %}
+
             </div>
             {% assign hasaction = false %}
             

_layouts/system.html

@@ -5,11 +5,18 @@ layout: default
 <div class="row">
     <div class="col s12 m5 right">
         <div class="card">
+            {% if page.logo %}
+                <div class="card-image">
+                    <img src="/{{page.logo}}" width="300"/>
+                </div>
+            {% endif %}
             <div class="card-content">
                 <span class="card-title">{{page.title}}</span>
                 {% if page.subtitle %}<h6>{{page.subtitle}}</h6>{% endif %}
                 {% if page.teaser %}<h6>{{page.teaser}}</h6>{% endif %}
                 
+                <hr />
+                
                 {% if page.start_date %}
                     <p>
                         <b>Start:</b>
@@ -38,6 +45,15 @@ layout: default
                 {% for person in page.people %}
                   {% include people_chip.html person=person %}
                 {% endfor %}
+
+                {% if page.supported-by %}
+                  <hr />
+                    <b>Funded by: </b>
+
+                    {% for project in page.supported-by %}
+                        {% include project_chip.html project=project %}
+                    {% endfor %}
+                {% endif %}
             </div>
             {% assign hasaction = false %}
             
@@ -56,13 +72,6 @@ layout: default
                         <a target="_blank" href="{{ page.repository }}">Repository</a>
                         &nbsp;
                     {% endif %}
-                    {% if page.supported-by %}
-		       <br/>funded by:
-		       {% for project in page.supported-by %}
-                         <a target="_blank" href="/projects/{{project}}">{{project}}</a>
-		       {% endfor %}
-                        &nbsp;
-                    {% endif %}
                     {% if page.publink == "auto" %}
                       <a href="http://kwarc.github.io/bibs/{{ page.url | replace: '/projects/', '' | replace: '/', '' }}/">Publications</a>
                     {% elsif page.publink %}

_posts/2017-09-01-tom.md

+---
+layout: post
+author: mkohlhase
+title: "New KWARC Ph.D. Student:Tom Wiesing"
+tags: 
+   - Announcements
+---
+We are happy to welcome [Tom Wiesing](/people/twiesing) to the KWARC group as a new Ph.D. student.
+Jonas received his Master's degree in Computer Science from Jacobs University Bremen; supervised by the KWARC group. He will be working on the [OpenDreamKit Project](/projects/odk) on the [MathHub Portal](http://mathhub.info).

_posts/2018-06-01-jonas.md

+---
+layout: post
+author: mkohlhase
+title: "New KWARC Ph.D. Student: Jonas Betzendahl"
+tags: 
+   - Announcements
+---
+We are happy to welcome [Jonas Betzendahl](/people/jbetzendahl) to the KWARC group as a new Ph.D. student.
+Jonas received his Master's degrees in Computer Science from the University of Bielefeld; supervised by the KWARC group. He will be working on the [OAF Project](/projects/OAF) on reasoning with undefinedness. 

_posts/2018-09-01-max_rapp.md

+---
+layout: post
+author: mkohlhase
+title: "New KWARC Ph.D. Student: Max Rapp"
+tags: 
+   - Announcements
+---
+We are happy to welcome [Max Rapp](https://kwarc.info/people/mrapp) to the KWARC group as a new Ph.D. student. Dennis received a Masters degree in Mathematics from Freiburg University and will be working on the [OAF Project](http://kwarc.info/projects/OAF), initially importing the PVS library into MathHub.

_posts/2018-11-01-postdocs.md

+---
+layout: post
+author: mkohlhase
+title: "Two new KWARC PostDocs"
+tags: 
+   - Announcements
+---
+We are happy to welcome two new postdoctoral researchers to the KWARC group:  [Katja Berčič](/people/kbercic) and [Chenwei Shi](/people/cshi).
+
+Katja received her Ph.D. in mathematics from the University of Ljubljana in 2015 and will be working on the [OpenDreamKit Project](http://opendreamkit.org), mostly on extending [MathHub.info](http://mathhub.info) with a generic mathematical data aspect. 
+
+Chenwei received his Ph.D. in Logic at the University of Amsterdam in 2018 and will be working on the [ALMANAC](/projects/almanac) project.

_posts/2018-12-18-MMTVersion.md

+---
+layout: post
+author: dmueller
+title: "New MMT Version (15.0.0) Released"
+tags: 
+   - Announcements
+---
+A new [MMT Version (15.0.0)](https://github.com/UniFormal/MMT/releases/tag/v15.0.0) has been released.