From 6e3177d3faf9290afa2008891b8c1ceda6074c8c Mon Sep 17 00:00:00 2001
From: Julien Cougnaud <julien.cougnaud@makina-corpus.com>
Date: Wed, 22 Jan 2025 17:23:50 +0100
Subject: [PATCH] [OS-386] Fix a fa icon, a translation and add a cancel button
 inside the forms

---
 locale/fr_BE/LC_MESSAGES/django.po                  |  2 +-
 static/parcours_doctoral/training.css               |  2 +-
 templates/parcours_doctoral/tab_layout.html         |  7 ++++++-
 .../parcours_doctoral/tags/doctorate_tabs_bar.html  | 13 ++++++++++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/locale/fr_BE/LC_MESSAGES/django.po b/locale/fr_BE/LC_MESSAGES/django.po
index c56c1ca..b93e223 100644
--- a/locale/fr_BE/LC_MESSAGES/django.po
+++ b/locale/fr_BE/LC_MESSAGES/django.po
@@ -868,7 +868,7 @@ msgid ""
 "No later than 24 months after the CDD grants PhD admission, the candidate "
 "must take a confirmation exam."
 msgstr ""
-"Dans un délai maximum de 24 mois à compter de la date d'admission au "
+"Dans un délai de maximum 24 mois à compter de la date d'admission au "
 "doctorat par la CDD, le ou la candidate présente une épreuve de confirmation."
 
 msgid "No one invited"
diff --git a/static/parcours_doctoral/training.css b/static/parcours_doctoral/training.css
index 82e5a8e..a84f89f 100644
--- a/static/parcours_doctoral/training.css
+++ b/static/parcours_doctoral/training.css
@@ -70,7 +70,7 @@
 }
 
 .card-header .card-title > a:after {
-    font-family: 'Font Awesome 5 Free';
+    font-family: 'Font Awesome 5 Pro';
     font-weight: 900;
     content: "\f078";
 }
diff --git a/templates/parcours_doctoral/tab_layout.html b/templates/parcours_doctoral/tab_layout.html
index 1fc8166..11167ba 100644
--- a/templates/parcours_doctoral/tab_layout.html
+++ b/templates/parcours_doctoral/tab_layout.html
@@ -147,8 +147,13 @@
             {% get_current_tab as current_tab %}
             <div class="text-end mb-3">
               {% block submit_button %}
+                {% if cancel_url and cancel_url != request.path and doctorate|can_read_tab:current_tab %}
+                  <a href="{{ cancel_url }}" class="btn btn-light border border-dark-subtle">
+                    {% trans 'Cancel' %}
+                  </a>
+                {% endif %}
                 <button
-                  type="submit" class="{{ submit_class|default:'btn btn-light border border-dark-subtle' }}"
+                  type="submit" class="{{ submit_class|default:'btn btn-primary border border-dark-subtle' }}"
                   {% if cancel_url and not doctorate|can_update_tab:current_tab %}
                   disabled
                   {% endif %}
diff --git a/templates/parcours_doctoral/tags/doctorate_tabs_bar.html b/templates/parcours_doctoral/tags/doctorate_tabs_bar.html
index 418e723..952971e 100644
--- a/templates/parcours_doctoral/tags/doctorate_tabs_bar.html
+++ b/templates/parcours_doctoral/tags/doctorate_tabs_bar.html
@@ -33,6 +33,7 @@
   {% doctorate_subtabs doctorate %} for other displays.
 {% endcomment %}
 {% trans "Save" context 'doctorate' as save_label %}
+{% url "parcours_doctoral:"|add:request.resolver_match.url_name view.kwargs.pk as cancel_url %}
 
 <div class="mb-3">
   {# Nav for mobile display #}
@@ -87,10 +88,15 @@
       {% endif %}
     {% endfor %}
 
-    {# Submit button if needed (mobile display) #}
+    {# Submit button if needed (desktop display) #}
     {% get_current_tab as current_tab %}
     {% if with_submit %}
       <div class="ms-auto">
+        {% if cancel_url and cancel_url != request.path and doctorate|can_read_tab:current_tab %}
+          <a href="{{ cancel_url }}" class="btn btn-light border border-dark-subtle">
+            {% trans 'Cancel' %}
+          </a>
+        {% endif %}
         <button
           type="submit"
           class="btn btn-primary"
@@ -120,6 +126,11 @@
   {# Submit button if needed (mobile display) #}
   {% if with_submit %}
     <div class="text-end d-md-none">
+      {% if cancel_url and cancel_url != request.path and doctorate|can_read_tab:current_tab %}
+        <a href="{{ cancel_url }}" class="btn btn-light border border-dark-subtle">
+          {% trans 'Cancel' %}
+        </a>
+      {% endif %}
       <button
         type="submit"
         class="btn btn-primary"