From eb59ba57e7ea795a16dfcca78eec66fad6b9a67f Mon Sep 17 00:00:00 2001 From: ilona <ilona@scodoc.org> Date: Wed, 23 Oct 2024 11:22:26 +0200 Subject: [PATCH] =?UTF-8?q?Cosm=C3=A9tique:=20formsemestre=5Fnote=5Fetuds?= =?UTF-8?q?=5Fsans=5Fnote?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/sco_formsemestre_status.py | 2 +- app/static/css/scodoc.css | 9 +++++++-- app/templates/formsemestre/etuds_sans_notes.j2 | 16 +++++++++------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/app/scodoc/sco_formsemestre_status.py b/app/scodoc/sco_formsemestre_status.py index 784a815d..1d971fe8 100755 --- a/app/scodoc/sco_formsemestre_status.py +++ b/app/scodoc/sco_formsemestre_status.py @@ -779,7 +779,7 @@ def _make_listes_sem(formsemestre: FormSemestre) -> str: })</span></h3>""" ) # - H.append('<div class="sem-groups-abs space-before-18">') + H.append('<div class="sem-groups-abs space-before-8">') disable_abs: str | bool = scass.has_assiduites_disable_pref(formsemestre) show_abs: str = "hidden" if disable_abs else "" diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css index 5a58302c..bcba9fb3 100644 --- a/app/static/css/scodoc.css +++ b/app/static/css/scodoc.css @@ -64,6 +64,11 @@ div.sco-app-content { margin-bottom: 18px !important; } + +.space-before-8 { + margin-top: 8px !important; +} + .space-before-18 { margin-top: 18px !important; } @@ -1875,6 +1880,7 @@ div.formsemestre_status { border-radius: 8px; padding: 2px 6px 2px 16px; margin-right: 10px; + width: fit-content; } .formsemestre_status_warning, @@ -2074,8 +2080,7 @@ ul.ue_inscr_list li.etud { .sem-groups-abs { background-color: rgb(137, 137, 137); border-radius: 16px; - padding: 16px; - width: fit-content; + padding: 8px; } .sem-groups-abs h4 { diff --git a/app/templates/formsemestre/etuds_sans_notes.j2 b/app/templates/formsemestre/etuds_sans_notes.j2 index 96dc513a..602b1582 100644 --- a/app/templates/formsemestre/etuds_sans_notes.j2 +++ b/app/templates/formsemestre/etuds_sans_notes.j2 @@ -14,18 +14,20 @@ {% if not etuds %} <h3>aucun étudiant sans notes</h3> {% else %} - <h3>Étudiants sans notes:</h3> - <ul> + <h3>Étudiants sans notes :</h3> + <ul class="sco-links"> {% for etud in etuds %} <li> - <a href="{{ - url_for('scolar.fiche_etud', scodoc_dept=g.scodoc_dept, etudid=etud.id) - }}" class="discretelink">{{etud.nom_prenom()}}</a> + <a class="stdlink" href="{{ etud.url_fiche() | safe }}"> + {{etud.nom_prenom()}} + </a> </li> {% endfor %} </ul> - - <form class="sco-std-form" method="post"> + <div class="help"> + Ces étudiants n'ont aucune note dans le semestre. + </div> + <form class="sco-std-form space-before-18" method="post"> <input type="hidden" name="formsemestre_id" value="{{sco.formsemestre.id}}"> <input type="hidden" name="etudid" value="{{etudid or ''}}"> -- GitLab