From 0d2471ce8daa237d60fb0f5cb4af3c8386f33509 Mon Sep 17 00:00:00 2001
From: ilona <ilona@scodoc.org>
Date: Wed, 23 Oct 2024 11:16:48 +0200
Subject: [PATCH] =?UTF-8?q?Cosm=C3=A9tique:=20variable=20sco-deep-blue,=20?=
=?UTF-8?q?liens=20formsemestre=5Fstatus.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/scodoc/sco_formsemestre_status.py | 7 ++++++-
app/static/css/scodoc.css | 28 +++++++++++++++++----------
app/static/css/scodoc97.css | 2 +-
app/templates/sidebar.j2 | 2 +-
app/views/notes.py | 2 +-
sco_version.py | 2 +-
6 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/app/scodoc/sco_formsemestre_status.py b/app/scodoc/sco_formsemestre_status.py
index bb8d3376..784a815d 100755
--- a/app/scodoc/sco_formsemestre_status.py
+++ b/app/scodoc/sco_formsemestre_status.py
@@ -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"""
<tr class="{tr_classes}">
@@ -1316,7 +1321,7 @@ def formsemestre_tableau_modules(
href="{moduleimpl_status_url}"
title="{mod_descr}" class="stdlink">{mod.code}</a></td>
<td class="scotext"><a href="{moduleimpl_status_url}" title="{mod_descr}"
- class="formsemestre_status_link">{mod.abbrev or mod.titre or ""}</a>
+ class="{classes}">{mod.abbrev or mod.titre or ""}</a>
</td>
<td class="formsemestre_status_inscrits">{mod_nb_inscrits}</td>
<td class="resp scotext">
diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css
index 19fb7645..5a58302c 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 {
@@ -182,7 +183,7 @@ div#gtrcontent {
.gtrcontent a,
.gtrcontent a:visited {
- color: rgb(4, 16, 159);
+ color: var(--sco-deep-blue);
text-decoration: none;
}
@@ -1083,7 +1084,7 @@ span.linktitresem a:visited {
a.stdlink,
a.stdlink:visited {
- color: blue;
+ color: var(--sco-deep-blue);
text-decoration: underline;
}
@@ -1532,7 +1533,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;
}
@@ -1989,7 +1990,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 +2001,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;
}
diff --git a/app/static/css/scodoc97.css b/app/static/css/scodoc97.css
index d1300794..97164121 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/sidebar.j2 b/app/templates/sidebar.j2
index 62e81737..040975d9 100755
--- a/app/templates/sidebar.j2
+++ b/app/templates/sidebar.j2
@@ -114,7 +114,7 @@
{{ sco.SCOVERSION }}
</div>
{% if DEBUG %}
- <div style="color:gold; background-color:navy; margin-top: 8px;">DEBUG</div>
+ <div style="color:gold; background-color: var(--sco-deep-blue); margin-top: 8px;">DEBUG</div>
{% endif %}
</div>
<!-- end of sidebar -->
diff --git a/app/views/notes.py b/app/views/notes.py
index 36cd044a..03a4c531 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"""<ul><li><b>{
+ f"""<ul class="sco-links"><li><b>{
uid2display.get(modimpl.responsable_id, modimpl.responsable_id)
}</b> (responsable)</li>"""
]
diff --git a/sco_version.py b/sco_version.py
index ec2d66b1..90af92cb 100644
--- a/sco_version.py
+++ b/sco_version.py
@@ -3,7 +3,7 @@
"Infos sur version ScoDoc"
-SCOVERSION = "9.7.33"
+SCOVERSION = "9.7.34"
SCONAME = "ScoDoc"
--
GitLab