DGNum/kadenios
17
0
Fork 0
Code Issues 12 Pull requests Projects Wiki Activity

On gère mieux les longs titres pour les votes et questions

Browse source
This commit is contained in:
Tom Hubrecht 2021-04-12 23:48:04 +02:00
parent fea39e402b
commit 3f3ace85f3
2 changed files with 45 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
elections/templates/elections/election.html
View file

@ -5,14 +5,12 @@
{% block content %} {% block content %}
<div class="level"> <div class="level">
{# Titre de l'élection #}
<div class="level-left is-flex-shrink-1"> <div class="level-left is-flex-shrink-1">
{# Titre de l'élection #} <h1 class="title">{{ election.name }}</h1>
<div class="level-item">
<h1 class="title">{{ election.name }}</h1>
</div>
</div> </div>
<div class="level-right is-flex-shrink-1 is-flex-grow-1"> <div class="level-right">
{# Liste des votant·e·s #} {# Liste des votant·e·s #}
<div class="level-item"> <div class="level-item">
<a class="button is-primary is-light is-outlined" href="{% url 'election.voters' election.pk %}"> <a class="button is-primary is-light is-outlined" href="{% url 'election.voters' election.pk %}">
@ -148,11 +146,17 @@
{% for q in election.questions.all %} {% for q in election.questions.all %}
<div class="panel" id="q_{{ q.pk }}"> <div class="panel" id="q_{{ q.pk }}">
<div class="panel-heading is-size-6"> <div class="panel-heading is-size-6">
<span class="ml-2">{{ q.text }}</span> <div class="level">
<div class="level-left is-flex-shrink-1">
<span>{{ q.text }}</span>
</div>
{% if q in cast_questions %} {% if q in cast_questions %}
<span class="tag is-outlined is-light is-success is-pulled-right">{% trans "A voté" %}</span> <div class="level-right">
{% endif %} <span class="tag is-outlined is-light is-success">{% trans "A voté" %}</span>
</div>
{% endif %}
</div>
</div> </div>
{# Liste des options possibles #} {# Liste des options possibles #}

53
elections/templates/elections/election_admin.html
View file

@ -5,11 +5,9 @@
{% block content %} {% block content %}
<div class="level is-block-tablet is-block-desktop is-flex-fullhd"> <div class="level is-block-tablet is-block-desktop is-flex-fullhd">
<div class="level-left"> {# Titre de l'élection #}
{# Titre de l'élection #} <div class="level-left is-flex-shrink-1">
<div class="level-item"> <h1 class="title">{{ election.name }}</h1>
<h1 class="title">{{ election.name }}</h1>
</div>
</div> </div>
{% if election.start_date > current_time or election.end_date < current_time %} {% if election.start_date > current_time or election.end_date < current_time %}
@ -123,22 +121,35 @@
{% for q in election.questions.all %} {% for q in election.questions.all %}
<div class="panel" id="q_{{ q.pk }}"> <div class="panel" id="q_{{ q.pk }}">
<div class="panel-heading is-size-6"> <div class="panel-heading is-size-6">
<span>{{ q.text }}</span> <div class="level">
{% if election.start_date > current_time %} <div class="level-left is-flex-shrink-1">
<a class="tag is-outlined is-light is-danger" href="{% url 'election.del-question' q.pk %}"> <div class="level-item is-flex-shrink-1">
<span class="icon"> <span>{{ q.text }}</span>
<i class="fas fa-times"></i> </div>
</span>
<span>{% trans "Supprimer" %}</span> <div class="level-item">
</a> {% if election.start_date > current_time %}
<a class="tag is-outlined is-light is-info" href="{% url 'election.mod-question' q.pk %}"> <a class="tag is-outlined is-light is-danger" href="{% url 'election.del-question' q.pk %}">
<span class="icon"> <span class="icon">
<i class="fas fa-edit"></i> <i class="fas fa-times"></i>
</span> </span>
<span>{% trans "Modifier" %}</span> <span>{% trans "Supprimer" %}</span>
</a> </a>
{% endif %}
<span class="tag is-outlined is-primary is-light is-pulled-right">{{ q.get_type_display }}</span> <a class="tag is-outlined is-light is-info" href="{% url 'election.mod-question' q.pk %}">
<span class="icon">
<i class="fas fa-edit"></i>
</span>
<span>{% trans "Modifier" %}</span>
</a>
{% endif %}
</div>
</div>
<div class="level-right">
<span class="tag is-outlined is-primary is-light">{{ q.get_type_display }}</span>
</div>
</div>
</div> </div>
{# Liste des options possibles #} {# Liste des options possibles #}