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-04-13 15:22:53 +02:00
parent 50b9759b25
commit d7d0717940
19 changed files with 197 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@
<div class="field is-grouped is-centered">
<div class="control is-expanded">
<button class="button is-fullwidth is-outlined is-primary is-light">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-check"></i>
</span>
<span>{% trans "Enregistrer" %}</span>
@ -26,7 +26,7 @@
<div class="control">
<a class="button is-primary" href="{% url 'election.voters' election.pk %}#v_{{ anchor }}">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-undo-alt"></i>
</span>
<span>{% trans "Retour" %}</span>

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

@ -14,7 +14,7 @@
{# Liste des votant·e·s #}
<div class="level-item">
<a class="button is-primary is-light is-outlined" href="{% url 'election.voters' election.pk %}">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-list"></i>
</span>
<span>{% trans "Votant·e·s" %}</span>
@ -51,11 +51,15 @@
{# Dates d'ouverture de l'élection #}
<div class="level-left">
<div class="level-item">
<span class="tag is-medium is-primary">{{ election.start_date|date:"d/m/Y H:i" }}</span>
<span class="icon">
<i class="fas fa-long-arrow-alt-right"></i>
<span class="tag is-medium is-primary">
<span class="icon-text">
<span>{{ election.start_date|date:"d/m/Y H:i" }}</span>
<span class="icon">
<i class="fas fa-long-arrow-alt-right"></i>
</span>
<span>{{ election.end_date|date:"d/m/Y H:i" }}</span>
</span>
</span>
<span class="tag is-medium is-primary">{{ election.end_date|date:"d/m/Y H:i" }}</span>
</div>
{# Créateurice de l'élection #}
@ -69,10 +73,12 @@
<div class="level-right">
<div class="level-item">
<div class="tag is-medium is-outlined is-success is-light">
<span class="icon">
<i class="fas fa-check"></i>
<span class="icon-text">
<span class="icon">
<i class="fas fa-check"></i>
</span>
<span>{% trans "Votre vote a bien été enregistré." %}</span>
</span>
<span>{% trans "Votre vote a bien été enregistré." %}</span>
</div>
</div>
</div>
@ -87,10 +93,12 @@
<div class="column is-one-third tile is-parent">
<a class="tile is-child notification is-primary" href="{% url 'election.vote' election.questions.first.pk %}">
<div class="subtitle has-text-centered">
<span class="icon has-text-white">
<i class="fas fa-vote-yea"></i>
<span class="icon-text">
<span class="icon has-text-white">
<i class="fas fa-vote-yea"></i>
</span>
<span class="ml-3">{% trans "Voter" %}</span>
</span>
<span class="ml-3">{% trans "Voter" %}</span>
</div>
</a>
</div>
@ -114,19 +122,23 @@
{% if election.restricted %}
<a class="tile is-child notification is-primary" href="{% url 'auth.election' election.pk %}?next={% url 'election.view' election.pk %}">
<div class="subtitle has-text-centered mb-2">
<span class="icon has-text-white">
<i class="fas fa-unlock"></i>
<span class="icon-text">
<span class="icon has-text-white">
<i class="fas fa-unlock"></i>
</span>
<span class="ml-3">{% trans "Connexion par identifiants" %}</span>
</span>
<span class="ml-3">{% trans "Connexion par identifiants" %}</span>
</div>
</a>
{% else %}
<a class="tile is-child notification is-primary" href="{% url 'authens:login.cas' %}">
<div class="subtitle has-text-centered mb-2">
<span class="icon has-text-white">
<i class="fas fa-school"></i>
<span class="icon-text">
<span class="icon has-text-white">
<i class="fas fa-school"></i>
</span>
<span class="ml-3">{% trans "Connexion via CAS" %}</span>
</span>
<span class="ml-3">{% trans "Connexion via CAS" %}</span>
</div>
</a>
{% endif %}
@ -164,19 +176,21 @@
<div class="panel-block">
{% if election.tallied and election.results_public %}
<span class="tag {% if o.winner %}is-success{% else %}is-primary{% endif %}">
{% if q.vote_type == "select" %}
<span class="icon">
<i class="fas fa-vote-yea"></i>
</span>
<span>{{ o.nb_votes }}</span>
<span class="icon-text">
{% if q.vote_type == "select" %}
<span class="icon">
<i class="fas fa-vote-yea"></i>
</span>
<span>{{ o.nb_votes }}</span>
{% elif q.vote_type == "rank" %}
{% elif q.vote_type == "rank" %}
<span class="icon">
<i class="fas fa-layer-group"></i>
<span class="icon">
<i class="fas fa-layer-group"></i>
</span>
<span>{{ forloop.counter }}</span>
{% endif %}
</span>
<span>{{ forloop.counter }}</span>
{% endif %}
</span>
{% endif %}

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

@ -16,10 +16,12 @@
<div class="dropdown is-right">
<div class="dropdown-trigger">
<button class="button" aria-haspopup="true" aria-controls="dropdown-menu">
<span class="icon is-small">
<i class="fas fa-cog" aria-hidden="true"></i>
<span class="icon-text">
<span class="icon">
<i class="fas fa-cog" aria-hidden="true"></i>
</span>
<span>{% trans "Actions" %}</span>
</span>
<span>{% trans "Actions" %}</span>
</button>
</div>
@ -102,11 +104,15 @@
{# Dates d'ouverture de l'élection #}
<div class="level-left">
<div class="level-item">
<span class="tag is-medium is-primary">{{ election.start_date|date:"d/m/Y H:i" }}</span>
<span class="icon">
<i class="fas fa-long-arrow-alt-right"></i>
<span class="tag is-medium is-primary">
<span class="icon-text">
<span>{{ election.start_date|date:"d/m/Y H:i" }}</span>
<span class="icon">
<i class="fas fa-long-arrow-alt-right"></i>
</span>
<span>{{ election.end_date|date:"d/m/Y H:i" }}</span>
</span>
</span>
<span class="tag is-medium is-primary">{{ election.end_date|date:"d/m/Y H:i" }}</span>
</div>
</div>
</div>
@ -130,17 +136,21 @@
{% if election.start_date > current_time %}
<div class="level-item">
<a class="tag is-outlined is-light is-danger" href="{% url 'election.del-question' q.pk %}">
<span class="icon">
<i class="fas fa-times"></i>
<span class="icon-text">
<span class="icon">
<i class="fas fa-times"></i>
</span>
<span>{% trans "Supprimer" %}</span>
</span>
<span>{% trans "Supprimer" %}</span>
</a>
<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>
<a class="tag is-outlined is-light is-info ml-1" href="{% url 'election.mod-question' q.pk %}">
<span class="icon-text">
<span class="icon">
<i class="fas fa-edit"></i>
</span>
<span>{% trans "Modifier" %}</span>
</span>
<span>{% trans "Modifier" %}</span>
</a>
</div>
{% endif %}
@ -155,23 +165,39 @@
{# Liste des options possibles #}
{% for o in q.options.all %}
<div class="panel-block">
{% if election.tallied %}
{% if election.start_date > current_time %}
<span class="tags has-addons mb-0">
<a class="tag is-danger is-light is-outlined has-tooltip-primary mb-0" data-tooltip="{% trans "Supprimer" %}" href="{% url 'election.del-option' o.pk %}">
<span class="icon">
<i class="fas fa-times"></i>
</span>
</a>
<a class="tag is-info is-light is-outlined has-tooltip-primary mb-0" data-tooltip="{% trans "Modifier" %}" href="{% url 'election.mod-option' o.pk %}">
<span class="icon">
<i class="fas fa-edit"></i>
</span>
</a>
</span>
{% elif election.tallied %}
<span class="tag {% if o.winner %}is-success{% else %}is-primary{% endif %}">
{% if q.vote_type == "select" %}
<span class="icon">
<i class="fas fa-vote-yea"></i>
</span>
<span>{{ o.nb_votes }}</span>
<span class="icon-text">
{% if q.vote_type == "select" %}
<span class="icon">
<i class="fas fa-vote-yea"></i>
</span>
<span>{{ o.nb_votes }}</span>
{% elif q.vote_type == "rank" %}
{% elif q.vote_type == "rank" %}
<span class="icon">
<i class="fas fa-layer-group"></i>
<span class="icon">
<i class="fas fa-layer-group"></i>
</span>
<span>{{ forloop.counter }}</span>
{% endif %}
</span>
<span>{{ forloop.counter }}</span>
{% endif %}
</span>
{% endif %}
<span class="ml-2">{{ o.text }}</span>
</div>

76
elections/templates/elections/election_list.html
View file

@ -27,40 +27,60 @@
<hr>
{% for e in election_list %}
<div class="message is-primary">
<div class="message-header is-size-6 is-radiusless">
<div>
<a href="{% url 'election.view' e.pk %}">{{ e.name }}</a>
<span class="tag is-primary is-light ml-3">{{ e.start_date|date:"d/m/Y H:i" }}</span>
<span class="icon has-text-primary-light">
<i class="fas fa-long-arrow-alt-right"></i>
</span>
<span class="tag is-primary is-light">{{ e.end_date|date:"d/m/Y H:i" }}</span>
</div>
<div class="panel is-primary">
<div class="panel-heading is-size-6 is-radiusles">
<div class="level">
<div class="level-left is-flex-shrink-1">
<div class="level-item is-flex-shrink-1">
<a class="has-text-primary-light" href="{% url 'election.view' e.pk %}"><u>{{ e.name }}</u></a>
</div>
<div>
{% if e.tallied %}
<span class="tag is-success is-light ml-3">{% trans "Élection dépouillée" %}</span>
{% endif %}
<div class="level-item">
<span class="tag is-primary is-light">
<span class="icon-text">
<span>{{ e.start_date|date:"d/m/Y H:i" }}</span>
<span class="icon has-text-primary">
<i class="fas fa-long-arrow-alt-right"></i>
</span>
<span>{{ e.end_date|date:"d/m/Y H:i" }}</span>
</span>
</span>
</div>
</div>
{% if e.results_public %}
<span class="tag is-info is-light ml-3">{% trans "Élection publiée" %}</span>
{% endif %}
<div class="level-right">
{% if e.tallied %}
<div class="level-item">
<span class="tag is-success is-light">{% trans "Élection dépouillée" %}</span>
</div>
{% endif %}
{% if e.archived %}
<span class="tag is-danger is-light ml-3">{% trans "Élection archivée" %}</span>
{% endif %}
{% if e.results_public %}
<div class="level-item">
<span class="tag is-info is-light">{% trans "Élection publiée" %}</span>
</div>
{% endif %}
{% if e.created_by == user %}
<a class="has-text-primary-light ml-3 has-tooltip-light" href="{% url 'election.admin' e.pk %}" data-tooltip="{% trans "Administrer" %}">
<span class="icon">
<i class="fas fa-cog"></i>
</span>
</a>
{% endif %}
{% if e.archived %}
<div class="level-item">
<span class="tag is-danger is-light">{% trans "Élection archivée" %}</span>
</div>
{% endif %}
{% if e.created_by == user %}
<div class="level-item">
<a class="has-text-primary-light ml-3 has-tooltip-light" href="{% url 'election.admin' e.pk %}" data-tooltip="{% trans "Administrer" %}">
<span class="icon">
<i class="fas fa-cog"></i>
</span>
</a>
</div>
{% endif %}
</div>
</div>
</div>
<p class="message-body">
<p class="panel-block">
{{ e.description|linebreaksbr }}
</p>
</div>

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

@ -41,7 +41,7 @@
<div class="field is-grouped is-centered">
<div class="control is-expanded">
<button class="button is-fullwidth is-outlined is-primary is-light">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-check"></i>
</span>
<span>{% trans "Enregistrer" %}</span>
@ -49,7 +49,7 @@
</div>
<div class="control">
<a class="button is-primary" href="{% url 'election.admin' election.pk %}">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-undo-alt"></i>
</span>
<span>{% trans "Retour" %}</span>

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

@ -6,14 +6,14 @@
<div class="level">
{# Titre de l'élection #}
<div class="level-left">
<div class="level-left is-flex-shrink-1">
<h1 class="title">{{ election.name }}</h1>
</div>
<div class="level-right">
<div class="level-item">
<a class="button is-primary" href="{% if can_delete %}{% url 'election.admin' election.pk %}{% else %}{% url 'election.view' election.pk %}{% endif %}">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-undo-alt"></i>
</span>
<span>{% trans "Retour" %}</span>

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

@ -28,7 +28,7 @@
<div class="field is-grouped is-centered">
<div class="control is-expanded">
<button class="button is-fullwidth is-outlined is-primary is-light">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-check"></i>
</span>
<span>{% trans "Envoyer" %}</span>
@ -37,7 +37,7 @@
<div class="control">
<a class="button is-primary" href="{% url 'election.upload-voters' election.pk %}">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-undo-alt"></i>
</span>
<span>{% trans "Retour" %}</span>

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

@ -23,7 +23,7 @@
<div class="field is-grouped is-centered">
<div class="control is-expanded">
<button class="button is-fullwidth is-outlined is-primary is-light">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-check"></i>
</span>
<span>{% trans "Enregistrer" %}</span>
@ -31,7 +31,7 @@
</div>
<div class="control">
<a class="button is-primary" href="{% url 'election.admin' option.question.election.pk %}#o_{{ option.pk }}">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-undo-alt"></i>
</span>
<span>{% trans "Retour" %}</span>

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

@ -23,7 +23,7 @@
<div class="field is-grouped is-centered">
<div class="control is-expanded">
<button class="button is-fullwidth is-outlined is-primary is-light">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-check"></i>
</span>
<span>{% trans "Enregistrer" %}</span>
@ -31,7 +31,7 @@
</div>
<div class="control">
<a class="button is-primary" href="{% url 'election.admin' question.election.pk %}#q_{{ question.pk }}">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-undo-alt"></i>
</span>
<span>{% trans "Retour" %}</span>

16
elections/templates/elections/results/rank.html
View file

@ -12,10 +12,12 @@
</th>
{% for i in range %}
<th class="has-text-centered">
<span class="icon">
<i class="fas fa-layer-group"></i>
<span class="icon-text">
<span class="icon">
<i class="fas fa-layer-group"></i>
</span>
<span>{{ i }}</span>
</span>
<span>{{ i }}</span>
</th>
{% endfor %}
</thead>
@ -25,10 +27,12 @@
{% with loser=forloop.counter %}
<tr>
<th class="has-text-centered">
<span class="icon">
<i class="fas fa-layer-group"></i>
<span class="icon-text">
<span class="icon">
<i class="fas fa-layer-group"></i>
</span>
<span>{{ forloop.counter }}</span>
</span>
<span>{{ forloop.counter }}</span>
</th>
{% for cell in line %}

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

@ -40,7 +40,7 @@
<div class="level-item">
<a class="button is-primary" href="{% url 'election.admin' election.pk %}">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-undo-alt"></i>
</span>
<span>{% trans "Retour" %}</span>
@ -77,7 +77,7 @@
<div class="field is-grouped is-centered">
<div class="control is-expanded">
<button class="button is-fullwidth is-outlined is-primary is-light">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-check"></i>
</span>
<span>{% trans "Importer" %}</span>

8
elections/templates/elections/vote.html
View file

@ -119,7 +119,7 @@
<div class="field is-grouped is-centered">
<div class="control is-expanded">
<a class="button is-fullwidth is-outlined is-primary is-light modal-button" data-target="modal-confirm" id="confirm-button">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-check"></i>
</span>
<span>{% trans "Enregistrer" %}</span>
@ -128,7 +128,7 @@
<div class="control">
<a class="button is-primary" href="{% url 'election.view' question.election.pk %}">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-undo-alt"></i>
</span>
<span>{% trans "Retour" %}</span>
@ -148,14 +148,14 @@
<footer class="modal-card-foot">
<button class="button is-fullwidth is-outlined is-primary is-light">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-check"></i>
</span>
<span>{% trans "Confirmer" %}</span>
</button>
<a class="button is-primary button-close">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-times"></i>
</span>
<span>{% trans "Annuler" %}</span>

5
shared/templates/auth/election_login.html
View file

@ -19,15 +19,16 @@
<div class="field is-grouped is-centered">
<div class="control is-expanded">
<button class="button is-fullwidth is-outlined is-primary is-light">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-check"></i>
</span>
<span>{% trans "Enregistrer" %}</span>
</button>
</div>
<div class="control">
<a class="button is-primary" href="{% url 'election.view' election_id %}">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-undo-alt"></i>
</span>
<span>{% trans "Retour" %}</span>

20
shared/templates/authens/login_switch.html
View file

@ -12,22 +12,26 @@
<div class="tile is-ancestor">
<div class="tile is-parent">
<a class="tile is-child notification is-primary" href="{% url "authens:login.cas" %}?next={{ next }}">
<div class="subtitle has-text-centered mb-2">
<span class="icon has-text-white">
<i class="fas fa-school"></i>
<div class="subtitle has-text-centered">
<span class="icon-text">
<span class="icon has-text-white">
<i class="fas fa-school"></i>
</span>
<span class="ml-3">{% trans "Connexion via CAS" %}</span>
</span>
<span class="ml-3">{% trans "Connexion via CAS" %}</span>
</div>
</a>
</div>
<div class="tile is-parent">
<a class="tile is-child notification" href="{% url "authens:login.pwd" %}?next={{ next }}">
<div class="subtitle has-text-centered mb-2">
<span class="icon">
<i class="fas fa-key"></i>
<div class="subtitle has-text-centered">
<span class="icon-text">
<span class="icon">
<i class="fas fa-key"></i>
</span>
<span class="ml-3">{% trans "Connexion par mot de passe" %}</span>
</span>
<span class="ml-3">{% trans "Connexion par mot de passe" %}</span>
</div>
</a>
</div>

12
shared/templates/authens/pwd_login.html
View file

@ -19,7 +19,7 @@
<div class="field is-grouped is-centered">
<div class="control is-expanded">
<button class="button is-fullwidth is-outlined is-primary is-light">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-check"></i>
</span>
<span>{% trans "Enregistrer" %}</span>
@ -28,7 +28,7 @@
<div class="control">
<a class="button is-primary" href="{% url 'authens:login' %}?next={{ next }}">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-undo-alt"></i>
</span>
<span>{% trans "Retour" %}</span>
@ -41,9 +41,11 @@
<div class="help has-text-centered">
<span>{% trans "Mot de passe oublié :" %}</span>
<a class="tag has-text-primary" href="{% url 'authens:reset.pwd' %}">
<span>{% trans "Réinitialiser mon mot de passe." %}</span>
<span class="icon is-small">
<i class="fas fa-lock-open"></i>
<span class="icon-text">
<span class="icon">
<i class="fas fa-lock-open"></i>
</span>
<span>{% trans "Réinitialiser mon mot de passe." %}</span>
</span>
</a>
</div>

4
shared/templates/authens/pwd_reset.html
View file

@ -19,7 +19,7 @@
<div class="field is-grouped is-centered">
<div class="control is-expanded">
<button class="button is-fullwidth is-outlined is-primary is-light">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-check"></i>
</span>
<span>{% trans "Envoyer un mail" %}</span>
@ -28,7 +28,7 @@
<div class="control">
<a class="button is-primary" href="{% url 'authens:login.pwd' %}?next={{ next }}">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-undo-alt"></i>
</span>
<span>{% trans "Retour" %}</span>

2
shared/templates/authens/pwd_reset_confirm.html
View file

@ -19,7 +19,7 @@
<div class="field is-grouped is-centered">
<div class="control is-expanded">
<button class="button is-fullwidth is-outlined is-primary is-light">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-check"></i>
</span>
<span>{% trans "Enregistrer" %}</span>

4
shared/templates/forms/modal-form.html
View file

@ -17,14 +17,14 @@
<footer class="modal-card-foot">
<button class="button is-fullwidth is-outlined is-primary is-light">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-check"></i>
</span>
<span>{% trans "Enregistrer" %}</span>
</button>
<a class="button is-primary button-close">
<span class="icon is-small">
<span class="icon">
<i class="fas fa-undo-alt"></i>
</span>
<span>{% trans "Annuler" %}</span>

4
shared/templates/registration/logged_out.html
View file

@ -20,7 +20,7 @@
<div class="control is-expanded">
<a class="button is-fullwidth is-outlined is-primary is-light" href="{% url 'authens:login' %}">
<span>{% trans "Se reconnecter" %}</span>
<span class="icon is-small">
<span class="icon">
<i class="fas fa-unlock"></i>
</span>
</a>
@ -29,7 +29,7 @@
<div class="control">
<a class="button is-primary" href="{% url 'kadenios' %}">
<span>{% trans "Accueil" %}</span>
<span class="icon is-small">
<span class="icon">
<i class="fas fa-home"></i>
</span>
</a>