diff --git a/itou/static/css/itou.css b/itou/static/css/itou.css index 47819fefe5f..73d2f89404b 100644 --- a/itou/static/css/itou.css +++ b/itou/static/css/itou.css @@ -339,14 +339,6 @@ an input field being invalid, generating an uncontrolled red box-shadow. */ } } -.scrolldown-anchor { - /* navigation : class to force the scroll down and avoid the banner to hide the map */ - display: block; - position: relative; - top: -130px; - visibility: hidden; -} - .approval-left-border { border-left-width: 3px !important; } diff --git a/itou/templates/siae_evaluations/campaign_calendar.html b/itou/templates/siae_evaluations/campaign_calendar.html index b83ad2f47dd..243bdd02870 100644 --- a/itou/templates/siae_evaluations/campaign_calendar.html +++ b/itou/templates/siae_evaluations/campaign_calendar.html @@ -17,10 +17,6 @@

Calendrier

{{ campaign_calendar_html|safe }} - -

- Retour -

diff --git a/itou/templates/siae_evaluations/includes/criterion_infos.html b/itou/templates/siae_evaluations/includes/criterion_infos.html index 406b79dac9d..8119030dcfd 100644 --- a/itou/templates/siae_evaluations/includes/criterion_infos.html +++ b/itou/templates/siae_evaluations/includes/criterion_infos.html @@ -1,39 +1,22 @@ -
-
-

{{ criteria.name }}

-
-
- {% if review_state == "ACCEPTED" %} -

- Validé -

- {% elif review_state == "REFUSED" or review_state == "REFUSED_2" %} -

- Refusé -

- {% endif %} -
-
-
-
- {% if criteria.written_proof %} -

- Pièce justificative : - {{ criteria.written_proof }} -

- {% endif %} - {% if criteria.written_proof_validity %} -

- Durée de validité du justificatif : - {{ criteria.written_proof_validity }} -

- {% endif %} - {% if criteria.written_proof_url %} -

- - {{ criteria.written_proof_url }} - -

- {% endif %} -
-
+{% if review_state == "ACCEPTED" %} + Validé +
+{% elif review_state == "REFUSED" or review_state == "REFUSED_2" %} + Refusé +
+{% endif %} +{{ criteria.name }} +
+ diff --git a/itou/templates/siae_evaluations/includes/criterion_validation.html b/itou/templates/siae_evaluations/includes/criterion_validation.html index 5247ee73d34..626d39ee902 100644 --- a/itou/templates/siae_evaluations/includes/criterion_validation.html +++ b/itou/templates/siae_evaluations/includes/criterion_validation.html @@ -1,45 +1,34 @@ -
-
-
- - {% if can_edit_proof %} - {% if evaluated_administrative_criteria.review_state == 'PENDING' %} -
-
- {% csrf_token %} - -
-
-
-
- {% csrf_token %} - -
-
- {% else %} -
-
- {% csrf_token %} - -
-
- {% endif %} + + {% if can_edit_proof %} +
+ {% if evaluated_administrative_criteria.review_state == 'PENDING' %} +
+ {% csrf_token %} + +
+
+ {% csrf_token %} + +
+ {% else %} +
+ {% csrf_token %} + +
+ {% endif %} +
+ {% endif %}
diff --git a/itou/templates/siae_evaluations/includes/job_seeker_infos_for_institution.html b/itou/templates/siae_evaluations/includes/job_seeker_infos_for_institution.html index 81b2f4f6a26..79784a372ab 100644 --- a/itou/templates/siae_evaluations/includes/job_seeker_infos_for_institution.html +++ b/itou/templates/siae_evaluations/includes/job_seeker_infos_for_institution.html @@ -1,64 +1,63 @@ {% load format_filters %} -
-
-

- Auto-prescription pour - {{ job_seeker.get_full_name }} -

-

- PASS IAE : {{ approval.number|format_approval_number }} délivré le {{ approval.start_at|date:"d E Y" }} -

+ +
+
+ +
+

PASS IAE {{ approval.number|format_approval_number }} délivré le {{ approval.start_at|date:"d E Y" }}

+ {{ job_seeker.get_full_name }} +
-
+
{% if evaluated_siae.evaluation_is_final %} {% if state == "PENDING" %} -

