From 55e9179df75af32279e3f542e8a3ee26807cda0d Mon Sep 17 00:00:00 2001 From: Jorran de Wit <jorrandewit@outlook.com> Date: Wed, 1 Nov 2017 10:36:39 +0100 Subject: [PATCH] Add fellows to issue detail page --- journals/templates/journals/journal_issues.html | 2 +- .../templates/partials/proceedings/description.html | 9 +++++++++ .../templates/partials/proceedings/proceedings_li.html | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 proceedings/templates/partials/proceedings/proceedings_li.html diff --git a/journals/templates/journals/journal_issues.html b/journals/templates/journals/journal_issues.html index d74a86cc6..601a8c550 100644 --- a/journals/templates/journals/journal_issues.html +++ b/journals/templates/journals/journal_issues.html @@ -22,7 +22,7 @@ <li> <a href="{{issue.get_absolute_url}}">{{issue}}</a> {% if issue.proceedings %} - <div class="pl-4 mb-1">Submission deadline: {{ issue.proceedings.submissions_deadline }}</div> + {% include 'partials/proceedings/proceedings_li.html' with proceedings=issue.proceedings %} {% endif %} </li> {% empty %} diff --git a/proceedings/templates/partials/proceedings/description.html b/proceedings/templates/partials/proceedings/description.html index 53f83352b..33f723715 100644 --- a/proceedings/templates/partials/proceedings/description.html +++ b/proceedings/templates/partials/proceedings/description.html @@ -9,3 +9,12 @@ {% endif %} </div> <p>{{ proceedings.event_description|linebreaksbr }}</p> + +{% if proceedings.fellowships.guests.exists %} + <h3>Guest Fellows</h3> + <ul> + {% for fellow in proceedings.fellowships.guests %} + <li>{{ fellow.contributor.get_title_display }} {{ fellow.contributor.user.first_name }} {{ fellow.contributor.user.last_name }}{% if fellow.contributor.affiliation %}, {{ fellow.contributor.affiliation }}{% endif %}</li> + {% endfor %} + </ul> +{% endif %} diff --git a/proceedings/templates/partials/proceedings/proceedings_li.html b/proceedings/templates/partials/proceedings/proceedings_li.html new file mode 100644 index 000000000..7782f745c --- /dev/null +++ b/proceedings/templates/partials/proceedings/proceedings_li.html @@ -0,0 +1,4 @@ +<div class="pl-4 mb-1"> + {{ proceedings.event_name }} {% if proceedings.event_suffix %}({{ proceedings.event_suffix }}){% endif %}<br> + Submission deadline: {{ proceedings.submissions_deadline }} +</div> -- GitLab