From d38312c28e09236b172f7f564eaaff0b5fa72ce9 Mon Sep 17 00:00:00 2001
From: Alexis Koralewski <akoralewski@irap.omp.eu>
Date: Wed, 1 Sep 2021 19:45:27 +0200
Subject: [PATCH] updating UI (CSS modifications)

---
 src/core/pyros_django/misc/templates/base.html          | 38 ++++++++++++++++++++++++--------------
 src/core/pyros_django/misc/templates/base_unlogged.html | 52 +++++++++++++++++++++++++++++++++++++++++++---------
 2 files changed, 67 insertions(+), 23 deletions(-)

diff --git a/src/core/pyros_django/misc/templates/base.html b/src/core/pyros_django/misc/templates/base.html
index f4a0a35..016e969 100644
--- a/src/core/pyros_django/misc/templates/base.html
+++ b/src/core/pyros_django/misc/templates/base.html
@@ -10,7 +10,7 @@
     <meta name="author" content="CNRS-IRAP">
     <link rel="icon" type="image/png" href="{% static "media/colibrifavicon.png" %}"/>
     
-    <title>{{ request.session.obsname }} Control Center</title>
+    <title>{{ request.session.obsname}} Control Center - VERSION 2021.0.1</title>
 
     <!-- Bootstrap core CSS -->
     <link href={% static "bootstrap/css/bootstrap.css" %} rel="stylesheet">
@@ -30,7 +30,7 @@
 	<style> 
   #title {
     font-family: 'Montserra', sans-serif; 
-    font-size: 50px;
+    font-size: 3rem;
   }
   </style>
 	{% endblock %}
@@ -41,19 +41,16 @@
 <style>
 
 #page-wrapper {
-  padding: 15px 60px;
-  width: 90%;
-  height: 90%;
+  width: 80vw;
+  height: 80vh;
 }
 
 #wrapper {
-  padding-left: 10%;
+  #padding-left: 10%;
 }
 
 .side-nav {
-  margin-left: -200px;
-  left: 200px;
-  width: 125px; /*200px for base_unlogged*/
+  max-width: 15vw; /*200px for base_unlogged*/
 }
 
 a {
@@ -115,6 +112,12 @@ a {
   
 }
 
+#home_icon{
+  height: 1.4em;
+  width: 1.5em;  
+  float:left;
+  margin-right:1vw;
+}
 
 .dropdown_user_actions {
   float: left;
@@ -149,7 +152,12 @@ a {
 }
 
 footer{
-  padding-left: 50%;
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+
 }
 </style>
 
@@ -168,14 +176,16 @@ footer{
 <div id="wrapper">
 
       <!-- Sidebar -->
-      <nav class="navbar navbar-inverse navbar-fixed-top navbar-expand-lg" role="navigation">
+      <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+      
       <!-- Brand and toggle get grouped for better mobile display -->
         <div class="navbar-header">
             {% comment %}
               <img alt="" src="{% static "media/colibrifavicon.png" %}">
             {% endcomment %}
-            <a class="navbar-brand" href={% url "index" %} style="color: black;">{{ request.session.obsname }} Control Center</a>
-			
+            <a class="navbar-brand" href={% url "index" %} style="color: black;">
+            <img src="{% static 'media/home.png'  %}" id="home_icon">
+            {{ request.session.obsname }} Control Center</a>
         </div>
            {# <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> #}
           <script  src="{% static "/js/jquery-1.10.2.js" %}"></script>
@@ -183,7 +193,7 @@ footer{
 
         <!-- Collect the nav links, forms, and other content for toggling -->
         <!-- #f9ff93 #6b69f3-->
-        <div id="topbar" class="collapse navbar-collapse navbar-ex1-collapse navbar-dark bg-primary">
+        <div id="topbar" class="collapse navbar-collapse navbar-ex1-collapse bg-primary">
         <ul class="nav navbar-nav side-nav navbar-dark bg-primary" id="navbar_list">
             
               <li><a href="{% url "weather" %}">Weather</a></li>
diff --git a/src/core/pyros_django/misc/templates/base_unlogged.html b/src/core/pyros_django/misc/templates/base_unlogged.html
index d2a0a08..280affd 100644
--- a/src/core/pyros_django/misc/templates/base_unlogged.html
+++ b/src/core/pyros_django/misc/templates/base_unlogged.html
@@ -29,7 +29,7 @@
 	<style> 
   #title {
     font-family: 'Montserra', sans-serif; 
-    font-size: 50px;
+    font-size: 3rem;
   }
   </style>
 	{% endblock %}
@@ -40,19 +40,16 @@
 <style>
 
 #page-wrapper {
-  padding: 15px 60px;
-  width: 90%;
-  height: 90%;
+  width: 80vw;
+  height: 80vh;
 }
 
 #wrapper {
-  padding-left: 10%; 
+  #padding-left: 10%;
 }
 
 .side-nav {
-  margin-left: -200px;
-  left: 200px;
-  width: 200px; /*125px for base*/
+  max-width: 15vw; /*200px for base_unlogged*/
 }
 
 a {
@@ -64,6 +61,11 @@ a {
   size: 18px;
 }
 
+#profile
+{
+    font-size: 17px;
+}
+
 #hour
 {
     color: black;
@@ -76,10 +78,13 @@ a {
     font-size: 18px;
 }
 
-#signin {
+#signout {
     color: black;
 }
 
+#signin{
+  color: white;
+}
 .nav>li>a:focus, .nav>li>a:hover {
         text-decoration: none;
         background-color: transparent !important;
@@ -96,6 +101,35 @@ a {
     color: black;
 }
 
+.img_icon {
+  height: 18px;
+  weight: 18px; 
+}
+
+.user_icon{
+  margin-left: 45%;
+  margin-bottom: 0.4em;
+  margin-top: 0.4em;
+  height: 1.5em;
+  
+}
+
+#home_icon{
+  height: 1.4em;
+  width: 1.5em;  
+  float:left;
+  margin-right:1vw;
+}
+
+
+footer{
+  position: fixed;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+
+}
 </style>
 
 {% load tags %}
--
libgit2 0.21.2