Show time_of_suspend and ram_size in vm-list
diff --git a/circle/dashboard/templates/dashboard/vm-list.html b/circle/dashboard/templates/dashboard/vm-list.html
index 96af7f4..e2a6515 100644
--- a/circle/dashboard/templates/dashboard/vm-list.html
+++ b/circle/dashboard/templates/dashboard/vm-list.html
@@ -72,6 +72,10 @@
{% trans "Lease" as t %}
{% include "dashboard/vm-list/header-link.html" with name=t sort="lease" %}
</th>
+ <th data-sort="string" class="orderable sortable">
+ {% trans "Memory" as t %}
+ {% include "dashboard/vm-list/header-link.html" with name=t sort="memory" %}
+ </th>
{% if user.is_superuser %}
<th data-sort="string" class="orderable sortable">
{% trans "IP address" as t %}
@@ -87,7 +91,7 @@
<tr class="{% cycle 'odd' 'even' %}" data-vm-pk="{{ i.pk }}">
<td class="pk"><div id="vm-{{i.pk}}">{{i.pk}}</div> </td>
<td class="name"><a class="real-link" href="{% url "dashboard.views.detail" i.pk %}">{{ i.name }}</a> </td>
- <td class="state">
+ <td class="state" style="white-space: nowrap;">
<i class="fa fa-fw
{% if show_acts_in_progress and i.is_in_status_change %}
fa-spin fa-spinner
@@ -104,7 +108,10 @@
{# include "dashboard/_display-name.html" with user=i.owner show_org=True #}
</td>
<td class="lease "data-sort-value="{{ i.lease.name }}">
- {{ i.lease.name }}
+ <span title="{{ i.time_of_suspend|timeuntil }} | {{ i.time_of_delete|timeuntil }}">{{ i.lease.name }}</span>
+ </td>
+ <td class="memory "data-sort-value="{{ i.ram_size }}" style="white-space: nowrap;">
+ {{ i.ram_size }} MiB
</td>
{% if user.is_superuser %}
<td class="ip_addr "data-sort-value="{{ i.ipv4 }}">-
-
Status changed to closed by commit 83f7bd
Toggle commit list
Please
register
or
sign in
to comment