From 3666f8b1ec69185752624f5ab0a68900715c1370 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Thu, 16 Sep 2021 10:09:17 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9liore=20sidebar=20avec=20template=20jin?=
 =?UTF-8?q?ja?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scodoc/html_sidebar.py      | 25 ++++++-------------------
 app/templates/sidebar_dept.html | 12 ++++++++++++
 2 files changed, 18 insertions(+), 19 deletions(-)
 create mode 100644 app/templates/sidebar_dept.html

diff --git a/app/scodoc/html_sidebar.py b/app/scodoc/html_sidebar.py
index 8edd0dda6..70efb1605 100644
--- a/app/scodoc/html_sidebar.py
+++ b/app/scodoc/html_sidebar.py
@@ -28,9 +28,8 @@
 """
 Génération de la "sidebar" (marge gauche des pages HTML)
 """
-from flask import url_for
-from flask import g
-from flask import request
+from flask import render_template, url_for
+from flask import g, request
 from flask_login import current_user
 
 import app.scodoc.sco_utils as scu
@@ -168,19 +167,7 @@ def sidebar():
 
 def sidebar_dept():
     """Partie supérieure de la marge de gauche"""
-    H = [
-        f"""<h2 class="insidebar">Dépt. {sco_preferences.get_preference("DeptName")}</h2>
-<a href="{url_for("scodoc.index")}" class="sidebar">Accueil</a> <br/> """
-    ]
-    dept_intranet_url = sco_preferences.get_preference("DeptIntranetURL")
-    if dept_intranet_url:
-        H.append(
-            f"""<a href="{dept_intranet_url}" class="sidebar">{
-                sco_preferences.get_preference("DeptIntranetTitle")}</a> <br/>"""
-        )
-    # Entreprises pas encore supporté en ScoDoc8
-    # H.append(
-    #    """<br/><a href="%(ScoURL)s/Entreprises" class="sidebar">Entreprises</a> <br/>"""
-    #    % infos
-    # )
-    return "\n".join(H)
+    return render_template(
+        "sidebar_dept.html",
+        prefs=sco_preferences.SemPreferences(),
+    )
diff --git a/app/templates/sidebar_dept.html b/app/templates/sidebar_dept.html
new file mode 100644
index 000000000..e54cce792
--- /dev/null
+++ b/app/templates/sidebar_dept.html
@@ -0,0 +1,12 @@
+<h2 class="insidebar">Dépt. {{ prefs["DeptName"] }}</h2>
+<a href="{{ url_for('scodoc.index') }}" class="sidebar">Accueil</a> <br/>
+    {% if prefs["DeptIntranetURL"] %}
+        <a href="{{ prefs["DeptIntranetURL"] }}" class="sidebar">
+        {{ prefs["DeptIntranetTitle"] }}</a>
+    {% endif %}
+<br/>
+
+{#  
+# Entreprises pas encore supporté en ScoDoc8
+#  <br/><a href="%(ScoURL)s/Entreprises" class="sidebar">Entreprises</a> <br/>
+#}
\ No newline at end of file