From 045cc3641f0d360b40c4d9b97b8ed38cc2cbc2f3 Mon Sep 17 00:00:00 2001
From: MOIS3Y <s.zhukovskii@ispsystem.com>
Date: Fri, 8 Sep 2023 02:27:04 +0900
Subject: [PATCH] Modify: footer meta info

---
 logs_collector/logs_collector/settings.py     |  4 ++--
 logs_collector/templates/includes/brand.html  | 15 +--------------
 logs_collector/templates/includes/footer.html |  8 +++++++-
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/logs_collector/logs_collector/settings.py b/logs_collector/logs_collector/settings.py
index ef9bb5e..3dde094 100644
--- a/logs_collector/logs_collector/settings.py
+++ b/logs_collector/logs_collector/settings.py
@@ -2,7 +2,7 @@ import environ
 from pathlib import Path
 from datetime import timedelta
 
-from . import __version__
+from . import __version__, __status__
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -11,7 +11,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 env = environ.Env(
     # set casting default value
     VERSION=(str, __version__),
-    ENVIRONMENT=(str, 'development'),
+    ENVIRONMENT=(str, __status__),
     DEBUG=(bool, False),
     SECRET_KEY=(str, 'j9QGbvM9Z4otb47'),
     SQLITE_URL=(str, f'sqlite:///{BASE_DIR / "data/db.sqlite3"}'),
diff --git a/logs_collector/templates/includes/brand.html b/logs_collector/templates/includes/brand.html
index 0f5cbaf..7741846 100644
--- a/logs_collector/templates/includes/brand.html
+++ b/logs_collector/templates/includes/brand.html
@@ -1,17 +1,4 @@
-<a
-  class="navbar-brand"
-  href="{% url 'collector:index' %}"
-  data-bs-toggle="tooltip"
-  data-bs-html="true"
-  data-bs-placement="bottom"
-  data-bs-title="
-    Version: {{ version }}
-    <br>
-    {% if environment != production %}
-    Staging: {{ environment|capfirst }}
-    {% endif %}
-  "
->
+<a class="navbar-brand" href="{% url 'collector:index' %}">
   Logs Collector
   <i class="bi bi-file-earmark-zip-fill"></i>
 </a>
diff --git a/logs_collector/templates/includes/footer.html b/logs_collector/templates/includes/footer.html
index a574b08..e51dd7c 100644
--- a/logs_collector/templates/includes/footer.html
+++ b/logs_collector/templates/includes/footer.html
@@ -2,7 +2,13 @@
   <div class="container d-flex justify-content-between">
     <ul class="navbar-nav">
       <li class="nav-item">
-        <span class="text-muted">© Created by {{ author }}</span>
+        <span class="text-muted">
+          v{{ version }}
+          {% if environment != 'Production' %}
+            Staging: {{ environment }}
+          {% endif %}
+          | © {{ author }} 
+        </span>
       </li>
     </ul>
     <ul class="navbar-nav">