From 233fe39b325690cb07080983a5adb4c24dd5b551 Mon Sep 17 00:00:00 2001
From: deflax <daniel@deflax.net>
Date: Sat, 24 Feb 2018 19:35:36 +0200
Subject: [PATCH] rearange some visual stuff aroudn the frontend

---
 app/templates/admin/admin_misc.html                       | 2 --
 app/templates/admin/admin_tasks.html                      | 2 +-
 app/templates/admin/list_addresses.html                   | 1 +
 app/templates/admin/list_archive.html                     | 1 +
 app/templates/admin/list_deployments.html                 | 7 ++-----
 app/templates/admin/list_servers.html                     | 2 +-
 app/templates/admin/{admin_cloud.html => menu_cloud.html} | 2 +-
 app/templates/admin/menu_deployments.html                 | 4 ++++
 app/templates/base.html                                   | 1 -
 app/templates/main/footer_colored.html                    | 2 +-
 app/templates/main/footer_simple.html                     | 4 +---
 11 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 app/templates/admin/admin_misc.html
 rename app/templates/admin/{admin_cloud.html => menu_cloud.html} (90%)
 create mode 100644 app/templates/admin/menu_deployments.html

diff --git a/app/templates/admin/admin_misc.html b/app/templates/admin/admin_misc.html
deleted file mode 100644
index f904e4a..0000000
--- a/app/templates/admin/admin_misc.html
+++ /dev/null
@@ -1,2 +0,0 @@
-    <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_users') }}','_self')"><span class="glyphicon glyphicon-user" aria-hidden="true"></span> Users</button>
-    <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_transactions') }}','_self')"><span class="glyphicon glyphicon-btc" aria-hidden="true"></span> Transactions</button>
diff --git a/app/templates/admin/admin_tasks.html b/app/templates/admin/admin_tasks.html
index a41d36c..0dc22d7 100644
--- a/app/templates/admin/admin_tasks.html
+++ b/app/templates/admin/admin_tasks.html
@@ -2,7 +2,7 @@
   <div class="panel panel-warning" id="prxadmincloud"> 
   <div class="panel-heading">Admin Panel</div> 
   <div class="panel-body">
-  {% include "admin/admin_cloud.html" %}
+  {% include "admin/menu_cloud.html" %}
   </div>
   </div>
   </div>
diff --git a/app/templates/admin/list_addresses.html b/app/templates/admin/list_addresses.html
index 3571fe0..020b2fd 100644
--- a/app/templates/admin/list_addresses.html
+++ b/app/templates/admin/list_addresses.html
@@ -13,6 +13,7 @@
   <div class="panel panel-info" id="addresses">
   <div class="panel-heading">Addresses</div>
   <div class="panel-body"><p>
+  {% include "admin/menu_deployments.html" %}
   <div class="no-more-tables">
   <table class="table table-hover table-striped table-condensed cf">
    <thead>
diff --git a/app/templates/admin/list_archive.html b/app/templates/admin/list_archive.html
index 1c23dda..82e5b2e 100644
--- a/app/templates/admin/list_archive.html
+++ b/app/templates/admin/list_archive.html
@@ -58,6 +58,7 @@ addEventListener("DOMContentLoaded", function() {
   <div class="panel panel-info" id="deployments">
   <div class="panel-heading">Deployments</div>
   <div class="panel-body"><p>
+  {% include "admin/menu_deployments.html" %}
   <div class="no-more-tables">
   <table class="table table-hover table-striped table-condensed cf">
    <thead>
diff --git a/app/templates/admin/list_deployments.html b/app/templates/admin/list_deployments.html
index bdc421f..1d9f46d 100644
--- a/app/templates/admin/list_deployments.html
+++ b/app/templates/admin/list_deployments.html
@@ -13,9 +13,8 @@
   <div class="panel panel-info" id="deployments">
   <div class="panel-heading">Deployments</div>
   <div class="panel-body"><p>
-  <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_addresses') }}','_self')"><span class="glyphicon glyphicon-book" aria-hidden="true"></span> Addresses</button>
-  <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_servers') }}','_self')"><span class="glyphicon glyphicon-off" aria-hidden="true"></span> Servers</button>
-  <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_archive') }}','_self')"><span class="glyphicon glyphicon-book" aria-hidden="true"></span> Archive</button> 
+
+  {% include "admin/menu_deployments.html" %}
 
   <div class="no-more-tables">
   <table class="table table-hover table-striped table-condensed cf">
