diff --git a/app/__init__.py b/app/__init__.py index 6f945178..7998f19a 100755 --- a/app/__init__.py +++ b/app/__init__.py @@ -19,11 +19,7 @@ from flask import current_app, g, request from flask import Flask from flask import abort, flash, has_request_context from flask import render_template - -# from flask.json import JSONEncoder from flask.logging import default_handler - -from flask_bootstrap import Bootstrap from flask_caching import Cache from flask_json import FlaskJSON, json_response from flask_login import LoginManager, current_user @@ -34,6 +30,7 @@ from flask_sqlalchemy import SQLAlchemy from jinja2 import select_autoescape import sqlalchemy as sa import werkzeug.debug +from wtforms.fields import HiddenField from flask_cas import CAS @@ -59,8 +56,6 @@ login.login_view = "auth.login" login.login_message = "Identifiez-vous pour accéder à cette page." mail = Mail() -bootstrap = Bootstrap() -# moment = Moment() CACHE_TYPE = os.environ.get("CACHE_TYPE") cache = Cache( @@ -304,7 +299,6 @@ def create_app(config_class=DevConfig): login.init_app(app) mail.init_app(app) app.extensions["mail"].debug = 0 # disable copy of mails to stderr - bootstrap.init_app(app) cache.init_app(app) sco_cache.CACHE = cache if CACHE_TYPE: # non default @@ -320,6 +314,12 @@ def create_app(config_class=DevConfig): app.register_error_handler(503, postgresql_server_error) app.register_error_handler(APIInvalidParams, handle_invalid_usage) + # Add some globals + # previously in Flask-Bootstrap: + app.jinja_env.globals["bootstrap_is_hidden_field"] = lambda field: isinstance( + field, HiddenField + ) + from app.auth import bp as auth_bp app.register_blueprint(auth_bp, url_prefix="/auth") @@ -549,8 +549,8 @@ def truncate_database(): CREATE OR REPLACE FUNCTION reset_sequences(username IN VARCHAR) RETURNS void AS $$ DECLARE statements CURSOR FOR - SELECT sequence_name - FROM information_schema.sequences + SELECT sequence_name + FROM information_schema.sequences ORDER BY sequence_name ; BEGIN FOR stmt IN statements LOOP diff --git a/app/scodoc/html_sco_header.py b/app/scodoc/html_sco_header.py index fd627370..2585c887 100644 --- a/app/scodoc/html_sco_header.py +++ b/app/scodoc/html_sco_header.py @@ -95,7 +95,7 @@ _HTML_BEGIN = f""" %(page_title)s - + @@ -212,7 +212,7 @@ def sco_header( """ ) diff --git a/app/static/libjs/bootstrap b/app/static/libjs/bootstrap new file mode 120000 index 00000000..bb069c26 --- /dev/null +++ b/app/static/libjs/bootstrap @@ -0,0 +1 @@ +bootstrap-3.1.1-dist \ No newline at end of file diff --git a/app/templates/about.j2 b/app/templates/about.j2 index 6b5e95b7..b78172cf 100644 --- a/app/templates/about.j2 +++ b/app/templates/about.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %} @@ -12,7 +12,7 @@

