From cefca7e8c5b1e56c24f6082d3245907b0346af1c Mon Sep 17 00:00:00 2001 From: aurelien Date: Fri, 25 Jun 2021 11:14:06 +0200 Subject: [PATCH] =?UTF-8?q?Ajout=20d'id=20et=20de=20classes=20permettant?= =?UTF-8?q?=20aux=20tests=20S=C3=A9l=C3=A9nium=20de=20se=20r=C3=A9p=C3=A8r?= =?UTF-8?q?er=20par=20rapport=20au=20DOM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/TrivialFormulator.py | 2 +- app/scodoc/ZScoUsers.py | 2 +- app/scodoc/html_sidebar.py | 24 +++++++++++---------- app/scodoc/sco_dept.py | 2 +- app/scodoc/sco_etud.py | 8 +++++-- app/scodoc/sco_find_etud.py | 2 +- app/scodoc/sco_formations.py | 12 +++++------ app/scodoc/sco_formsemestre_inscriptions.py | 9 ++++++-- app/scodoc/sco_formsemestre_validation.py | 13 +++++++---- app/scodoc/sco_moduleimpl_status.py | 11 ++++++++-- app/scodoc/sco_page_etud.py | 6 +++--- app/views/notes.py | 2 +- 12 files changed, 58 insertions(+), 35 deletions(-) diff --git a/app/scodoc/TrivialFormulator.py b/app/scodoc/TrivialFormulator.py index dd279afa..881c0e08 100644 --- a/app/scodoc/TrivialFormulator.py +++ b/app/scodoc/TrivialFormulator.py @@ -760,6 +760,6 @@ def tf_error_message(msg): if type(msg) == StringType: msg = [msg] return ( - '' + '' % '
  • '.join(msg) ) diff --git a/app/scodoc/ZScoUsers.py b/app/scodoc/ZScoUsers.py index a8418ed4..046c3ecc 100644 --- a/app/scodoc/ZScoUsers.py +++ b/app/scodoc/ZScoUsers.py @@ -135,7 +135,7 @@ class ZScoUsers( if authuser.has_permission(Permission.ScoUsersAdmin, self): H.append( - '

    Ajouter un utilisateur' + '

    Ajouter un utilisateur' ) H.append( '   Importer des utilisateurs

    ' diff --git a/app/scodoc/html_sidebar.py b/app/scodoc/html_sidebar.py index 4083a75d..28ec7419 100644 --- a/app/scodoc/html_sidebar.py +++ b/app/scodoc/html_sidebar.py @@ -50,9 +50,9 @@ def sidebar_common(context, REQUEST=None): % params, sidebar_dept(context, REQUEST), """

    Scolarité

    - Semestres
    - Programmes
    - Absences
    + Semestres
    + Programmes
    + Absences
    """ % params, ] @@ -61,12 +61,13 @@ def sidebar_common(context, REQUEST=None): Permission.ScoUsersView ): H.append( - """Utilisateurs
    """ % params + """Utilisateurs
    """ + % params ) if authuser.has_permission(Permission.ScoChangePreferences): H.append( - """Paramétrage
    """ + """Paramétrage
    """ % params ) @@ -102,6 +103,7 @@ def sidebar(context, REQUEST=None): """

    %(civilite_str)s %(nom_disp)s

    +

    %(etudid)s

    Absences""" % params ) @@ -121,21 +123,21 @@ def sidebar(context, REQUEST=None): if REQUEST.AUTHENTICATED_USER.has_permission(Permission.ScoAbsChange): H.append( """ -
  • Ajouter
  • -
  • Justifier
  • -
  • Supprimer
  • +
  • Ajouter
  • +
  • Justifier
  • +
  • Supprimer
  • """ % params ) if sco_preferences.get_preference(context, "handle_billets_abs"): H.append( - """
  • Billets
  • """ + """
  • Billets
  • """ % params ) H.append( """ -
  • Calendrier
  • -
  • Liste
  • +
  • Calendrier
  • +
  • Liste
  • """ % params diff --git a/app/scodoc/sco_dept.py b/app/scodoc/sco_dept.py index 8461b890..5df1eec8 100644 --- a/app/scodoc/sco_dept.py +++ b/app/scodoc/sco_dept.py @@ -146,7 +146,7 @@ Chercher étape courante:

    Gestion des étudiants