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

Template updates

Browse source
This commit is contained in:
Tom Hubrecht 2021-08-23 10:52:17 +02:00
parent 7bb98f9cd8
commit 9474fcd1d7
8 changed files with 49 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
elections/templates/elections/admin/question.html
View file

@ -2,19 +2,16 @@
<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">
<div class="level"> <div class="level is-mobile">
<div class="level-left is-flex-shrink-1"> <div class="level-left is-flex-shrink-1 mr-2">
<div class="level-item is-flex-shrink-1"> <span class="mr-2">
<span class="icon-text">
<span class="icon"> <span class="icon">
<i class="fas fa-poll-h"></i> <i class="fas fa-poll-h"></i>
</span> </span>
<span>{{ q }}</span> <span>{{ q }}</span>
</span> </span>
</div>
{% if q.election.start_date > current_time %} {% if q.election.start_date > current_time %}
<div class="level-item">
<a class="tag is-outlined is-light is-danger del" data-url="{% url 'election.del-question' q.pk %}" data-target="q_{{ q.pk }}"> <a class="tag is-outlined is-light is-danger del" data-url="{% url 'election.del-question' q.pk %}" data-target="q_{{ q.pk }}">
<span class="icon-text"> <span class="icon-text">
<span class="icon"> <span class="icon">
@ -32,7 +29,6 @@
<span>{% trans "Modifier" %}</span> <span>{% trans "Modifier" %}</span>
</span> </span>
</a> </a>
</div>
{% endif %} {% endif %}
</div> </div>

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

@ -201,9 +201,9 @@
{% 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">
<div class="level"> <div class="level is-mobile">
<div class="level-left is-flex-shrink-1"> <div class="level-left is-flex-shrink-1">
<span class="icon-text"> <span class="mr-3">
<span class="icon"> <span class="icon">
<i class="fas fa-poll-h"></i> <i class="fas fa-poll-h"></i>
</span> </span>

0
elections/templates/elections/mail_voters.html → elections/templates/elections/election_mail_voters.html
View file

0
elections/templates/elections/upload_voters.html → elections/templates/elections/election_upload_voters.html
View file

19
elections/templates/elections/option_update.html
View file

@ -1,19 +0,0 @@
{% extends "base.html" %}
{% load i18n static string %}
{% block content %}
{% for error in form.non_field_errors %}
<div class="notification is-danger">
{{ error }}
</div>
{% endfor %}
<h1 class="title">{% trans "Modification d'une option" %}</h1>
<hr>
{% url 'election.admin' option.question.election.pk as r_url %}
{% include "forms/common-form.html" with anchor=o_|concatenate:option.pk %}
{% endblock %}

19
elections/templates/elections/question_update.html
View file

@ -1,19 +0,0 @@
{% extends "base.html" %}
{% load i18n static string %}
{% block content %}
{% for error in form.non_field_errors %}
<div class="notification is-danger">
{{ error }}
</div>
{% endfor %}
<h1 class="title">{% trans "Modification d'une question" %}</h1>
<hr>
{% url 'election.admin' question.election.pk as r_url %}
{% include "forms/common-form.html" with errors=False r_anchor="q_"|concatenate:question.pk %}
{% endblock %}

4
elections/views.py
View file

@ -124,7 +124,7 @@ class ElectionUploadVotersView(CreatorOnlyEditMixin, SuccessMessageMixin, FormVi
model = Election model = Election
form_class = UploadVotersForm form_class = UploadVotersForm
success_message = _("Liste de votant·e·s importée avec succès !") success_message = _("Liste de votant·e·s importée avec succès !")
template_name = "elections/upload_voters.html" template_name = "elections/election_upload_voters.html"
def get_queryset(self): def get_queryset(self):
# On ne peut ajouter une liste d'électeurs que sur une élection restreinte # On ne peut ajouter une liste d'électeurs que sur une élection restreinte
@ -158,7 +158,7 @@ class ElectionMailVotersView(CreatorOnlyEditMixin, SuccessMessageMixin, FormView
model = Election model = Election
form_class = VoterMailForm form_class = VoterMailForm
success_message = _("Mail d'annonce en cours d'envoi !") success_message = _("Mail d'annonce en cours d'envoi !")
template_name = "elections/mail_voters.html" template_name = "elections/election_mail_voters.html"
def get_queryset(self): def get_queryset(self):
# On ne peut envoyer un mail que sur une élection restreinte qui n'a pas # On ne peut envoyer un mail que sur une élection restreinte qui n'a pas

4
shared/templates/auth/admin-panel.html
View file

@ -9,7 +9,7 @@
<div class="tile is-ancestor"> <div class="tile is-ancestor">
<div class="tile is-parent"> <div class="tile is-parent">
<a class="tile is-child notification is-light" href="{% url 'auth.create-account' %}"> <a class="tile is-child notification is-light px-0" href="{% url 'auth.create-account' %}">
<div class="subtitle has-text-centered"> <div class="subtitle has-text-centered">
<span class="icon-text"> <span class="icon-text">
<span class="icon"> <span class="icon">
@ -22,7 +22,7 @@
</div> </div>
<div class="tile is-parent"> <div class="tile is-parent">
<a class="tile is-child notification is-light" href="{% url 'auth.accounts' %}"> <a class="tile is-child notification is-light px-0" href="{% url 'auth.accounts' %}">
<div class="subtitle has-text-centered"> <div class="subtitle has-text-centered">
<span class="icon-text"> <span class="icon-text">
<span class="icon"> <span class="icon">