From 623de129533b9f8b5ffe1dd71146245358755e41 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Fri, 14 Apr 2023 23:36:36 +0200
Subject: [PATCH] scu dans templates

---
 app/static/css/scodoc.css         | 15 +++++++++++++--
 app/templates/base.j2             |  7 +------
 app/templates/but/bulletin.j2     |  2 +-
 app/templates/but/refcomp_show.j2 |  4 ++--
 app/templates/sco_page.j2         | 32 +++++++++++++++----------------
 app/templates/sidebar.j2          |  4 ++--
 6 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css
index 18b80a8b3..0648fa523 100644
--- a/app/static/css/scodoc.css
+++ b/app/static/css/scodoc.css
@@ -64,11 +64,22 @@ div#gtrcontent {
   display: None;
 }
 
+div.flashes {
+  transition: opacity 0.5s ease;
+  margin-top: 8px;
+  left: 50%;
+  position: fixed;
+  top: 8px;
+  transform: translateX(-50%);
+  width: auto;
+  z-index: 1000;
+}
+
 div.alert {
-  z-index: 9;
+  /*   
   position: absolute;
   top: 10px;
-  right: 10px;
+  right: 10px; */
 }
 
 div.alert-info {
diff --git a/app/templates/base.j2 b/app/templates/base.j2
index 19388ebc3..a496c4c51 100644
--- a/app/templates/base.j2
+++ b/app/templates/base.j2
@@ -63,12 +63,7 @@
 
 {% block content %}
 <div class="container flashes">
-    {% with messages = get_flashed_messages(with_categories=true) %}
-    {% for category, message in messages %}
-    <div class="alert alert-info alert-{{ category }}" role="alert">{{ message }}</div>
-    {% endfor %}
-    {% endwith %}
-
+    {% include "flashed_messages.j2" %}
     {# application content needs to be provided in the app_content block #}
     {% block app_content %}{% endblock %}
 </div>
diff --git a/app/templates/but/bulletin.j2 b/app/templates/but/bulletin.j2
index 1efd03d0e..ddf337b3b 100644
--- a/app/templates/but/bulletin.j2
+++ b/app/templates/but/bulletin.j2
@@ -10,7 +10,7 @@
 {% include 'bul_head.j2' %}
 
 <releve-but></releve-but>
-<script src="{{sco.scu.STATIC_DIR}}/js/releve-but.js"></script>
+<script src="{{scu.STATIC_DIR}}/js/releve-but.js"></script>
 
 {% include 'bul_foot.j2' %}
 
diff --git a/app/templates/but/refcomp_show.j2 b/app/templates/but/refcomp_show.j2
index d06f8cadf..5b69da1f5 100644
--- a/app/templates/but/refcomp_show.j2
+++ b/app/templates/but/refcomp_show.j2
@@ -2,7 +2,7 @@
 {% extends "sco_page.j2" %}
 {% block styles %}
     {{super()}}
-    <link href="{{sco.scu.STATIC_DIR}}/css/refcomp_parcours_niveaux.css" rel="stylesheet" type="text/css" />
+    <link href="{{scu.STATIC_DIR}}/css/refcomp_parcours_niveaux.css" rel="stylesheet" type="text/css" />
 {% endblock %}
 
 {% block app_content %}
@@ -19,7 +19,7 @@
     <ref-competences></ref-competences>
 </div>
 
-<script src="{{sco.scu.STATIC_DIR}}/js/ref_competences.js"></script>
+<script src="{{scu.STATIC_DIR}}/js/ref_competences.js"></script>
 
 {% include "but/refcomp_parcours_niveaux.j2" %}
 
diff --git a/app/templates/sco_page.j2 b/app/templates/sco_page.j2
index a6e200d63..cb3ec8b2f 100644
--- a/app/templates/sco_page.j2
+++ b/app/templates/sco_page.j2
@@ -4,14 +4,14 @@
 {% block styles %}
 {{super()}}
 <link type="text/css" rel="stylesheet"
-    href="{{sco.scu.STATIC_DIR}}/libjs/jquery-ui-1.10.4.custom/css/smoothness/jquery-ui-1.10.4.custom.min.css" />
-<link rel="stylesheet" href="{{sco.scu.STATIC_DIR}}/css/scodoc.css">
-<link href="{{sco.scu.STATIC_DIR}}/css/menu.css" rel="stylesheet" type="text/css" />
-<link href="{{sco.scu.STATIC_DIR}}/css/gt_table.css" rel="stylesheet" type="text/css" />
-<link type="text/css" rel="stylesheet" href="{{sco.scu.STATIC_DIR}}/libjs/qtip/jquery.qtip-3.0.3.min.css" />
+    href="{{scu.STATIC_DIR}}/libjs/jquery-ui-1.10.4.custom/css/smoothness/jquery-ui-1.10.4.custom.min.css" />
+<link rel="stylesheet" href="{{scu.STATIC_DIR}}/css/scodoc.css">
+<link href="{{scu.STATIC_DIR}}/css/menu.css" rel="stylesheet" type="text/css" />
+<link href="{{scu.STATIC_DIR}}/css/gt_table.css" rel="stylesheet" type="text/css" />
+<link type="text/css" rel="stylesheet" href="{{scu.STATIC_DIR}}/libjs/qtip/jquery.qtip-3.0.3.min.css" />
 {#
-<link href="{{sco.scu.STATIC_DIR}}/css/tooltip.css" rel="stylesheet" type="text/css" /> #}
-<link rel="stylesheet" type="text/css" href="{{sco.scu.STATIC_DIR}}/DataTables/datatables.min.css" />
+<link href="{{scu.STATIC_DIR}}/css/tooltip.css" rel="stylesheet" type="text/css" /> #}
+<link rel="stylesheet" type="text/css" href="{{scu.STATIC_DIR}}/DataTables/datatables.min.css" />
 {% endblock %}
 
 {% block title %}
@@ -41,16 +41,16 @@
 {{ super() }}
 {{ moment.include_moment() }}
 {{ moment.lang(g.locale) }}
-<script src="{{sco.scu.STATIC_DIR}}/libjs/menu.js"></script>
-<script src="{{sco.scu.STATIC_DIR}}/libjs/bubble.js"></script>
-<script src="{{sco.scu.STATIC_DIR}}/jQuery/jquery.js"></script>
-<script src="{{sco.scu.STATIC_DIR}}/jQuery/jquery-migrate-1.2.0.min.js"></script>
-<script src="{{sco.scu.STATIC_DIR}}/libjs/jquery.field.min.js"></script>
-<script src="{{sco.scu.STATIC_DIR}}/libjs/jquery-ui-1.10.4.custom/js/jquery-ui-1.10.4.custom.min.js"></script>
-<script src="{{sco.scu.STATIC_DIR}}/libjs/qtip/jquery.qtip-3.0.3.min.js"></script>
+<script src="{{scu.STATIC_DIR}}/libjs/menu.js"></script>
+<script src="{{scu.STATIC_DIR}}/libjs/bubble.js"></script>
+<script src="{{scu.STATIC_DIR}}/jQuery/jquery.js"></script>
+<script src="{{scu.STATIC_DIR}}/jQuery/jquery-migrate-1.2.0.min.js"></script>
+<script src="{{scu.STATIC_DIR}}/libjs/jquery.field.min.js"></script>
+<script src="{{scu.STATIC_DIR}}/libjs/jquery-ui-1.10.4.custom/js/jquery-ui-1.10.4.custom.min.js"></script>
+<script src="{{scu.STATIC_DIR}}/libjs/qtip/jquery.qtip-3.0.3.min.js"></script>
 
-<script src="{{sco.scu.STATIC_DIR}}/js/scodoc.js"></script>
-<script src="{{sco.scu.STATIC_DIR}}/DataTables/datatables.min.js"></script>
+<script src="{{scu.STATIC_DIR}}/js/scodoc.js"></script>
+<script src="{{scu.STATIC_DIR}}/DataTables/datatables.min.js"></script>
 <script>
     window.onload = function () { enableTooltips("gtrcontent") };
 
diff --git a/app/templates/sidebar.j2 b/app/templates/sidebar.j2
index 4130ae6e9..ba8513774 100644
--- a/app/templates/sidebar.j2
+++ b/app/templates/sidebar.j2
@@ -84,12 +84,12 @@
         <div class="sidebar-bottom"><a href="{{ url_for( 'scodoc.about', 
         scodoc_dept=g.scodoc_dept ) }}" class="sidebar">À propos</a>
             <br />
-            <a href="{{ sco.scu.SCO_USER_MANUAL }}" target="_blank" class="sidebar">Aide</a>
+            <a href="{{ scu.SCO_USER_MANUAL }}" target="_blank" class="sidebar">Aide</a>
         </div>
     </div>
     <div class="logo-logo">
         <a href="{{ url_for( 'scodoc.about', scodoc_dept=g.scodoc_dept ) }}">
-            {{ sco.scu.icontag("scologo_img", no_size=True) | safe}}</a>
+            {{ scu.icontag("scologo_img", no_size=True) | safe}}</a>
     </div>
 </div>
 <!-- end of sidebar -->
\ No newline at end of file