Merge branch 'expertise_for_people' into 'master'

Added a field for people's expertise on the contact page.

See merge request !6

data/contact.yaml

@@ -8,21 +8,22 @@ people: [
   {
     name: Dr. Pedro Gonnet,
     role: Project PI (CompSci),
-    affil: "School of Engineering & Computer Science, Durham University"
+    affil: "ECS, Durham University"
   },
   {
     name: Dr. Aidan Chalk,
-    role: "Developer (Parallelization, GPU)",
-    affil: "STFC Daresbury Laboratory, Warrington"
+    role: "Developer",
+    affil: "STFC Daresbury Laboratory"
   },
   {
     name: Mr. James S. Willis,
-    role: "Developer (Vectorization, MPI)",
+    role: "Developer",
     affil: "ICC, Durham University",
+    expertise: "Parallelization, Vectorization"
   },
   {
     name: Dr. Peter Draper,
-    role: "Developer (Parallelization, MPI, domain decomposition)",
+    role: "Developer",
     affil: "ICC, Durham University",
   },
   {
@@ -33,8 +34,8 @@ people: [
   },
   {
     name: Dr. Bert Vandenbroucke,
-    role: "Developer (Astrophysics, Hydrodynamics)",
-    affil: "School of Physics & Astronomy, Univeristy of St Andrews",
+    role: "Developer",
+    affil: "University of St Andrews",
     href: "http://www-star.st-and.ac.uk/~bv7/"
   },
   {

templates/contact.html

@@ -25,9 +25,12 @@
                         <a href="{{ person.href }}">{{ person.name }}</a>
                     {% else %}
                         {{ person.name }}
-                    {% endif %}
-                    {% if person.role %} | {{ person.role }}{% endif %}
-                    {% if person.affil %} | {{ person.affil }}{% endif %}
+		    {% endif %}
+		    {% if person.role %} | {{ person.role }}{% endif %}
+		    <ul>	
+		      <li> {% if person.affil %} {{ person.affil }}{% endif %} </li>
+		      {% if person.expertise %}<li> {{ person.expertise }}</li>{% endif %}
+		    </ul>
                 </li>
             {% endfor %}
             </ul>