Simplify group attributes on people, some layout changes.

neicnordic · Mar 1, 2017 · ae30c9f · ae30c9f
1 parent 731dc2c
commit ae30c9f
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 30 deletions.
diff --git a/_includes/person.html b/_includes/person.html
@@ -13,7 +13,7 @@ <h2>
             <h3>
                 <div class="lowlight">
                     <div>
-                        {{ page.affiliation }}
+                        {{ page.home }}
                     </div>
                 </div>
             </h3>

diff --git a/_includes/project.html b/_includes/project.html
@@ -17,7 +17,7 @@ <h3>{{ group.name }}</h3>
                 <li>
                   <a href="{{ site.baseurl }}{{ person.url }}">{{ person.name }}</a>
                   {% if person_group[1].role %}
-                    ({{ person_group[1].role }})
+                    - {{ person_group[1].role }}
                   {% endif %}
                 </li>
               {% endif %}

diff --git a/_people/abdulrahman-azab.md b/_people/abdulrahman-azab.md
@@ -2,15 +2,14 @@
 layout: master
 include: person
 name: Abdulrahman Azab
-home: USIT
+home: <a href="https://www.usit.uio.no/">USIT</a>
 country: NO
 photo: assets/img/people/abdulrahman-azab.jpg
 email: [email protected]
 phone:
 groups:
   staff:
   tryggve:
-    role: Expert
 ---
 
 Abdulrahman Azab, a head Engineer at the Department of Informatics, University

diff --git a/_people/antti-pursula.md b/_people/antti-pursula.md
@@ -2,26 +2,17 @@
 layout: master
 include: person
 name: Antti Pursula
-home: CSC
+home: <a href="https://csc.fi">CSC</a>
 country: FI
 photo: assets/img/people/antti-pursula.jpg
 email: [email protected]
 phone:
 groups:
   staff:
-    role: Tryggve project leader
   tryggve:
-    home: <a href="https://neic.nordforsk.org">NeIC</a>
     role: Project leader
-    display_order: 1
   tryggve-rg:
-    home: <a href="https://neic.nordforsk.org">NeIC</a>
     role: Project leader, Chair
-    display_order: 1
-  tryggve-sg:
-    home: <a href="https://neic.nordforsk.org">NeIC</a>
-    role: Project leader, Observer
-    display_order: 200
 ---
 
 Antti Pursula is located at CSC - IT Center for Science Ltd in Finland and holds

diff --git a/_people/bengt-persson.md b/_people/bengt-persson.md
@@ -2,12 +2,12 @@
 layout: master
 include: person
 name: Bengt Persson
-home: NBIS
+home: <a href="https://nbis.se/">NBIS</a>
 country: SE
 photo:
 email: [email protected]
 phone:
 groups:
   tryggve-sg:
-    home: <a href="https://nbis.se/">ELIXIR-SE</a>
+    role: <a href="https://nbis.se/">ELIXIR-SE</a>
 ---
diff --git a/_people/inge-jonassen.md b/_people/inge-jonassen.md
@@ -2,12 +2,12 @@
 layout: master
 include: person
 name: Inge Jonassen
-home: UiB
+home: <a href="http://www.uib.no/">UiB</a>
 country: NO
 photo:
 email: [email protected]
 phone:
 groups:
   tryggve-sg:
-    home: <a href="http://www.bioinfo.no/elixir">ELIXIR-NO</a>
+    role: <a href="http://www.bioinfo.no/elixir">ELIXIR-NO</a>
 ---
diff --git a/_people/joel-hedlund.md b/_people/joel-hedlund.md
@@ -2,27 +2,22 @@
 layout: master
 include: person
 name: Joel Hedlund
+role: Senior advisor
 home: NSC
 country: SE
 photo: assets/img/people/joel-hedlund.jpg
 email: [email protected]
 phone: "M: +46 734 607126"
 groups:
   staff:
-    role: Senior advisor
   tryggve-sg:
-    role: Chair
-    home: <a href="https://neic.nordforsk.org">NeIC</a>
-    display_order: 1
+    role: <a href="https://neic.nordforsk.org">NeIC</a>, Chair
   xt:
     role: Senior advisor
   neic2017-pc:
     role: Chair
-    display_order: 1
   bdi-sg:
-    role: Chair
-    home: <a href="https://neic.nordforsk.org">NeIC</a>
-    display_order: 1
+    role: <a href="https://neic.nordforsk.org">NeIC</a>, Chair
 ---
 
 Joel Hedlund is located at the  [National Supercomputer Centre

diff --git a/_people/peter-longreen.md b/_people/peter-longreen.md
@@ -2,12 +2,12 @@
 layout: master
 include: person
 name: Peter Løngreen
-home: CBS
+home: <a href="http://www.cbs.dtu.dk/">CBS</a>
 country: DK
 photo:
 email: [email protected]
 phone:
 groups:
   tryggve-sg:
-    home: <a href="http://elixir-node.cbs.dtu.dk/">ELIXIR-DK</a>
+    role: <a href="http://elixir-node.cbs.dtu.dk/">ELIXIR-DK</a>
 ---
diff --git a/_people/tommi-nyronen.md b/_people/tommi-nyronen.md
@@ -2,12 +2,12 @@
 layout: master
 include: person
 name: Tommi Nyrönen
-home: CSC
+home: <a href="https://csc.fi">CSC</a>
 country: FI
 photo:
 email: [email protected]
 phone:
 groups:
   tryggve-sg:
-    home: <a href="http://www.elixir-finland.org/">ELIXIR-FI</a>
+    role: <a href="http://www.elixir-finland.org/">ELIXIR-FI</a>
 ---
diff --git a/_projects/tryggve.md b/_projects/tryggve.md
@@ -5,6 +5,8 @@ name: Tryggve
 groups:
   - name: Team
     suffix: ''
+  - name: Reference group
+    suffix: '-rg'
   - name: Steering group
     suffix: '-sg'
 ---
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ <h2> @@
                 <h3>
                     <div class="lowlight">
                         <div>
-                            {{ page.affiliation }}
+                            {{ page.home }}
                         </div>
                     </div>
                 </h3>
@@ Expand Down @@