Move speaker role into a partial

This commit is contained in:
Oliver Davies 2019-05-14 23:38:06 +01:00
parent 648823e6fb
commit 0a9dbce007
3 changed files with 7 additions and 6 deletions

View file

@ -9,9 +9,7 @@
<span class="tw-flex-1 tw-flex tw-flex-col tw-justify-center"> <span class="tw-flex-1 tw-flex tw-flex-col tw-justify-center">
<span class="tw-block tw-font-bold tw-text-xl tw-text-gray-900 group-hocus:tw-underline">{{ speaker.name }}</span> <span class="tw-block tw-font-bold tw-text-xl tw-text-gray-900 group-hocus:tw-underline">{{ speaker.name }}</span>
<span class="tw-block tw-text-gray-800"> <span class="tw-block tw-text-gray-800">
{{ speaker.role }} {% include 'speaker-role' with { speaker: speaker } %}
{%- if speaker.role and speaker.organisation %}, {% endif %}
{{ speaker.organisation }}
</span> </span>
</span> </span>
<span class="tw-w-24 md:tw-w-32 tw-mr-6"> <span class="tw-w-24 md:tw-w-32 tw-mr-6">

View file

@ -0,0 +1,3 @@
{{ speaker.role }}
{%- if speaker.role and speaker.organisation %}, {% endif %}
{{ speaker.organisation }}

View file

@ -30,9 +30,9 @@
{% endif %} {% endif %}
<div class="markup"> <div class="markup">
{% if page.organisation %} <div class="tw-font-bold tw-text-xl">
<b>Organisation</b>: {{ page.organisation }} {% include 'speaker-role' with { speaker: page } %}
{% endif %} </div>
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>