diff --git a/app/scodoc/html_sidebar.py b/app/scodoc/html_sidebar.py index 4dabbfe8..5ec2ae26 100644 --- a/app/scodoc/html_sidebar.py +++ b/app/scodoc/html_sidebar.py @@ -83,22 +83,19 @@ def sidebar(): from app.scodoc import sco_abs from app.scodoc import sco_etud - params = { - "ScoURL": scu.ScoURL(), - "SCO_USER_MANUAL": scu.SCO_USER_MANUAL, - } + params = {} - H = ['
', sidebar_common()] - - H.append( - """
Chercher étudiant:
-
-
-
-
-""" - % params - ) + H = [ + f"""
+ { sidebar_common() } +
Chercher étudiant:
+
+
+
+
+ """ + ] # ---- Il y-a-t-il un etudiant selectionné ? etudid = None if request.method == "GET": @@ -121,59 +118,50 @@ def sidebar(): % params ) if etud["cursem"]: - params["nbabs"], params["nbabsjust"] = sco_abs.get_abs_count( - etudid, etud["cursem"] - ) - params["nbabsnj"] = params["nbabs"] - params["nbabsjust"] - params["date_debut"] = etud["cursem"]["date_debut"] - params["date_fin"] = etud["cursem"]["date_fin"] + cur_sem = etud["cursem"] + nbabs, nbabsjust = sco_abs.get_abs_count(etudid, cur_sem) + nbabsnj = nbabs - nbabsjust H.append( - """(1/2 j.)
%(nbabsjust)s J., %(nbabsnj)s N.J.""" - % params + f"""(1/2 j.) +
{ nbabsjust } J., { nbabsnj } N.J.""" ) - H.append(" """ -
  • Calendrier
    • -
  • Liste
    • - -""" - % params ) else: pass # H.append("(pas d'étudiant en cours)") # --------- H.append("
    ") # /etud-insidebar # Logo - scologo_img = scu.icontag("scologo_img") H.append( - '
    ' % scologo_img + f"""
    +
    À propos
    + Aide +
    + +
    + + """ ) - H.append( - """
    - -
    -""" - % params - ) # ' - # return "".join(H) diff --git a/app/scodoc/sco_utils.py b/app/scodoc/sco_utils.py index 2447c4e8..b897110f 100644 --- a/app/scodoc/sco_utils.py +++ b/app/scodoc/sco_utils.py @@ -672,14 +672,14 @@ def graph_from_edges(edges, graph_name="mygraph"): ICONSIZES = {} # name : (width, height) cache image sizes -def icontag(name, file_format="png", **attrs): +def icontag(name, file_format="png", no_size=False, **attrs): """tag HTML pour un icone. (dans les versions anterieures on utilisait Zope) Les icones sont des fichiers PNG dans .../static/icons Si la taille (width et height) n'est pas spécifiée, lit l'image pour la mesurer (et cache le résultat). """ - if ("width" not in attrs) or ("height" not in attrs): + if (not no_size) and (("width" not in attrs) or ("height" not in attrs)): if name not in ICONSIZES: img_file = os.path.join( Config.SCODOC_DIR, diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css index 95b332bd..4c59e331 100644 --- a/app/static/css/scodoc.css +++ b/app/static/css/scodoc.css @@ -253,6 +253,13 @@ div.logo-insidebar { div.logo-logo { text-align: center ; } +div.logo-logo img { + margin-top: 20px; + width: 100px; +} +div.sidebar-bottom { + margin-top: 10px; +} div.etud_info_div { border: 2px solid gray; diff --git a/app/static/icons/scologo_img.png b/app/static/icons/scologo_img.png index a7047856..b0871c44 100644 Binary files a/app/static/icons/scologo_img.png and b/app/static/icons/scologo_img.png differ diff --git a/sco_version.py b/sco_version.py index fda1b3c7..412da12c 100644 --- a/sco_version.py +++ b/sco_version.py @@ -1,7 +1,7 @@ # -*- mode: python -*- # -*- coding: utf-8 -*- -SCOVERSION = "9.0.12" +SCOVERSION = "9.0.13" SCONAME = "ScoDoc"