diff --git a/app/forms/main/config_logos.py b/app/forms/main/config_logos.py index fcea427c..6529907d 100644 --- a/app/forms/main/config_logos.py +++ b/app/forms/main/config_logos.py @@ -47,9 +47,9 @@ from app.scodoc.sco_exceptions import ScoValueError from app.scodoc.sco_logos import find_logo -JAVASCRIPTS = html_sco_header.BOOTSTRAP_MULTISELECT_JS + [] +JAVASCRIPTS = html_sco_header.BOOTSTRAP_JS + [] -CSSSTYLES = html_sco_header.BOOTSTRAP_MULTISELECT_CSS +CSSSTYLES = html_sco_header.BOOTSTRAP_CSS # class ItemForm(FlaskForm): # """Unused Generic class to document common behavior for classes diff --git a/app/scodoc/html_sco_header.py b/app/scodoc/html_sco_header.py index 77149ca6..54e0176b 100644 --- a/app/scodoc/html_sco_header.py +++ b/app/scodoc/html_sco_header.py @@ -37,19 +37,8 @@ import sco_version # Some constants: - -# Multiselect menus are used on a few pages and not loaded by default -BOOTSTRAP_MULTISELECT_JS = [ - "libjs/bootstrap/js/bootstrap.min.js", - "libjs/bootstrap-multiselect-1.1.2/bootstrap-multiselect.min.js", - "libjs/purl.js", -] - -BOOTSTRAP_MULTISELECT_CSS = [ - "libjs/bootstrap/css/bootstrap.min.css", - "libjs/bootstrap/css/bootstrap-theme.min.css", - "libjs/bootstrap-multiselect-1.1.2/bootstrap-multiselect.min.css", -] +BOOTSTRAP_JS = ["libjs/bootstrap/js/bootstrap.min.js", "libjs/purl.js"] +BOOTSTRAP_CSS = ["libjs/bootstrap/css/bootstrap.min.css"] def standard_html_header(): diff --git a/app/scodoc/sco_edit_ue.py b/app/scodoc/sco_edit_ue.py index 4acc3043..0fbc05f3 100644 --- a/app/scodoc/sco_edit_ue.py +++ b/app/scodoc/sco_edit_ue.py @@ -28,6 +28,7 @@ """Ajout/Modification/Suppression UE """ + import re import sqlalchemy as sa @@ -765,9 +766,9 @@ def ue_table(formation_id=None, semestre_idx=1, msg=""): # was ue_list ) H = [ html_sco_header.sco_header( - cssstyles=html_sco_header.BOOTSTRAP_MULTISELECT_CSS + cssstyles=html_sco_header.BOOTSTRAP_CSS + ["libjs/jQuery-tagEditor/jquery.tag-editor.css", "css/ue_table.css"], - javascripts=html_sco_header.BOOTSTRAP_MULTISELECT_JS + javascripts=html_sco_header.BOOTSTRAP_JS + [ "libjs/jinplace-1.2.1.min.js", "js/ue_list.js", @@ -1129,9 +1130,7 @@ def _ue_table_ues( scodoc_dept=g.scodoc_dept, ue_id=ue["ue_id"], ) - ue[ - "code_apogee_str" - ] = f""", Apo: { ue["code_apogee"] or "" diff --git a/app/scodoc/sco_export_results.py b/app/scodoc/sco_export_results.py index b28bd63d..aaa707ab 100644 --- a/app/scodoc/sco_export_results.py +++ b/app/scodoc/sco_export_results.py @@ -73,9 +73,7 @@ def _build_results_table(start_date=None, end_date=None, types_parcours=[]): formsemestre_ids_parcours = [sem["formsemestre_id"] for sem in semlist_parcours] # Ensemble des étudiants - etuds_infos = ( - {} - ) # etudid : { formsemestre_id d'inscription le plus recent dans les dates considérées, etud } + etuds_infos = {} # etudid : { formsemestre_id d'inscription le plus recent dans les dates considérées, etud } for formsemestre_id in formsemestre_ids_parcours: formsemestre = FormSemestre.get_formsemestre(formsemestre_id) nt: NotesTableCompat = res_sem.load_formsemestre_results(formsemestre) @@ -287,9 +285,9 @@ def scodoc_table_results( H = [ html_sco_header.sco_header( page_title="Export résultats", - javascripts=html_sco_header.BOOTSTRAP_MULTISELECT_JS + javascripts=html_sco_header.BOOTSTRAP_JS + ["js/etud_info.js", "js/export_results.js"], - cssstyles=html_sco_header.BOOTSTRAP_MULTISELECT_CSS, + cssstyles=html_sco_header.BOOTSTRAP_CSS, ), # XXX """ @@ -326,9 +324,9 @@ _DATE_FORM = """
Types de parcours : - + diff --git a/app/templates/auth/login.j2 b/app/templates/auth/login.j2 index 57cb147b..10ea1491 100644 --- a/app/templates/auth/login.j2 +++ b/app/templates/auth/login.j2 @@ -33,7 +33,7 @@ div.small_form { {% endif %}
- {{ wtf.quick_form(form) }} + {{ wtf.quick_form(form, button_map={'submit':'secondary'}) }}
diff --git a/app/templates/auth/register.j2 b/app/templates/auth/register.j2 index 72eefedb..2f8fbe36 100644 --- a/app/templates/auth/register.j2 +++ b/app/templates/auth/register.j2 @@ -6,7 +6,7 @@

Création utilisateur

- {{ wtf.quick_form(form) }} + {{ wtf.quick_form(form, button_map={'submit':'secondary'}) }}
{% endblock %} diff --git a/app/templates/auth/reset_password.j2 b/app/templates/auth/reset_password.j2 index 3b03c76f..2d80f1e3 100644 --- a/app/templates/auth/reset_password.j2 +++ b/app/templates/auth/reset_password.j2 @@ -11,7 +11,7 @@
- {{ wtf.quick_form(form) }} + {{ wtf.quick_form(form, button_map={'submit':'secondary'}) }}
{% endblock %} diff --git a/app/templates/auth/reset_password_request.j2 b/app/templates/auth/reset_password_request.j2 index 78460f63..effefa39 100644 --- a/app/templates/auth/reset_password_request.j2 +++ b/app/templates/auth/reset_password_request.j2 @@ -6,7 +6,7 @@

Demande d'un nouveau mot de passe

- {{ wtf.quick_form(form) }} + {{ wtf.quick_form(form, button_map={'submit':'secondary'}) }}
{% if is_cas_enabled %} diff --git a/app/templates/auth/toogle_active_user.j2 b/app/templates/auth/toogle_active_user.j2 index e228ae5e..3cc4c284 100644 --- a/app/templates/auth/toogle_active_user.j2 +++ b/app/templates/auth/toogle_active_user.j2 @@ -12,7 +12,7 @@
- {{ wtf.quick_form(form) }} + {{ wtf.quick_form(form, button_map={'submit':'secondary'}) }}
{% endblock %} diff --git a/app/templates/entreprises/contacts.j2 b/app/templates/entreprises/contacts.j2 index 490d4bb6..95f277a4 100644 --- a/app/templates/entreprises/contacts.j2 +++ b/app/templates/entreprises/contacts.j2 @@ -50,7 +50,7 @@ {% if current_user.has_permission(current_user.Permission.RelationsEntrepEdit, None) %}
- Action + Action