From 70032fc2e1a8cf2dd11062889b9355c987eae54d Mon Sep 17 00:00:00 2001 From: catborise Date: Mon, 20 Jan 2020 15:47:14 +0300 Subject: [PATCH] re organize instance overview. add snapshot indicator if there is... add bottom bar for navigation. --- instances/templates/instance.html | 124 ++++++++++++++++++------------ 1 file changed, 74 insertions(+), 50 deletions(-) diff --git a/instances/templates/instance.html b/instances/templates/instance.html index 968d307..6cc510f 100644 --- a/instances/templates/instance.html +++ b/instances/templates/instance.html @@ -4,61 +4,85 @@ {% block title %}{% trans "Instance" %} - {{ vname }}{% endblock %} {% block content %} {% include 'pleasewaitdialog.html' %} + -
+
-

- {{ vname }}{% if title %} ({{ title }}){% endif %} -

+

{{ vname }}{% if title %} ({{ title }}){% endif %}

-
- {% if status == 5 %} - {% trans "Off" %} - {% endif %} - {% if status == 1 %} - {% trans "Active" %} - {% endif %} - {% if status == 3 %} - {% trans "Suspend" %} - {% endif %} - | - {% if cur_vcpu %} - {{ cur_vcpu }} {% trans "Vcpu" %} - {% else %} - {{ vcpu }} {% trans "Vcpu" %} - {% endif %} - | - {{ cur_memory }} {% trans "MB" %} {% trans "Ram" %} - | - {% for disk in disks %} - {{ disk.size|filesizeformat }} {% trans "Disk" %} | - {% endfor %} - {% for net in networks %} - {% for ipv4 in net.ipv4|default:"-" %} - {{ ipv4 }} | - {% endfor %} - {% endfor %} - - | - - on - {{ compute.name }}{% if compute.name != compute.hostname %} - {{ compute.hostname }}{% endif %} -
+ class="fa fa-plug text-warning" + title="Guest Agent Enabled but not Connected" + {% endif %} + {% else %} + class="fa fa-plug text-danger" + title="Guest Agent Not Enabled & Not Connected" + {% endif %}> + + | + {% if snapshots %} + | + {% endif %} + {% if cur_vcpu %} + {{ cur_vcpu }} {% trans "Vcpu" %} + {% else %} + {{ vcpu }} {% trans "Vcpu" %} + {% endif %} + | + {{ cur_memory }} {% trans "MB" %} {% trans "Ram" %} + | + {% for disk in disks %} + {{ disk.size|filesizeformat }} {% trans "Disk" %} | + {% endfor %} + {% for net in networks %} + {% for ipv4 in net.ipv4 %} + {{ ipv4 }} | + {% endfor %} + {% endfor %} +
{% if user_quota_msg %} {{ user_quota_msg|capfirst }} {% trans "quota reached" %}.