ScoDoc est un logiciel libre écrit en Python. - Information et documentation sur + Information et documentation sur Chargement des configurations CAS des utilisateurs @@ -17,15 +17,15 @@

  • Vous modifiez cette feuille avec votre logiciel préféré. Vous pouvez supprimer des lignes, mais pas en ajouter.
    - On peut remplir ou modifier le contenu des colonnes active, + On peut remplir ou modifier le contenu des colonnes active, cas_id, cas_allow_login, cas_allow_scodoc_login, et email_institutionnel
    - Les autres colonnes sont là pour information et seront ignorées à l'import, + Les autres colonnes sont là pour information et seront ignorées à l'import, sauf évidemment user_name qui sert à repérer l'utilisateur.
    - (Note: active active ou désactive le compte, sans lien avec CAS, mais il - est commode de réviser la liste des utilisateurs actifs à l'occasion de la configuration CAS. + (Note: active active ou désactive le compte, sans lien avec CAS, mais il + est commode de réviser la liste des utilisateurs actifs à l'occasion de la configuration CAS. Pareil pour email_institutionnel)
    • @@ -49,4 +49,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/auth/change_password.j2 b/app/templates/auth/change_password.j2 index 67509f3d..7b9d13c9 100644 --- a/app/templates/auth/change_password.j2 +++ b/app/templates/auth/change_password.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends "base.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% macro render_field(field, auth_name=None) %} @@ -50,4 +50,4 @@ L'accès à ScoDoc est strictement réservé aux personnels de l'établissement. Les étudiants n'y ont pas accès. Pour toute information, contactez la personne responsable de votre établissement.

    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/auth/register.j2 b/app/templates/auth/register.j2 index 0c1c1b03..72eefedb 100644 --- a/app/templates/auth/register.j2 +++ b/app/templates/auth/register.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends "base.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %}

    Création utilisateur

    @@ -9,4 +9,4 @@ {{ wtf.quick_form(form) }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/auth/reset_password.j2 b/app/templates/auth/reset_password.j2 index 8d0f0236..3b03c76f 100644 --- a/app/templates/auth/reset_password.j2 +++ b/app/templates/auth/reset_password.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends "base.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %}

    Changez votre mot de passe ScoDoc

    @@ -14,4 +14,4 @@ {{ wtf.quick_form(form) }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/auth/reset_password_request.j2 b/app/templates/auth/reset_password_request.j2 index 291d89a3..78460f63 100644 --- a/app/templates/auth/reset_password_request.j2 +++ b/app/templates/auth/reset_password_request.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends "base.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %}

    Demande d'un nouveau mot de passe

    @@ -11,13 +11,13 @@ {% if is_cas_enabled %}
    -

    Attention: ce mécanisme permet de changer le mot de passe ScoDoc +

    Attention: ce mécanisme permet de changer le mot de passe ScoDoc mais ne changera pas votre mot de passe sur le système de l'établissement.

    - Si vous vous connectez via vos identifiants de l'université (CAS), passez + Si vous vous connectez via vos identifiants de l'université (CAS), passez par la procédure de celle-ci (ENT ou autre).

    {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/auth/toogle_active_user.j2 b/app/templates/auth/toogle_active_user.j2 index 7f313336..e228ae5e 100644 --- a/app/templates/auth/toogle_active_user.j2 +++ b/app/templates/auth/toogle_active_user.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends "base.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %}

    {{ "Désactiver" if u.active else "Activer" }} l'utilisateur {{ u.get_nomplogin() }} ?

    @@ -15,4 +15,4 @@ {{ wtf.quick_form(form) }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/auth/user_info_page.j2 b/app/templates/auth/user_info_page.j2 index ff008361..8a6cb7f6 100644 --- a/app/templates/auth/user_info_page.j2 +++ b/app/templates/auth/user_info_page.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends "base.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %} @@ -45,14 +45,14 @@ or current_user.has_permission(Permission.UsersAdmin, user.dept) ) %}
  • modifier le mot de passe ou l'adresse mail
    • {% endif %} {% if current_user.has_permission(Permission.UsersAdmin, dept) %}
  • modifier ce compte et ses rôles
    • @@ -62,7 +62,7 @@ or current_user.has_permission(Permission.UsersAdmin, user.dept) ) %}
  • {{"désactiver" if user.active else "activer"}} ce compte
    • @@ -105,4 +105,4 @@ {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/babase.j2 b/app/templates/babase.j2 new file mode 100644 index 00000000..96591cc2 --- /dev/null +++ b/app/templates/babase.j2 @@ -0,0 +1,34 @@ +{% block doc -%} + + +{%- block html %} + + {%- block head %} + {% block title %}{{title|default}}{% endblock title %} + + {%- block metas %} + + {%- endblock metas %} + + {%- block styles %} + + + {%- endblock styles %} + {%- endblock head %} + + + {% block body -%} + {% block navbar %} + {%- endblock navbar %} + {% block content -%} + {%- endblock content %} + + {% block scripts %} + + + {%- endblock scripts %} + {%- endblock body %} + +{%- endblock html %} + +{% endblock doc -%} diff --git a/app/templates/base.j2 b/app/templates/base.j2 index c0cfbe82..ab720753 100644 --- a/app/templates/base.j2 +++ b/app/templates/base.j2 @@ -1,5 +1,5 @@ {# -*- mode: jinja-html -*- #} -{% extends 'bootstrap/base.html' %} +{% extends 'babase.j2' %} {% block styles %} {{super()}} @@ -32,8 +32,8 @@
  • Configuration
    • {% endif %} {% if g.scodoc_dept %} -
  • Dept. {{ g.scodoc_dept }}
    • {% endif %} {% if not current_user.is_anonymous and @@ -92,6 +92,6 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/but/formsemestre_validation_auto_but.j2 b/app/templates/but/formsemestre_validation_auto_but.j2 index 0f8e827b..72570ae5 100644 --- a/app/templates/but/formsemestre_validation_auto_but.j2 +++ b/app/templates/but/formsemestre_validation_auto_but.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends "sco_page.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block styles %} {{super()}} @@ -53,4 +53,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/but/refcomp_assoc.j2 b/app/templates/but/refcomp_assoc.j2 index 527a93bb..8eb4c075 100644 --- a/app/templates/but/refcomp_assoc.j2 +++ b/app/templates/but/refcomp_assoc.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends "base.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %}

    Associer un référentiel de compétences

    @@ -15,7 +15,7 @@ Référentiel actuellement associé: {% if formation.referentiel_competence is not none %} {{ formation.referentiel_competence.specialite_long }} - supprimer {% else %} @@ -35,4 +35,4 @@ }}">passer par cette page. -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/but/refcomp_load.j2 b/app/templates/but/refcomp_load.j2 index 18cf30ae..b6c88cef 100644 --- a/app/templates/but/refcomp_load.j2 +++ b/app/templates/but/refcomp_load.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends "base.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %}

    Charger un référentiel de compétences

    @@ -28,4 +28,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/but/refcomp_table.j2 b/app/templates/but/refcomp_table.j2 index b1b1a5ca..0c7585dc 100644 --- a/app/templates/but/refcomp_table.j2 +++ b/app/templates/but/refcomp_table.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends "sco_page.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %}

    Référentiels de compétences chargés

    @@ -32,4 +32,4 @@ ScoDoc importe le format XML généré par Orébut, et peut exporter une représentation JSON.

    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/config_cas.j2 b/app/templates/config_cas.j2 index 05fb2158..b1d532f8 100644 --- a/app/templates/config_cas.j2 +++ b/app/templates/config_cas.j2 @@ -1,5 +1,5 @@ {% extends "base.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %}

    Configuration du Service d'Authentification Central (CAS)

    diff --git a/app/templates/config_codes_decisions.j2 b/app/templates/config_codes_decisions.j2 index 8bdd338d..352f9835 100644 --- a/app/templates/config_codes_decisions.j2 +++ b/app/templates/config_codes_decisions.j2 @@ -1,5 +1,5 @@ {% extends "base.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %}

    Configuration des codes de décision exportés vers Apogée

    @@ -20,4 +20,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/config_logos.j2 b/app/templates/config_logos.j2 index 918c1f9a..7d0fdd01 100644 --- a/app/templates/config_logos.j2 +++ b/app/templates/config_logos.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% macro render_field(field, with_label=True) %}
    @@ -130,4 +130,4 @@ {% endfor %}
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/config_personalized_links.j2 b/app/templates/config_personalized_links.j2 index ff3a7f61..cea3e612 100644 --- a/app/templates/config_personalized_links.j2 +++ b/app/templates/config_personalized_links.j2 @@ -1,5 +1,5 @@ {% extends "base.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block styles %} {{super()}} @@ -81,4 +81,4 @@ div.validation-buttons { -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/configuration.j2 b/app/templates/configuration.j2 index 7c06908a..fe774303 100644 --- a/app/templates/configuration.j2 +++ b/app/templates/configuration.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% macro render_field(field, with_label=True) %}
    diff --git a/app/templates/confirm_dialog.j2 b/app/templates/confirm_dialog.j2 index 4755ed10..d9942520 100644 --- a/app/templates/confirm_dialog.j2 +++ b/app/templates/confirm_dialog.j2 @@ -1,5 +1,5 @@ {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %} @@ -18,4 +18,4 @@
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/create_dept.j2 b/app/templates/create_dept.j2 index 75887a4c..858acc86 100644 --- a/app/templates/create_dept.j2 +++ b/app/templates/create_dept.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends "base.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %}

    Créer un département

    @@ -12,4 +12,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/entreprises/form.j2 b/app/templates/entreprises/form.j2 index e5311778..d5a8c37e 100644 --- a/app/templates/entreprises/form.j2 +++ b/app/templates/entreprises/form.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block styles %} {{super()}} @@ -59,4 +59,4 @@ var as_utilisateurs = new bsn.AutoSuggest('utilisateur', responsables_options); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/entreprises/form_ajout_correspondants.j2 b/app/templates/entreprises/form_ajout_correspondants.j2 index ada71b15..9bc6cff6 100644 --- a/app/templates/entreprises/form_ajout_correspondants.j2 +++ b/app/templates/entreprises/form_ajout_correspondants.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block styles %} {{super()}} @@ -88,4 +88,4 @@ } } -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/entreprises/form_ajout_entreprise.j2 b/app/templates/entreprises/form_ajout_entreprise.j2 index bdd32aef..89f36201 100644 --- a/app/templates/entreprises/form_ajout_entreprise.j2 +++ b/app/templates/entreprises/form_ajout_entreprise.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %}

    Ajout entreprise

    @@ -55,4 +55,4 @@ document.getElementById("ville").value = '' } -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/entreprises/form_ajout_stage_apprentissage.j2 b/app/templates/entreprises/form_ajout_stage_apprentissage.j2 index 071e4d1f..a8881d4b 100644 --- a/app/templates/entreprises/form_ajout_stage_apprentissage.j2 +++ b/app/templates/entreprises/form_ajout_stage_apprentissage.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block styles %} {{super()}} diff --git a/app/templates/entreprises/form_envoi_offre.j2 b/app/templates/entreprises/form_envoi_offre.j2 index ab1be632..1490d88a 100644 --- a/app/templates/entreprises/form_envoi_offre.j2 +++ b/app/templates/entreprises/form_envoi_offre.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block styles %} {{super()}} @@ -72,7 +72,7 @@
    Retirer
    - + `); var as_r = new bsn.AutoSuggest(newFieldName, responsables_options); }); @@ -85,4 +85,4 @@ } } -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/entreprises/form_modification_entreprise.j2 b/app/templates/entreprises/form_modification_entreprise.j2 index 8f325ff8..3c690777 100644 --- a/app/templates/entreprises/form_modification_entreprise.j2 +++ b/app/templates/entreprises/form_modification_entreprise.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block styles %} {{super()}} @@ -65,4 +65,4 @@ document.getElementById("ville").value = response.etablissement.libelle_commune } -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/entreprises/form_validate_confirmation.j2 b/app/templates/entreprises/form_validate_confirmation.j2 index d41f19d6..9fa4272c 100644 --- a/app/templates/entreprises/form_validate_confirmation.j2 +++ b/app/templates/entreprises/form_validate_confirmation.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %}

    Validation entreprise

    @@ -12,4 +12,4 @@ {{ wtf.quick_form(form) }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/entreprises/import_donnees.j2 b/app/templates/entreprises/import_donnees.j2 index be3a7dfa..3344a629 100644 --- a/app/templates/entreprises/import_donnees.j2 +++ b/app/templates/entreprises/import_donnees.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block styles %} {{super()}} @@ -195,7 +195,7 @@ Code postal : {{ entreprise.codepostal }}
    Ville : {{ entreprise.ville }}
    Pays : {{ entreprise.pays }}
    - Fiche entreprise @@ -222,7 +222,7 @@ Code postal : {{ site.codepostal }}
    Ville : {{ site.ville }}
    Pays : {{ site.pays }}
    - Fiche entreprise @@ -264,4 +264,4 @@ {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/entreprises/preferences.j2 b/app/templates/entreprises/preferences.j2 index 8fb5a861..2658f1ca 100644 --- a/app/templates/entreprises/preferences.j2 +++ b/app/templates/entreprises/preferences.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %} {% include 'entreprises/nav.j2' %} @@ -14,4 +14,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/error_500.j2 b/app/templates/error_500.j2 index 790aff3e..9a02d0ef 100644 --- a/app/templates/error_500.j2 +++ b/app/templates/error_500.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block title %}Une erreur est survenue !{% endblock %} @@ -12,14 +12,14 @@

    {{date}}

    Si le problème persiste, contacter l'administrateur de votre site, - ou l'assistance sur le canal Discord.

    {% if 'scodoc_dept' in g %}

    Pour aider à corriger le problème, nous vous remercions d'envoyer ce rapport d'erreur (qui contient des données anonymisées sur votre configuration): -

    @@ -38,4 +38,4 @@ retour à la page d'accueil

    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/error_access_denied.j2 b/app/templates/error_access_denied.j2 index 92cf9ec8..c14a2c8a 100644 --- a/app/templates/error_access_denied.j2 +++ b/app/templates/error_access_denied.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %} @@ -17,4 +17,4 @@ {% endif %}

    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/error_csrf.j2 b/app/templates/error_csrf.j2 index 2633c86e..83e5f736 100644 --- a/app/templates/error_csrf.j2 +++ b/app/templates/error_csrf.j2 @@ -1,5 +1,5 @@ {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %} @@ -15,4 +15,4 @@
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/form_confirmation.j2 b/app/templates/form_confirmation.j2 index 47b6d315..5b6e31b3 100644 --- a/app/templates/form_confirmation.j2 +++ b/app/templates/form_confirmation.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %}

    {{ title }}

    @@ -12,4 +12,4 @@ {{ wtf.quick_form(form) }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/formation/ue_assoc_parcours_ects.j2 b/app/templates/formation/ue_assoc_parcours_ects.j2 index d7ea10ba..290d0d16 100644 --- a/app/templates/formation/ue_assoc_parcours_ects.j2 +++ b/app/templates/formation/ue_assoc_parcours_ects.j2 @@ -1,6 +1,6 @@ {# Association d'ECTS à une UE par parcours #} {% extends "sco_page.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block styles %} {{super()}} diff --git a/app/templates/formsemestre/change_formation.j2 b/app/templates/formsemestre/change_formation.j2 index 8c0b8b5b..b0e8c9e0 100644 --- a/app/templates/formsemestre/change_formation.j2 +++ b/app/templates/formsemestre/change_formation.j2 @@ -1,5 +1,5 @@ {% extends "sco_page.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block styles %} {{super()}} diff --git a/app/templates/formsemestre/edit_modimpls_codes.j2 b/app/templates/formsemestre/edit_modimpls_codes.j2 index d70b6e28..a663207d 100644 --- a/app/templates/formsemestre/edit_modimpls_codes.j2 +++ b/app/templates/formsemestre/edit_modimpls_codes.j2 @@ -1,5 +1,5 @@ {% extends "sco_page.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block styles %} {{super()}} diff --git a/app/templates/formsemestre/edt.j2 b/app/templates/formsemestre/edt.j2 index 267d05e8..0c4edce7 100644 --- a/app/templates/formsemestre/edt.j2 +++ b/app/templates/formsemestre/edt.j2 @@ -1,5 +1,5 @@ {% extends "sco_page.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block styles %} {{super()}} diff --git a/app/templates/main/index.j2 b/app/templates/main/index.j2 index 9298d86b..ca2408bb 100644 --- a/app/templates/main/index.j2 +++ b/app/templates/main/index.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %} @@ -54,4 +54,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/sco_page.j2 b/app/templates/sco_page.j2 index 7cbfd96b..6cc4a863 100644 --- a/app/templates/sco_page.j2 +++ b/app/templates/sco_page.j2 @@ -1,5 +1,5 @@ {# -*- mode: jinja-html -*- #} -{% extends 'bootstrap/base.html' %} +{% extends 'babase.j2' %} {% block styles %} {{super()}} @@ -52,7 +52,7 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/scodoc.j2 b/app/templates/scodoc.j2 index e62102ff..235835d2 100644 --- a/app/templates/scodoc.j2 +++ b/app/templates/scodoc.j2 @@ -1,6 +1,6 @@ {# -*- mode: jinja-html -*- #} {% extends 'base.j2' %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %}

    ScoDoc 9 - suivi scolarité

    @@ -53,7 +53,7 @@ {% endif %} - @@ -63,4 +63,4 @@ le logiciel libre ScoDoc. -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/scodoc/forms/placement.j2 b/app/templates/scodoc/forms/placement.j2 index 7631b743..7cb5b482 100644 --- a/app/templates/scodoc/forms/placement.j2 +++ b/app/templates/scodoc/forms/placement.j2 @@ -1,4 +1,4 @@ -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% macro render_field(field) %} @@ -77,4 +77,4 @@ - \ No newline at end of file + diff --git a/app/templates/scodoc/role_create.j2 b/app/templates/scodoc/role_create.j2 index 9c21b5d6..4f2627e7 100644 --- a/app/templates/scodoc/role_create.j2 +++ b/app/templates/scodoc/role_create.j2 @@ -1,12 +1,12 @@ {# -*- mode: jinja-html -*- #} {% extends "base.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block app_content %}

    Créer un rôle

    -Un rôle est associé à un ensemble de permissions. +Un rôle est associé à un ensemble de permissions. Les utilisateurs peuvent avoir un ou plusieurs rôles dans chaque département.
    @@ -19,4 +19,4 @@ Les utilisateurs peuvent avoir un ou plusieurs rôles dans chaque département. -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/scodoc/role_editor.j2 b/app/templates/scodoc/role_editor.j2 index 9656291c..9439887b 100644 --- a/app/templates/scodoc/role_editor.j2 +++ b/app/templates/scodoc/role_editor.j2 @@ -1,7 +1,7 @@ {# -*- mode: jinja-html -*- #} {# -*- Edition des rôles/permissions -*- #} {% extends "base.j2" %} -{% import 'bootstrap/wtf.html' as wtf %} +{% import 'wtf.j2' as wtf %} {% block styles %} {{super()}} @@ -14,7 +14,7 @@
    Les rôles sont associés à un ensemble de permissions. Chaque utilisateur peut avoir un nombre quelconque de rôles dans chaque -département. +département. Sur cette page vous pouvez modifier les permissions associée à chaque rôle, ou créer de nouveaux rôles. Les rôles en gras sont les rôles standards de ScoDoc. @@ -38,7 +38,7 @@ Les rôles en gras sont les rôles standards de ScoDoc.
    {% for permission_name in permissions_names %}
    -
    +