Non téléversés

+ Non téléversés {% elif state == "PROCESSING" %} -

Téléversement incomplet

+ Téléversement incomplet {% elif state == "UPLOADED" %} -

Justificatifs téléversés

+ Justificatifs téléversés {% elif state == "SUBMITTED" %} -

Justificatifs non contrôlés

+ Justificatifs non contrôlés {% elif state == "ACCEPTED" %} -

Validé

+ Validé {% elif state == "REFUSED" or state == "REFUSED_2" %} -

Problème constaté

+ Problème constaté {% endif %} {% else %} {% if state == "PENDING" or state == "PROCESSING" %} {% if evaluated_siae.submission_freezed_at %} -

Justificatifs non transmis

+ Justificatifs non transmis {% else %} -

En attente

+ En attente {% endif %} {% elif state == "UPLOADED" %} {% if evaluated_siae.submission_freezed_at %} -

Justificatifs non transmis

+ Justificatifs non transmis {% else %} -

Justificatifs téléversés

+ Justificatifs téléversés {% endif %} {% elif state == "SUBMITTED" %} -

+ {% if reviewed_at %} Nouveaux justificatifs à traiter {% else %} À traiter {% endif %} -

+ {% elif state == "ACCEPTED" %} -

Validé

+ Validé {% elif state == "REFUSED" %} {% if reviewed_at %} -

Phase contradictoire - En attente

+ Phase contradictoire - En attente {% else %} {% comment %} Show “Problème constaté” until the review is submitted, which starts the “phase contradictoire” (tracked by the reviewed_at field). {% endcomment %} -

Problème constaté

+ Problème constaté {% endif %} {% elif state == "REFUSED_2" %} -

Problème constaté

+ Problème constaté {% endif %} {% endif %}
diff --git a/itou/templates/siae_evaluations/includes/job_seeker_infos_for_siae.html b/itou/templates/siae_evaluations/includes/job_seeker_infos_for_siae.html index 0fc6952521d..a6e49bca819 100644 --- a/itou/templates/siae_evaluations/includes/job_seeker_infos_for_siae.html +++ b/itou/templates/siae_evaluations/includes/job_seeker_infos_for_siae.html @@ -1,47 +1,40 @@ {% load format_filters %} -
-
-

- Auto-prescription pour - {{ job_seeker.get_full_name }} -

+ +
+
+ +
+

PASS IAE {{ approval.number|format_approval_number }} délivré le {{ approval.start_at|date:"d E Y" }}

+ {{ job_seeker.get_full_name }} +
-
+
{% if state == "REFUSED_2" %} -

problème constaté

- + Problème constaté {% elif reviewed_at %} {% if state == "ACCEPTED" %} -

validé

+ Validé {% elif state == "UPLOADED" %} -

justificatifs téléversés

+ Justificatifs téléversés {% elif state == "SUBMITTED" %} -

transmis

+ Transmis {% elif state == "REFUSED" %} -

problème constaté

+ Problème constaté {% elif state == "PROCESSING" %} -

à traiter

+ À traiter {% else %} -

nouveaux justificatifs à traiter

+ Nouveaux justificatifs à traiter {% endif %} - {% else %} {% if state == "PENDING" %} -

à traiter

+ À traiter {% elif state == "PROCESSING" %} -

en cours

+ En cours {% elif state == "UPLOADED" %} -

justificatifs téléversés

+ Justificatifs téléversés {% elif state == "SUBMITTED" or state == "REFUSED" or state == "ACCEPTED" %} -

transmis

+ Transmis {% endif %} {% endif %}
-
-
-

- PASS IAE : {{ approval.number|format_approval_number }} délivré le {{ approval.start_at|date:"d E Y" }} -

-
-
diff --git a/itou/templates/siae_evaluations/includes/list_item.html b/itou/templates/siae_evaluations/includes/list_item.html index d16277caaaa..9a7697c2bfa 100644 --- a/itou/templates/siae_evaluations/includes/list_item.html +++ b/itou/templates/siae_evaluations/includes/list_item.html @@ -1,64 +1,74 @@ -
- {# navigation : anchor to scroll to a specific card when returning to this page #} - -
+{% load str_filters %} + +{# navigation : anchor to scroll to a specific card when returning to this page #} +