From 1740cde98bf32b38bf8cdb36b116ad3f01014fb1 Mon Sep 17 00:00:00 2001
From: Tom Wiesing <tkw01536@gmail.com>
Date: Fri, 6 Apr 2018 06:38:28 +0200
Subject: [PATCH] Reference Projects from Systems and vice-versa

---
 _includes/psitem.html | 11 ++++++++++-
 _layouts/project.html | 14 ++++++++++++++
 _layouts/system.html  | 18 +++++++++++-------
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/_includes/psitem.html b/_includes/psitem.html
index 5fd7022..f7438f9 100644
--- a/_includes/psitem.html
+++ b/_includes/psitem.html
@@ -22,7 +22,16 @@
           {% endif %}
           <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>
diff --git a/_layouts/project.html b/_layouts/project.html
index cd5894b..a5f951f 100644
--- a/_layouts/project.html
+++ b/_layouts/project.html
@@ -2,6 +2,8 @@
 layout: default
 ---
 
+{% assign id = page.url | replace: '/projects/', '' | replace: '/', '' %}
+
 <div class="row">
     <div class="col s12 m5 right">
         <div class="card">
@@ -81,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 %}
             
diff --git a/_layouts/system.html b/_layouts/system.html
index 5fbff6f..2b89166 100644
--- a/_layouts/system.html
+++ b/_layouts/system.html
@@ -15,6 +15,8 @@ layout: default
                 {% 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>
@@ -43,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 %}
             
@@ -61,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 %}
-- 
GitLab