From 8e2010af75be3108efa65b03a805408cb29a20ec Mon Sep 17 00:00:00 2001
From: Phillip Tarrant <ptarrant@gmail.com>
Date: Tue, 22 Sep 2020 16:17:17 -0400
Subject: [PATCH] added version to bottom of pages

---
 app/classes/web/server_handler.py  |  2 +-
 app/frontend/templates/footer.html |  7 +++++--
 app/frontend/templates/notify.html | 11 +++--------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py
index 08436cad..f368fec1 100644
--- a/app/classes/web/server_handler.py
+++ b/app/classes/web/server_handler.py
@@ -36,7 +36,7 @@ class ServerHandler(BaseHandler):
         defined_servers = controller.list_defined_servers()
 
         page_data = {
-            'version_data': "version_data_here",
+            'version_data': helper.get_version_string(),
             'user_data': user_data,
             'server_stats': {
                 'total': len(controller.list_defined_servers()),
diff --git a/app/frontend/templates/footer.html b/app/frontend/templates/footer.html
index 03c4cfab..fe371681 100644
--- a/app/frontend/templates/footer.html
+++ b/app/frontend/templates/footer.html
@@ -1,8 +1,11 @@
 <!-- partial:partials/_footer.html -->
   <footer class="footer">
-    <div class="container-fluid clearfix">
-      <span class="text-muted d-block text-center text-sm-left d-sm-inline-block">Copyright © 2020 <a href="http://www.rentmydatacenter.com/" target="_blank">RMDC</a>. All rights reserved.</span>
+    <div class="container-fluid ">
+
+      <span class="text-muted d-block text-center text-sm-left d-sm-inline-block">Copyright © 2020 <a href="http://www.craftycontrol.com/" target="_blank">Crafty Controller</a>. All rights reserved.</span>
+      <span class="float-none float-sm-right d-block mt-1 mt-sm-0 text-center">Version: {{ data['version_data'] }}
       </span>
     </div>
+
   </footer>
 <!-- partial -->
\ No newline at end of file
diff --git a/app/frontend/templates/notify.html b/app/frontend/templates/notify.html
index 0c63b37e..3d29b290 100644
--- a/app/frontend/templates/notify.html
+++ b/app/frontend/templates/notify.html
@@ -2,13 +2,10 @@
     <li class="nav-item dropdown">
       <a class="nav-link count-indicator" id="notificationDropdown" href="#" data-toggle="dropdown">
         <i class="mdi mdi-email-outline"></i>
-        <span class="count bg-success">3</span>
+<!--        <span class="count bg-success">3</span>-->
       </a>
       <div class="dropdown-menu dropdown-menu-right navbar-dropdown preview-list pb-0" aria-labelledby="notificationDropdown">
-        <a class="dropdown-item py-3 border-bottom">
-          <p class="mb-0 font-weight-medium float-left">You have 4 new notifications </p>
-          <span class="badge badge-pill badge-primary float-right">View all</span>
-        </a>
+
         <a class="dropdown-item preview-item py-3">
           <div class="preview-thumbnail">
             <i class="mdi mdi-alert m-auto text-primary"></i>
@@ -45,11 +42,9 @@
         <div class="dropdown-header text-center">
           <img class="img-md rounded-circle" src="/static/assets/images/faces-clipart/pic-1.png" alt="Profile image">
           <p class="mb-1 mt-3 font-weight-semibold">{{ data['user_data']['username'] }}</p>
-          <p class="font-weight-light text-muted mb-0">Plan: {{ str(data['user_data']['account_type']).upper() }}</p>
+          <p class="font-weight-light text-muted mb-0">Role: Admin</p>
         </div>
-        <a class="dropdown-item"><i class="dropdown-item-icon mdi mdi-account-outline text-primary"></i> My Profile <span class="badge badge-pill badge-danger">1</span></a>
         <a class="dropdown-item"><i class="dropdown-item-icon mdi mdi-calendar-check-outline text-primary"></i> Activity</a>
-        <a class="dropdown-item"><i class="dropdown-item-icon mdi mdi-help-circle-outline text-primary"></i> FAQ</a>
         <a class="dropdown-item" href="/public/login"><i class="dropdown-item-icon mdi mdi-power text-primary"></i>Sign Out</a>
       </div>
     </li>