From a6b97e96677d6c38b43232525a5111da4949e720 Mon Sep 17 00:00:00 2001
From: Emmanuel Viennet <emmanuel.viennet@gmail.com>
Date: Fri, 10 Sep 2021 23:18:27 +0200
Subject: [PATCH] =?UTF-8?q?Cosm=C3=A9tique:=20barre=20page=20accueil?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scodoc/sco_dept.py    |  4 ++--
 app/static/css/scodoc.css | 12 ++++++++++++
 app/templates/base.html   | 14 ++++++++++----
 app/templates/scodoc.html |  3 ++-
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/app/scodoc/sco_dept.py b/app/scodoc/sco_dept.py
index a24638d128..349ad00952 100644
--- a/app/scodoc/sco_dept.py
+++ b/app/scodoc/sco_dept.py
@@ -183,7 +183,7 @@ def _sem_table(sems):
     """Affiche liste des semestres, utilisée pour semestres en cours"""
     tmpl = """<tr class="%(trclass)s">%(tmpcode)s
     <td class="semicon">%(lockimg)s <a href="%(notes_url)s/formsemestre_status?formsemestre_id=%(formsemestre_id)s#groupes">%(groupicon)s</a></td>        
-    <td class="datesem">%(mois_debut)s</td><td class="datesem"><a title="%(session_id)s">-</a> %(mois_fin)s</td>
+    <td class="datesem">%(mois_debut)s <a title="%(session_id)s">-</a> %(mois_fin)s</td>
     <td><a class="stdlink" href="%(notes_url)s/formsemestre_status?formsemestre_id=%(formsemestre_id)s">%(titre_num)s</a>
     <span class="respsem">(%(responsable_name)s)</span>
     </td>
@@ -196,7 +196,7 @@ def _sem_table(sems):
     H = ['<table class="listesems">']
     for modalite in modalites:
         if len(modalites) > 1:
-            H.append('<tr><th colspan="4">%s</th></tr>' % modalite["titre"])
+            H.append('<tr><th colspan="3">%s</th></tr>' % modalite["titre"])
 
         if sems_by_mod[modalite["modalite"]]:
             cur_idx = sems_by_mod[modalite["modalite"]][0]["semestre_id"]
diff --git a/app/static/css/scodoc.css b/app/static/css/scodoc.css
index 4c59e33101..47019d941b 100644
--- a/app/static/css/scodoc.css
+++ b/app/static/css/scodoc.css
@@ -96,6 +96,10 @@ tr.bandeaugtr {
   text-decoration: underline;
 }
 
+.navbar-default .navbar-nav>li.logout a {
+  color: rgb(255,0,0);
+}
+
 /* ----- page content ------ */
 
 div.about-logo {
@@ -324,6 +328,9 @@ table.listesems th {
   padding-top: 0.5em;
   padding-left: 0.5em;
 }
+table.listesems td {
+  vertical-align: center;
+}
 
 table.listesems td.semicon { 
   padding-left: 1.5em;
@@ -333,6 +340,11 @@ table.listesems tr.firstsem td {
  padding-top: 0.8em;
 }
 
+td.datesem {
+  font-size: 80%;
+  white-space: nowrap;
+}
+
 h2.listesems { 
   padding-top: 10px;
   padding-bottom: 0px;
diff --git a/app/templates/base.html b/app/templates/base.html
index 0506840084..0be7c6fce7 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -25,15 +25,21 @@
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
             {% if current_user.is_administrator() %}
             <ul class="nav navbar-nav">
-                <li><a href="{{ url_for('scodoc.configuration') }}">Configuration</a></li>
+                <li><a href="{{ url_for('scodoc.configuration') }}">configuration</a></li>
             </ul>
             {% endif %}
             <ul class="nav navbar-nav navbar-right">
                 {% if current_user.is_anonymous %}
-                <li><a href="{{ url_for('auth.login') }}">Login</a></li>
+                <li><a href="{{ url_for('auth.login') }}">connexion</a></li>
                 {% else %}
-                <li>{{current_user.user_name}}</li>
-                <li><a href="{{ url_for('auth.logout') }}">Logout</a></li>
+                <li>{% if current_user.dept %}
+                    <a href="{{ url_for('users.user_info_page', scodoc_dept=current_user.dept, user_name=current_user.user_name )
+                        }}">{{current_user.user_name}} ({{current_user.dept}})</a>
+                    {% else %}
+                    <a href="">{{current_user.user_name}}</a>
+                    {% endif %}
+                </li>
+                <li class="logout"><a href="{{ url_for('auth.logout') }}">déconnexion</a></li>
                 {% endif %}
             </ul>
         </div>
diff --git a/app/templates/scodoc.html b/app/templates/scodoc.html
index 23826e3c03..f48ad0f460 100644
--- a/app/templates/scodoc.html
+++ b/app/templates/scodoc.html
@@ -38,8 +38,9 @@
 </form>
 {% endif %}
 
+<!-- 
 <div style="margin-top: 1cm;">
     <p><a href="/ScoDoc/static/mobile">Charger la version mobile (expérimentale)</a></p>
-</div>
+</div> -->
 
 {% endblock %}
\ No newline at end of file