From 370c4bad1e2f5c5b4ad3f7824a0229264bcafb8c Mon Sep 17 00:00:00 2001
From: deflax <daniel@deflax.net>
Date: Tue, 10 Apr 2018 17:06:01 +0300
Subject: [PATCH] some visual changes and pip packages update

---
 app/static/css/style.css                  |  6 +++---
 app/templates/admin/list_deployments.html |  2 +-
 app/templates/nav.html                    |  2 +-
 app/vmanager/routes.py                    | 15 ++++++++++-----
 requirements.txt                          | 19 ++++++++++++++-----
 5 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/app/static/css/style.css b/app/static/css/style.css
index 2ee057d..b93e887 100644
--- a/app/static/css/style.css
+++ b/app/static/css/style.css
@@ -17,16 +17,16 @@ body {
 }
 
 .page_wrap { 
-    width: 83%;
+    width: 88%;
 	margin: 0 auto;
 }
 
 .container {
-    width: 85%;
+    width: 90%;
 }
 
 .container-fluid {
-    max-width: 85%;
+    max-width: 92%;
     min-width: 280px;
 }
 
diff --git a/app/templates/admin/list_deployments.html b/app/templates/admin/list_deployments.html
index 43a3a16..6940181 100644
--- a/app/templates/admin/list_deployments.html
+++ b/app/templates/admin/list_deployments.html
@@ -44,7 +44,7 @@
      {% endif %}
      <td data-title="Server">{{ deploy.server.name }}</td>
      <td data-title="VLAN">{% for vlan in deploy.inv_pubvlans %}{{ vlan.vlan_id }}{% endfor %}</td>
-     <td data-title="Alias"><a class="rrd" data-toggle="tooltip" title="Protected: {{ deploy.protected }} ID: {{ deploy.machine_id }}"><b>{% if status[deploy.machine_id] == 'UNREACHABLE' %}<font color="red">{% else %}<font color="green">{% endif %}{{ deploy.machine_alias }}</font></b></a></td>
+     <td data-title="Alias"><a class="rrd" data-toggle="tooltip" title="Status: {{ status[deploy.machine_id] }} - Protected: {{ deploy.protected }} - ID: {{ deploy.machine_id }}"><b>{% if status[deploy.machine_id] == 'running' %}<font color="green">{% else %}{% if status[deploy.machine_id] == 'stopped' %}<font color="olive">{% else %}<font color="red">{% endif %}{% endif %}{{ deploy.machine_alias }}</font></b></a></td>
      <td data-title="CPU">{{ deploy.machine_cpu }}</td>
      <td data-title="Memory">{{ deploy.machine_mem }} MB</td>
      <td data-title="HDD">{{ deploy.machine_hdd }} GB</td>
diff --git a/app/templates/nav.html b/app/templates/nav.html
index ff3415f..63349f7 100644
--- a/app/templates/nav.html
+++ b/app/templates/nav.html
@@ -48,7 +48,7 @@
         <li class="dropdown">
   <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img class="avatar" src="{{ current_user.gravatar(20) }}"> {{ current_user.email }} <span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="{{ url_for('panel.dashboard') }}"><span class="glyphicon glyphicon-pencil"></span> Dashboard</a></li>
+            <li><a href="{{ url_for('panel.dashboard') }}"><span class="glyphicon glyphicon-modal-window"></span> Dashboard</a></li>
             <li><a href="{{ url_for('uinvoice.transactions') }}"><span class="glyphicon glyphicon-list-alt"></span> Transactions</a></li>
             <li role="separator" class="divider"></li>
             <li><a href="{{ url_for('settings.profile') }}"><span class="glyphicon glyphicon-user"></span> Profile</a></li>
diff --git a/app/vmanager/routes.py b/app/vmanager/routes.py
index caabd7f..689ae74 100644
--- a/app/vmanager/routes.py
+++ b/app/vmanager/routes.py
@@ -124,6 +124,16 @@ def remove(unit_id=0):
     if current_user.is_administrator():
         if deploy.protected is not True:
             try:
+                query = contact_proxmaster(data, 'status')
+                if query['status'] == 'UNREACHABLE':
+                    flash('Physical machine is not reachable. Cannot be deleted from the database')
+                    return redirect(url_for('admin.list_archive'))
+
+                if query['status'] == 'running':
+                    query = contact_proxmaster(data, 'stop')
+                    flash('Machine {} force stopped'.format(unit_id))
+                    time.sleep(7)
+
                 #pubvlans depends on deploy as foreign key so delete them first
                 for pubvlan in deploy.inv_pubvlans:
                     #clean public addr assignment
@@ -134,11 +144,6 @@ def remove(unit_id=0):
                     db.session.delete(pubvlan)
                     db.session.commit()
 
-                query = contact_proxmaster(data, 'status')
-                if query['status'] == 'running':
-                    query = contact_proxmaster(data, 'stop')
-                    flash('Machine {} force stopped'.format(unit_id))
-                    time.sleep(7)
                 query = contact_proxmaster(data, 'remove')
                 flash('Machine {} terminated'.format(unit_id))
                 deploy.deleted = True
diff --git a/requirements.txt b/requirements.txt
index a3a7cac..b858ce4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
-uuid==1.30
 alembic==0.9.9
 appdirs==1.4.3
 Babel==2.5.3
@@ -6,8 +5,10 @@ blinker==1.4
 certifi==2018.1.18
 chardet==3.0.4
 click==6.7
+colorclass==2.2.0
 dnspython==1.15.0
 dnspython3==1.15.0
+docopt==0.6.2
 dominate==2.3.1
 facepy==1.0.9
 Flask==0.12.2
@@ -17,7 +18,7 @@ Flask-Login==0.4.1
 Flask-Mail==0.9.1
 Flask-Migrate==2.1.1
 Flask-Moment==0.6.0
-Flask-Paginate==0.5.1
+flask-paginate==0.5.1
 Flask-Script==2.0.6
 Flask-SQLAlchemy==2.3.2
 Flask-WTF==0.14.2
@@ -28,23 +29,31 @@ itsdangerous==0.24
 Jinja2==2.10
 Mako==1.0.7
 MarkupSafe==1.0
+oauthlib==2.0.6
 onetimepass==1.0.1
+packaging==16.8
+pip-review==1.0
+pip-upgrader==1.4.4
 pkg-resources==0.0.0
 psycopg2==2.7.4
 Pygments==2.2.0
+pyparsing==2.2.0
 PyQRCode==1.2.1
-python-dateutil==2.7.1
+python-dateutil==2.7.2
 python-editor==1.0.3
-pytz==2018.3
+pytz==2018.4
 requests==2.18.4
+requests-oauthlib==0.8.0
 schedule==0.5.0
 six==1.11.0
 sortedcontainers==1.5.9
 speaklater==1.3
-SQLAlchemy==1.2.5
+SQLAlchemy==1.2.6
+terminaltables==3.1.0
 traits==4.6.0
 Unipath==1.1
 urllib3==1.22
+uuid==1.30
 visitor==0.1.3
 Werkzeug==0.14.1
 WTForms==2.1