Merge branch 'issue-310' into 'master'

Add memory to vm list

Closes #310

See merge request !225

circle/dashboard/static/dashboard/dashboard.css

@@ -1000,7 +1000,8 @@ textarea[name="new_members"] {
   max-width: 100%;
 }
 
-#vm-list-table tbody td:nth-child(3) {
+#vm-list-table td.state,
+#vm-list-table td.memory {
   white-space: nowrap;
 }
 

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="ram_size" %}
+              </th>
               {% if user.is_superuser %}
                 <th data-sort="string" class="orderable sortable">
                   {% trans "IP address" as t %}
@@ -86,7 +90,9 @@
           {% for i in object_list %}
           <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="name"><a class="real-link" href="{% url "dashboard.views.detail" i.pk %}">
+                {{ i.name }}</a>
+            </td>
             <td class="state">
               <i class="fa fa-fw
                 {% if show_acts_in_progress and i.is_in_status_change %}
@@ -104,7 +110,12 @@
               {# include "dashboard/_display-name.html" with user=i.owner show_org=True #}
             </td>
             <td class="lease "data-sort-value="{{ 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 }}">
+              {{ i.ram_size }} MiB
             </td>
             {% if user.is_superuser %}
             <td class="ip_addr "data-sort-value="{{ i.ipv4 }}">