admin gui details

app/admin/routes.py

@@ -39,8 +39,8 @@ def index():
 @fresh_login_required
 @admin_required
 def list_deployments():
-    alldeployments = Deployment.query.filter_by(deleted=False).order_by(Deployment.daysleft.asc()).all()
+    AllDeploymentProtected = Deployment.query.filter_by(deleted=False).order_by(Deployment.daysleft.asc()).all()
-    return render_template('admin/list_deployments.html', deployments=alldeployments)
+    return render_template('admin/list_deployments.html', deployments=AllDeploymentProtected)
 
 @admin.route("/listservices", methods=['GET'])
 @fresh_login_required
@@ -56,14 +56,14 @@ def list_domains():
     alldomains = Domain.query.filter_by(deleted=False).order_by(Domain.daysleft.asc()).all()
     return render_template('admin/list_domains.html', domains=alldomains)
 
-@admin.route("/listrecyclebin", methods=['GET'])
+@admin.route("/listarchive", methods=['GET'])
 @fresh_login_required
 @admin_required
-def list_recyclebin():
+def list_archive():
     deployments = Deployment.query.filter_by(protected=False).order_by(Deployment.daysleft.asc()).all()
     services = Service.query.filter_by(deleted=True).all()
     domains = Domain.query.filter_by(deleted=True).all()
-    return render_template('admin/list_recyclebin.html', deployments=deployments, services=services, domains=domains)
+    return render_template('admin/list_archive.html', deployments=deployments, services=services, domains=domains)
 
 @admin.route("/listusers", methods=['GET'])
 @fresh_login_required

app/templates/admin/admin_cloud.html

@@ -1,7 +1,3 @@
-    <center>
-    <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-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-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_addresses') }}','_self')"><span class="glyphicon glyphicon-tag" aria-hidden="true"></span> Addresses</button>
-    <button class="btn btn-danger btn-md" onclick="window.open('{{ url_for('admin.list_recyclebin') }}', '_self')"><span class="glyphicon glyphicon-cd" aria-hidden="true"></span> Recycle Bin</button>
-    </center>
-

app/templates/admin/admin_misc.html

@@ -1,7 +1,4 @@
-    <center>
     <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-success btn-md" onclick="window.open('{{ url_for('admin.list_domains') }}','_self')"><span class="glyphicon glyphicon-home" aria-hidden="true"></span> Domains</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>
-    </center>
-

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>
+  <div class="no-more-tables">
   <table class="table table-hover table-striped table-condensed cf">
    <thead>
     <tr>
@@ -120,3 +121,4 @@ addEventListener("DOMContentLoaded", function() {
 
 {% endblock %}
 
+

app/templates/admin/list_deployments.html

@@ -60,6 +60,7 @@
 
   <div class="row">
   </div>
+
 </div>
 
 {% endblock %}

app/templates/panel/dashboard.html

@@ -136,6 +136,9 @@ addEventListener("DOMContentLoaded", function() {
   </div>
   {% else %}
 <!--<button class="btn btn-default btn-lg btn-block" onclick="window.open('{{ url_for('dmanager.createdomain') }}','_self')"><img class="icon icons8-Address-Book" width="32" height="32" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAACOElEQVRYhe2Y3W7aQBCF83ZIVdTn4iK973tUCo1KoVVbCC0hSqUoKrKxoQYDCf5BGBtjz+nFeMFO41RtyIIqjzTCs1jMt7OzZ7GPjgrboR2ffK2Wyk3sw49PWm/+CFgqN/G6HW+8VG7iVCEpXio3UQD+94DCX+T1474B03kLwAKwAJQJWNUI17eEvgs4AbBcA1MP0BzgwtwzYMckrCIgigHLZyjFAswFsAgBAJgtgc8/9wA4nDPA1ANq+sP3XI4J/hogAr48ApkW6pevWuMnA15NCADQs5EZ/9jnJT9VCHWdr2s6IYwBLwTOevmAwp5cwarGCRchUFF5rGEQlutNDvRs/tQdZCakWHh+wJs7TnY+5PhDnxATEERAe0T4NqJN/3UToLcqgQiYeBIAzQX/kFiugctxx/x9Et+n2zE3APy1BMD5iqVExKJa71L9JZb0crwds30gjCUARjHrnYhjAtwgm7hrcbKGwXFF5fucQAKgE7DupeP7lbF9ZPq0YXBFNUcCYD/puXqifUpSretb3gw3d4Spx2Oqzb069XhS7zUJMiP6y5hzNT4N+DQR5gYsP35KdoIIaBoShXq25MStZAlrOp8a50PaaONZj3BhEtojymygPEDNIWjOI88nfwNY13mzxAT8mG2h7ntFzf/uWQEF5CTpNS/kPwhdC7ia8C4euMAq2vaqdEDhHZPF2vax6UV/zZKiWPnnrzTAXXgBWAAeAmBKqA/z1ceDUAXgLgEP/hVwYf9gvwBORombjyORBAAAAABJRU5ErkJggg=="> Order</button>-->
+  </div>
+  </div>
+  </div>
   {% endif %}