From a35e81a694998bb0a38a035c6fe06e03ce8a08a8 Mon Sep 17 00:00:00 2001
From: Tom Hubrecht <tom.hubrecht@ens.fr>
Date: Mon, 21 Dec 2020 13:47:56 +0100
Subject: [PATCH] Small tweaks

---
 elections/templates/elections/election.html | 2 ++
 shared/templates/auth/login_select.html     | 2 +-
 shared/templates/auth/pwd_login.html        | 1 -
 shared/templates/forms/form.html            | 3 ---
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/elections/templates/elections/election.html b/elections/templates/elections/election.html
index a726993..225e8a5 100644
--- a/elections/templates/elections/election.html
+++ b/elections/templates/elections/election.html
@@ -38,6 +38,7 @@
 <hr>
 
 {# Indications de connexion #}
+{% if election.start_date < current_time and election.end_date > current_time %}
 <div class="message is-warning">
   <div class="message-body">
     {% if election.restricted %}
@@ -47,6 +48,7 @@
     {% endif %}
   </div>
 </div>
+{% endif %}
 
 {# Description de l'élection #}
 <div class="message is-primary">
diff --git a/shared/templates/auth/login_select.html b/shared/templates/auth/login_select.html
index 50af8a0..eb98e9d 100644
--- a/shared/templates/auth/login_select.html
+++ b/shared/templates/auth/login_select.html
@@ -12,7 +12,7 @@
   <div class="message-body">
     {% if method == "PWD" %}
     {% trans "Pour voter lors de cette élection, vous devez vous connecter à l'aide des identifiants reçus par mail. Choisissez la connexion par mot de passe." %}
-    {% else %}
+    {% elif method == "CAS" %}
     {% trans "Pour voter lors de cette élection, vous devez vous connecter à l'aide du CAS élève." %}
     {% endif %}
   </div>
diff --git a/shared/templates/auth/pwd_login.html b/shared/templates/auth/pwd_login.html
index 4819b09..669bf19 100644
--- a/shared/templates/auth/pwd_login.html
+++ b/shared/templates/auth/pwd_login.html
@@ -11,7 +11,6 @@
   <div class="column is-two-thirds">
     <form action="" method="post">
       {% csrf_token %}
-      {{ form.errors }}
 
       {% include "forms/form.html" with errors=True %}
 
diff --git a/shared/templates/forms/form.html b/shared/templates/forms/form.html
index cc312aa..0ab9f16 100644
--- a/shared/templates/forms/form.html
+++ b/shared/templates/forms/form.html
@@ -1,9 +1,6 @@
 {% if errors %}
 {% if form.non_field_errors %}
 <div class="message is-danger">
-  <div class="message-header">
-    <button class="delete" aria-label="delete"></button>
-  </div>
   <div class="message-body">
     {% for non_field_error in form.non_field_errors %}
     {{ non_field_error }}