diff --git a/app/scodoc/sco_formsemestre_status.py b/app/scodoc/sco_formsemestre_status.py index bb8d33763..1d971fe8e 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: })""" ) # - H.append('
') + H.append('
') disable_abs: str | bool = scass.has_assiduites_disable_pref(formsemestre) show_abs: str = "hidden" if disable_abs else "" @@ -1309,6 +1309,11 @@ def formsemestre_tableau_modules( tr_classes += " modimpl_non_conforme" if etat["nb_evals_blocked"] > 0: tr_classes += " modimpl_has_blocked" + classes = "formsemestre_status_link" + if current_user.id == modimpl.responsable_id or current_user.id in ( + u.id for u in modimpl.enseignants + ): + classes += " enseignant" H.append( f""" @@ -1316,7 +1321,7 @@ def formsemestre_tableau_modules( href="{moduleimpl_status_url}" title="{mod_descr}" class="stdlink">{mod.code} {mod.abbrev or mod.titre or ""} + class="{classes}">{mod.abbrev or mod.titre or ""} {mod_nb_inscrits} diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css index 19fb76456..bcba9fb3e 100644 --- a/app/static/css/scodoc.css +++ b/app/static/css/scodoc.css @@ -4,13 +4,14 @@ :root { --sco-content-min-width: 600px; --sco-content-max-width: 1024px; - --sco-color-explication: rgb(10, 58, 140); + --sco-deep-blue: rgb(4, 16, 159); + --sco-color-explication: rgb(4, 16, 159); --sco-color-background: rgb(242, 242, 238); --sco-color-box-bg: rgb(243, 240, 228); - --sco-color-mod-std: #afafc2; - --sco-color-ressources: #f8c844; - --sco-color-saes: #c6ffab; - --sco-color-ues: #0051a9; + --sco-color-mod-std: rgb(175, 175, 194); + --sco-color-ressources: rgb(248, 200, 68); + --sco-color-saes: rgb(198, 255, 171); + --sco-color-ues: rgb(0, 81, 169); } html, @@ -41,7 +42,7 @@ h3 { } body a { - color: rgb(4, 16, 159); + color: var(--sco-deep-blue); } details>summary:first-of-type { @@ -63,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; } @@ -182,7 +188,7 @@ div#gtrcontent { .gtrcontent a, .gtrcontent a:visited { - color: rgb(4, 16, 159); + color: var(--sco-deep-blue); text-decoration: none; } @@ -1083,7 +1089,7 @@ span.linktitresem a:visited { a.stdlink, a.stdlink:visited { - color: blue; + color: var(--sco-deep-blue); text-decoration: underline; } @@ -1532,7 +1538,7 @@ table.notes_evaluation tr td.tdlink a.discretelink:hover { table.notes_evaluation tr td.tdlink a.discretelink, table.notes_evaluation tr td.tdlink a.discretelink:visited { - color: blue; + color: var(--sco-deep-blue); text-decoration: underline; } @@ -1874,6 +1880,7 @@ div.formsemestre_status { border-radius: 8px; padding: 2px 6px 2px 16px; margin-right: 10px; + width: fit-content; } .formsemestre_status_warning, @@ -1989,7 +1996,8 @@ table.formsemestre_status td.malus a { color: red; } -a.formsemestre_status_link { +a.formsemestre_status_link, +a.formsemestre_status_link:visited { text-decoration: none; color: black; } @@ -1999,6 +2007,12 @@ a.formsemestre_status_link:hover { text-decoration: underline; } +a.formsemestre_status_link.enseignant, +a.formsemestre_status_link.enseignant:visited { + color: var(--sco-deep-blue); +} + + td.formsemestre_status_inscrits { text-align: center; } @@ -2066,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/static/css/scodoc97.css b/app/static/css/scodoc97.css index d1300794b..971641217 100644 --- a/app/static/css/scodoc97.css +++ b/app/static/css/scodoc97.css @@ -83,7 +83,7 @@ .scodoc-index a { font-size: 14pt; display: flex; - color: rgb(4, 16, 159); + color: var(--sco-deep-blue); width: 100%; } diff --git a/app/templates/formsemestre/etuds_sans_notes.j2 b/app/templates/formsemestre/etuds_sans_notes.j2 index 96dc513a5..602b1582e 100644 --- a/app/templates/formsemestre/etuds_sans_notes.j2 +++ b/app/templates/formsemestre/etuds_sans_notes.j2 @@ -14,18 +14,20 @@ {% if not etuds %}

aucun étudiant sans notes

{% else %} -

Étudiants sans notes:

-
{% if DEBUG %} -
DEBUG
+
DEBUG
{% endif %}
diff --git a/app/views/notes.py b/app/views/notes.py index 36cd044af..03a4c5310 100644 --- a/app/views/notes.py +++ b/app/views/notes.py @@ -976,7 +976,7 @@ def edit_enseignants_form(moduleimpl_id): allowed_user_names = list(uid2display.values()) H = [ - f"""