@@ -63,8 +62,6 @@
   </div>
   </div>
 
- </div>
-
 
   <div class="row">
   </div>
diff --git a/app/templates/admin/list_servers.html b/app/templates/admin/list_servers.html
index 710ba16..14d7a62 100644
--- a/app/templates/admin/list_servers.html
+++ b/app/templates/admin/list_servers.html
@@ -9,7 +9,7 @@
     <div class="panel panel-info">
     <div class="panel-heading">Servers</div>
     <div class="panel-body">
-
+  {% include "admin/menu_deployments.html" %}
     <div class="table-responsive">
           <table class="table table-hover table-striped table-condensed cf">
           <thead>
diff --git a/app/templates/admin/admin_cloud.html b/app/templates/admin/menu_cloud.html
similarity index 90%
rename from app/templates/admin/admin_cloud.html
rename to app/templates/admin/menu_cloud.html
index 4dfee05..0c9f661 100644
--- a/app/templates/admin/admin_cloud.html
+++ b/app/templates/admin/menu_cloud.html
@@ -1,4 +1,4 @@
-    <button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_deployments') }}','_self')"><span class="glyphicon glyphicon-hdd" aria-hidden="true"></span> Deploys</button>
+    <button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_deployments') }}','_self')"><span class="glyphicon glyphicon-hdd" aria-hidden="true"></span> Deployments</button>
     <button class="btn btn-success btn-md" onclick="window.open('{{ url_for('admin.list_services') }}','_self')"><span class="glyphicon glyphicon-star" aria-hidden="true"></span> Services</button>
     <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_users') }}','_self')"><span class="glyphicon glyphicon-user" aria-hidden="true"></span> Users</button>
     <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_transactions') }}','_self')"><span class="glyphicon glyphicon-btc" aria-hidden="true"></span> Transactions</button>
diff --git a/app/templates/admin/menu_deployments.html b/app/templates/admin/menu_deployments.html
new file mode 100644
index 0000000..0f9d177
--- /dev/null
+++ b/app/templates/admin/menu_deployments.html
@@ -0,0 +1,4 @@
+  <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_addresses') }}','_self')"><span class="glyphicon glyphicon-tags" aria-hidden="true"></span> Addresses</button>
+  <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_servers') }}','_self')"><span class="glyphicon glyphicon-off" aria-hidden="true"></span> Servers</button>
+  <button class="btn btn-primary btn-md" onclick="window.open('{{ url_for('admin.list_archive') }}','_self')"><span class="glyphicon glyphicon-folder-close" aria-hidden="true"></span> Archive</button>
+
diff --git a/app/templates/base.html b/app/templates/base.html
index d4948c2..f166b6d 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -47,7 +47,6 @@
     </div>
 
 {% block footer %}
-{% include "main/footer_simple.html" %}
 {% endblock %}
 
 {% endblock %}
diff --git a/app/templates/main/footer_colored.html b/app/templates/main/footer_colored.html
index 0c2ee6a..0439fe9 100644
--- a/app/templates/main/footer_colored.html
+++ b/app/templates/main/footer_colored.html
@@ -2,7 +2,7 @@
 
 		<div class="page_wrap">
 			<p class="copyright"><a href="{{ url_for('main.terms') }}">Terms of Service</a> &copy; All Rights Reserved.</p>
-			<p class="design_by"></p>
+			<p class="design_by">Icons by <a style="color:#88af46" href="https://icons8.com">icons8</a></p>
 		</div><!--/page wrap-->
 
 	</div><!--/footer copyright-->
diff --git a/app/templates/main/footer_simple.html b/app/templates/main/footer_simple.html
index 1468afa..b7c8ac3 100644
--- a/app/templates/main/footer_simple.html
+++ b/app/templates/main/footer_simple.html
@@ -1,4 +1,2 @@
 		<br /><br >
-		<div class="page_wrap">
-			<p class="copyright" style="color:#708d3f;">&copy; All Rights Reserved. Icons by <a style="color:#88af46" href="https://icons8.com">icons8</a></p>
-		</div><!--/page wrap-->
+		&copy; All Rights Reserved. Icons by <a style="color:#88af46" href="https://icons8.com">icons8</a>