diff --git a/_layouts/person.html b/_layouts/person.html index 2f32921adc5c142ccc5c6d28db1fc1264c5d94a6..941ae5fb68e365c709f5be3c22005b433c4452cc 100644 --- a/_layouts/person.html +++ b/_layouts/person.html @@ -1,29 +1,48 @@ --- -layout: page +layout: default menu: false --- -<div class="row"> - <div class="col-sm-12"> - <h3 class="text-muted">{{ page.position }}</h3> - </div> -</div> -<div class="row"> - <div class="col-sm-4"> - <div class="card"> - <img class="img-circle center-block" style="width: 60%; padding: 7pt" src="{{ page.image | prepend: site.baseurl }}" alt="Photo of {{ page.firstname }} {{ page.lastname }}" /> - <div class="list-group list-group-flush"> - {% if page.webpage %}<a class="list-group-item" href="{{ page.webpage }}"><i class="fa fa-fw fa-globe"></i> Webpage</a>{% endif %} - {% if page.email %}<a class="list-group-item" href="mailto:{{ page.email }}"><i class="fa fa-fw fa-envelope-o"></i> {{ page.email }}</a>{% endif %} - {% if page.twitter %}<a class="list-group-item" href="https://twitter.com/{{ page.twitter }}"><i class="fa fa-fw fa-twitter"></i> @{{ page.twitter }}</a>{% endif %} - {% if page.github %}<a class="list-group-item" href="https://github.com/{{ page.github }}"><i class="fa fa-fw fa-github"></i> GitHub Profile</a>{% endif %} +<article class="post"> + <header class="post-header"> + <div class="row"> + <div class="col-sm-12"> + <h2 class="post-title">{{ page.firstname }} {{ page.lastname }} + <small class="text-muted">{{ page.position }}</small></h2> </div> </div> - </div> - <div class="col-sm-8"> - <h3>About</h4> - {{ content }} + </header> + +{% comment %} Test that we have main content to show {% endcomment %} +{% capture bibliography %}{% bibliography -q @*[author ~= {{ page.lastname }}] %}{% endcapture %} +{% assign test_bib = bibliography | strip_html | strip_newlines %} +{% assign test = test_bib | append: content | strip_html | strip_newlines %} +{% if test == "" %}{% assign card-col-class = " col-md-offset-4" %}{% endif %} + + <div class="post-content"> + <div class="row"> + <div class="col-sm-4{{card-col-class}}"> + <div class="card"> + <img class="img-circle center-block" style="width: 60%; padding: 7pt" src="{{ page.image | prepend: site.baseurl }}" alt="Photo of {{ page.firstname }} {{ page.lastname }}" /> + <div class="list-group list-group-flush"> + {% if page.webpage %}<a class="list-group-item" href="{{ page.webpage }}"><i class="fa fa-fw fa-globe"></i> Webpage</a>{% endif %} + {% if page.email %}<a class="list-group-item" href="mailto:{{ page.email }}"><i class="fa fa-fw fa-envelope-o"></i> {{ page.email }}</a>{% endif %} + {% if page.twitter %}<a class="list-group-item" href="https://twitter.com/{{ page.twitter }}"><i class="fa fa-fw fa-twitter"></i> @{{ page.twitter }}</a>{% endif %} + {% if page.github %}<a class="list-group-item" href="https://github.com/{{ page.github }}"><i class="fa fa-fw fa-github"></i> GitHub Profile</a>{% endif %} + </div> + </div> + </div> - <h3>Group Publications</h4> - {% bibliography -q @*[author ~= {{ page.lastname }}] %} + {% if test != "" %} + <div class="col-sm-8"> + {{ content }} + + {% if test_bib != "" %} + <h3>Group Publications</h3> + {{ bibliography }} + {% endif %} + </div> + {% endif %} + + </div> </div> -</div> +</article> diff --git a/_people/da-rocha-pinto.md b/_people/da-rocha-pinto.md index e5e4851c5a6933154d591ce16459e5ac5c94a444..0135da9b5e3e2b734015601e86b17cc87e9260f8 100644 --- a/_people/da-rocha-pinto.md +++ b/_people/da-rocha-pinto.md @@ -1,5 +1,4 @@ --- -title: Pedro da Rocha Pinto firstname: Pedro lastname: da Rocha Pinto image: /images/pedro.jpg diff --git a/_people/gardner.md b/_people/gardner.md index afa8fbd1a83d578aa29ce0c32abb57545980a131..20a0e55ad1590ab86c977ff8d46124dd6d42333b 100644 --- a/_people/gardner.md +++ b/_people/gardner.md @@ -1,5 +1,4 @@ --- -title: Philippa Gardner firstname: Philippa lastname: Gardner image: /images/gardner.jpg diff --git a/_people/ntzik.md b/_people/ntzik.md index acdfb0d60abd1406f34385462bac8d6df919b0a3..25e1918385a6e2606a5fbad44bd070ad4b569a89 100644 --- a/_people/ntzik.md +++ b/_people/ntzik.md @@ -1,5 +1,4 @@ --- -title: Gian Ntzik firstname: Gian lastname: Ntzik image: /images/gian.jpg diff --git a/_people/raad.md b/_people/raad.md index 4de316d5c0a18e355de1688797035a6d78ea10ec..2c15d7e081a77356a903d30e0d20196a84cbbd5a 100644 --- a/_people/raad.md +++ b/_people/raad.md @@ -1,5 +1,4 @@ --- -title: Azalea Raad firstname: Azalea lastname: Raad image: /images/azalea.jpg diff --git a/_people/sutherland.md b/_people/sutherland.md index 010b30a4bbd59eacf511ed69f17b8172400912a5..ecd33c5c87edeaa7a9d906fad616b8e4180ef8da 100644 --- a/_people/sutherland.md +++ b/_people/sutherland.md @@ -1,5 +1,4 @@ --- -title: Julian Sutherland firstname: Julian lastname: Sutherland image: /images/julian.jpg diff --git a/_people/xiong.md b/_people/xiong.md index 9882fd204fef7ac269eea113ddea88ff0261bff0..2212be4ad0349889389576ca3f39492e4262fc1a 100644 --- a/_people/xiong.md +++ b/_people/xiong.md @@ -1,10 +1,9 @@ --- -title: Shale Xiong firstname: Shale lastname: Xiong image: /images/shale.jpg position: PhD Student -webpage: +webpage: http://www.doc.ic.ac.uk/~sx14/ email: shale.xiong14@imperial.ac.uk ---