diff --git a/scipost_django/colleges/templates/colleges/_hx_nomination_li_contents.html b/scipost_django/colleges/templates/colleges/_hx_nomination_li_contents.html index 7a11578aaf220b02bf59a9eb1dc8d85cf6606140..216193a4d8a25dfc0df2e00150e1402aa77dd1fd 100644 --- a/scipost_django/colleges/templates/colleges/_hx_nomination_li_contents.html +++ b/scipost_django/colleges/templates/colleges/_hx_nomination_li_contents.html @@ -145,17 +145,18 @@ </summary> <div class="card-body"> <div class="row mb-0"> - <div class="col-auto"> - <div class="mb-4"> + <div class="col-auto d-flex flex-column justify-content-between"> + <div> + <h3>Checklist</h3> + {% include "colleges/_nominations_invitation_checklist.html" with invitation=nomination.invitation %} + </div> + + <div> <h3>Invitation status</h3> <div class="fs-6 badge bg-{{ nomination.invitation.get_response_color }}"> {{ nomination.invitation.get_response_display }} </div> </div> - <div> - <h3>Checklist</h3> - {% include "colleges/_nominations_invitation_checklist.html" with invitation=nomination.invitation %} - </div> </div> <div class="col-12 col-md p-2"> diff --git a/scipost_django/colleges/templates/colleges/_nominations_invitation_checklist.html b/scipost_django/colleges/templates/colleges/_nominations_invitation_checklist.html index 20e752af4aab24394ea17577cd129adff0a8527d..84d0a2f937959aab8ec43ecb2b142787d77eb36a 100644 --- a/scipost_django/colleges/templates/colleges/_nominations_invitation_checklist.html +++ b/scipost_django/colleges/templates/colleges/_nominations_invitation_checklist.html @@ -1,31 +1,48 @@ <div class="p-2"> - <ul class="mb-0"> + <ul class="mb-0 list-group list-group-flush"> - {% if not invitation.nomination.profile.contributor %} + <li class="list-group-item p-2"> - <li class="text-danger">N.B.: this nominee is not yet registered as a Contributor</li> + {% if not invitation.nomination.profile.contributor %} + <span class="text-danger">{% include 'bi/x-square-fill.html' %}</span> + <span> This nominee is not yet registered as a Contributor.</span> + {% else %} + <span class="text-success">{% include 'bi/check-square-fill.html' %}</span> + <span> This nominee has a Contributor account.</span> + {% endif %} - {% else %} + </li> - <li> - <span class="text-success">{% include 'bi/check-square-fill.html' %}</span> This nominee has a Contributor account - </li> + <li class="list-group-item p-2"> - {% endif %} + {% if invitation.response == 'notyetinvited' %} + <span class="text-danger">{% include 'bi/x-square-fill.html' %}</span> + <span> This nominee is elected, but not yet invited.</span> + <a class="btn btn-sm btn-primary" + href="{% url 'colleges:fellowship_invitation_email_initial' pk=invitation.id %}">Invite</a> + {% else %} + <span class="text-success">{% include 'bi/check-square-fill.html' %}</span> + <span> This nominee has been invited to serve as a Fellow.</span> + {% endif %} - {% if selected == 'notyetinvited' %} + </li> - <li class="text-danger">This nominee is elected, but not yet invited.</li> - <a class="btn btn-primary" - href="{% url 'colleges:fellowship_invitation_email_initial' pk=invitation.id %}">Invite nominee</a> - {% elif selected == 'accepted' %} + {% if invitation.response == 'accepted' or invitation.response == 'postponed' %} + <li class="list-group-item p-2"> - <li> - Accepted to serve as Fellow but not currently active in a College? <a href="{% url 'colleges:fellowship_create' contributor_id=invitation.nomination.profile.contributor.id %}" - target="_blank">Set up a Fellowship</a> - </li> + {% if invitation.nomination.fellowship %} + <span class="text-danger">{% include 'bi/x-square-fill.html' %}</span> + <span> This nominee has no associated Fellowship with this college.</span> + <a href="{% url 'colleges:fellowship_create' contributor_id=invitation.nomination.profile.contributor.id %}" + target="_blank">Set up a Fellowship</a> + {% else %} + <span class="text-success">{% include 'bi/check-square-fill.html' %}</span> + <span> A fellowship has been created from this nomination.</span> + {% endif %} + + </li> {% endif %} </ul>