SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit d2152ff8 authored by George Katsikas's avatar George Katsikas :goat:
Browse files

beautify nominations round details summary

parent 2d7ec453
No related branches found
No related tags found
1 merge request!58[Fellowship Nominations] Rework the fellowship nomination system and UI
Hide whitespace changes
Inline Side-by-side
scipost_django/colleges/templates/colleges/_hx_nomination_details.html
+ 1
− 2
View file @ d2152ff8
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<div id="nomination-{{ nomination.id }}-details-contents" <div id="nomination-{{ nomination.id }}-details-contents"
class="p-2 mt-2 bg-white" class="p-2 mt-2 bg-white"
hx-get="{% url 'colleges:_hx_nomination_li_contents' nomination_id=nomination.id %}" hx-get="{% url 'colleges:_hx_nomination_li_contents' nomination_id=nomination.id %}"
hx-trigger="toggle once from:#nomination-{{ nomination.id }}-details" hx-trigger="toggle once from:#nomination-{{ nomination.id }}-details"></div>
hx-indicator="#indicator-nomination-{{ nomination.id }}-details-contents"></div>
</details> </details>
scipost_django/colleges/templates/colleges/_hx_nomination_summary.html
+ 24
− 31
View file @ d2152ff8
<div class="row mb-0 w-100"> <div class="row mb-0">
<div class="col-12 col-md">
<div class="col-12 col-sm"> <div class="row">
<div class="fs-6">{{ nomination.profile }}</div>
<div class="d-none d-md-block">(click for details)</div> <div class="col">
</div> <div class="fs-6">{{ nomination.profile }}</div>
<div class="d-none d-md-block">(click for details)</div>
{% with nomination.latest_voting_round as round %}
<div class="col-12 col-sm-auto">
<div>
<span>Editorial College:</span><span>&emsp;{{ nomination.college.name }}</span>
</div> </div>
<div>
<span>Voting started:</span><span>&emsp;{{ round.voting_opens|date:"Y-m-d" }}</span> <div class="col-auto">
<div class="row justify-content-between">
<small class="col text-muted text-nowrap">Editorial college</small>
<div class="col-auto">{{ nomination.college.name }}</div>
</div>
</div> </div>
</div>
<div class="col-12 col-sm-auto"> </div>
<div> </div>
<span>Decision:</span>
{% if round.decision.outcome == "elected" %} <div class="col col-md-6 col-lg-5">
<span class="badge bg-success">{{ round.decision.get_outcome_display }}</span>
{% elif round.decision.outcome == "notelected" %}
<span class="badge bg-danger">{{ round.decision.get_outcome_display }}</span>
{% else %}
<span class="badge bg-warning">Pending</span>
{% endif %}
{% if nomination.latest_voting_round %}
{% include "colleges/_hx_voting_round_summary.html" with round=nomination.latest_voting_round %}
{% else %}
<div class="h-100 d-flex align-items-center justify-content-center">
<div class="badge bg-danger fs-6">No rounds created yet</div>
</div> </div>
{% endif %}
</div>
<div>
<span>Deadline:&nbsp;</span><span>{{ round.voting_deadline|date:"Y-m-d" }}</span>
</div>
</div>
{% endwith %}
</div> </div>
scipost_django/colleges/templates/colleges/_hx_nomination_voting_rounds_tab.html
+ 2
− 2
View file @ d2152ff8
...@@ -19,12 +19,12 @@ ...@@ -19,12 +19,12 @@
{% if voting_round.voting_opens and voting_round.voting_deadline %} {% if voting_round.voting_opens and voting_round.voting_deadline %}
<small>{{ voting_round.voting_opens|date:"d M Y" }} - {{ voting_round.voting_deadline|date:"d M Y" }}</small> <small>{{ voting_round.voting_opens|date:"d M Y" }} - {{ voting_round.voting_deadline|date:"d M Y" }}</small>
{% else %} {% else %}
<span class="badge bg-danger">Uncheduled</span> <span class="badge bg-warning">Unscheduled</span>
{% endif %} {% endif %}
<span class="d-flex justify-content-between align-items-center"> <span class="d-flex justify-content-between align-items-center">
<span>Round #{{ forloop.revcounter }}</span> <span>Round #{{ forloop.revcounter }}</span>
{% if voting_round.is_scheduled %} {% if voting_round.is_scheduled %}
<span class="badge bg-warning">Scheduled</span> <span class="badge bg-primary">Scheduled</span>
{% elif voting_round.is_open %} {% elif voting_round.is_open %}
<span class="badge bg-success">Open</span> <span class="badge bg-success">Open</span>
{% endif %} {% endif %}
......
scipost_django/colleges/templates/colleges/_hx_voting_round_summary.html
+ 82
− 22
View file @ d2152ff8
<div class="row mb-0 w-100"> <div class="row mb-0">
<div class="col-12 col-sm"> {% if not round.is_unscheduled %}
<div class="fs-6">{{ round.nomination.profile }}</div> <div class="order-1 col-12 col-sm-6 col-md-12 col-xl-7">
<div class="d-none d-md-block">(click for details)</div> <div class="row justify-content-between">
</div> <small class="col text-muted text-nowrap">Voting opens</small>
<div class="col-auto">
{% if round.is_open %}
{{ round.voting_opens|timesince }} ago
{% else %}
{{ round.voting_opens|date:"Y-m-d" }}
{% endif %}
</div>
</div>
</div>
<div class="order-2 order-sm-3 order-md-2 order-xl-3 col-12 col-sm-6 col-md-12 col-xl-7">
<div class="row justify-content-between">
<small class="col text-muted text-nowrap">Voting deadline</small>
<div class="col-auto">
<div class="col-12 col-sm-auto"> {% if round.is_open %}
<div> In {{ round.voting_deadline|timeuntil }}
<span>Editorial College:</span><span>&emsp;{{ round.nomination.college.name }}</span> {% else %}
{{ round.voting_deadline|date:"Y-m-d" }}
{% endif %}
</div>
</div>
</div> </div>
<div> {% else %}
<span>Voting started:</span><span>&emsp;{{ round.voting_opens|date:"Y-m-d" }}</span> <div class="order-1 col-12 col-sm-6 col-md-12 col-xl-7"></div>
<div class="order-2 order-sm-3 order-md-2 order-xl-3 col-12 col-sm-6 col-md-12 col-xl-7"></div>
{% endif %}
<div class="order-3 order-sm-2 order-md-3 order-xl-2 col-12 col-sm-6 col-md-12 col-xl-5">
<div class="row justify-content-between">
<small class="col text-muted text-nowrap">Voting status</small>
<div class="col-auto">
{% if round.is_unscheduled %}
<span class="badge bg-warning">Unscheduled</span>
{% elif round.is_open %}
<span class="badge bg-success">Open</span>
{% elif round.is_scheduled %}
<span class="badge bg-primary">Scheduled</span>
{% elif round.is_closed %}
<span class="badge bg-primary">Closed</span>
{% endif %}
</div>
</div> </div>
</div> </div>
<div class="order-4 col-12 col-sm-6 col-md-12 col-xl-5">
<div class="row justify-content-between">
{% if round.is_closed %}
<small class="col text-muted text-nowrap">Decision</small>
<div class="col-12 col-sm-auto"> <div class="col-auto">
<div>
<span>Decision:</span>
{% if round.decision.outcome == "elected" %} {% if round.decision.outcome == "elected" %}
<span class="badge bg-success">{{ round.decision.get_outcome_display }}</span> <span class="badge bg-success">{{ round.decision.get_outcome_display }}</span>
{% elif round.decision.outcome == "notelected" %} {% elif round.decision.outcome == "notelected" %}
<span class="badge bg-danger">{{ round.decision.get_outcome_display }}</span> <span class="badge bg-danger">{{ round.decision.get_outcome_display }}</span>
{% else %}
<span class="badge bg-warning">Pending</span>
{% endif %}
</div>
{% else %} {% else %}
<span class="badge bg-warning">Pending</span> <small class="col text-muted text-nowrap">Voted / Total</small>
{% endif %}
</div> <div class="col-auto">
{% if round.eligible_to_vote.count > 0 %}
{{ round.votes.count }} / {{ round.eligible_to_vote.count }}
{% else %}
<span class="badge bg-danger">None</span>
{% endif %}
<div> </div>
<span>Deadline:&nbsp;</span><span>{{ round.voting_deadline|date:"Y-m-d" }}</span> {% endif %}
</div> </div>
</div> </div>
</div> </div>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

SciPost Code Repository