dashboard: clean up node detail

4ae34984 · Kálmán Viktor · 67b6d1ea · 4ae34984 · 4ae34984 · 4ae34984
Commit 4ae34984 authored Aug 06, 2014 by Kálmán Viktor
8 changed files
--- a/circle/dashboard/forms.py
+++ b/circle/dashboard/forms.py
@@ -925,10 +925,8 @@ class TraitForm(forms.ModelForm):
                Field('name', id="node-details-traits-input",
                      css_class="input-sm input-traits"),
                Div(
-                    HTML('<input type="submit" '
+                    Submit("submit", _("Add trait"),
-                         'class="btn btn-default btn-sm input-traits" '
+                           css_class="btn btn-primary btn-sm input-traits"),
-                         'value="Add trait"/>',
-                         ),
                    css_class="input-group-btn",
                ),
                css_class="input-group",

--- a/circle/dashboard/static/dashboard/node-details.js
+++ b/circle/dashboard/static/dashboard/node-details.js
+$(function() {
  /* rename */
  $("#node-details-h1-name, .node-details-rename-button").click(function() {
    $("#node-details-h1-name").hide();
@@ -43,26 +44,6 @@
    return false;
  });
-function changeNodeStatus(data) {
-  $.ajax({
-    type: 'POST',
-    url: data['url'],
-    headers: {"X-CSRFToken": getCookie('csrftoken')},
-    success: function(re, textStatus, xhr) {
-      if(!data['redirect']) {
-        selected = [];
-        addMessage(re['message'], 'success');
-      } else {
-        window.location.replace('/dashboard');
-      }
-    },
-    error: function(xhr, textStatus, error) {
-      addMessage('Uh oh :(', 'danger')
-    }
-  });
-}
  // remove trait
  $('.node-details-remove-trait').click(function() {
    var to_remove =  $(this).data("trait-pk");
@@ -86,3 +67,24 @@ function changeNodeStatus(data) {
    });
    return false;
  });
+});
+function changeNodeStatus(data) {
+  $.ajax({
+    type: 'POST',
+    url: data['url'],
+    headers: {"X-CSRFToken": getCookie('csrftoken')},
+    success: function(re, textStatus, xhr) {
+      if(!data['redirect']) {
+        selected = [];
+        addMessage(re['message'], 'success');
+      } else {
+        window.location.replace('/dashboard');
+      }
+    },
+    error: function(xhr, textStatus, error) {
+      addMessage('Uh oh :(', 'danger')
+    }
+  });
+}
--- a/circle/dashboard/tables.py
+++ b/circle/dashboard/tables.py
@@ -22,7 +22,7 @@ from django_tables2 import Table, A
 from django_tables2.columns import (TemplateColumn, Column, BooleanColumn,
                                    LinkColumn)
-from vm.models import Instance, Node, InstanceTemplate, Lease
+from vm.models import Node, InstanceTemplate, Lease
 from django.utils.translation import ugettext_lazy as _
 from django_sshkey.models import UserKey
@@ -140,43 +140,6 @@ class UserListTable(Table):
        fields = ('pk', 'username', )
-class NodeVmListTable(Table):
-    pk = TemplateColumn(
-        template_name='dashboard/vm-list/column-id.html',
-        verbose_name="ID",
-        attrs={'th': {'class': 'vm-list-table-thin'}},
-    )
-    name = TemplateColumn(
-        template_name="dashboard/vm-list/column-name.html"
-    )
-    admin = TemplateColumn(
-        template_name='dashboard/vm-list/column-admin.html',
-        attrs={'th': {'class': 'vm-list-table-admin'}},
-    )
-    details = TemplateColumn(
-        template_name='dashboard/vm-list/column-details.html',
-        attrs={'th': {'class': 'vm-list-table-thin'}},
-    )
-    actions = TemplateColumn(
-        template_name='dashboard/vm-list/column-actions.html',
-        attrs={'th': {'class': 'vm-list-table-thin'}},
-    )
-    time_of_suspend = TemplateColumn(
-        '{{ record.time_of_suspend|timeuntil }}',
-        verbose_name=_("Suspend in"))
-    time_of_delete = TemplateColumn(
-        '{{ record.time_of_delete|timeuntil }}',
-        verbose_name=_("Delete in"))
-    class Meta:
-        model = Instance
-        attrs = {'class': ('table table-bordered table-striped table-hover '
-                           'vm-list-table')}
-        fields = ('pk', 'name', 'state', 'time_of_suspend', 'time_of_delete', )
 class UserListTablex(Table):
    class Meta:
        model = User

--- a/circle/dashboard/templates/dashboard/node-detail.html
+++ b/circle/dashboard/templates/dashboard/node-detail.html
@@ -54,11 +54,13 @@
  <div class="row">
    <div class="col-md-2" id="node-info-pane">
      <div id="node-info-data" class="big">
-      <span id="node-details-state" class="label {% if node.state == 'ONLINE' %}label-success
+        <span id="node-details-state" class="label
+          {% if node.state == 'ONLINE' %}label-success
          {% elif node.state == 'MISSING' %}label-danger
          {% elif node.state == 'DISABLED' %}label-warning
-			{% elif node.state == 'OFFLINE' %}label-warning
+          {% elif node.state == 'OFFLINE' %}label-warning{% endif %}">
-			{% endif %}">{{ node.get_status_display|upper }}</span>
+          <i class="fa {{ node.get_status_icon }}"></i> {{ node.get_status_display|upper }}
+        </span>
      </div>
    </div>
    <div class="col-md-10" id="node-detail-pane">
@@ -67,39 +69,41 @@
          <li class="active">
            <a href="#home" data-toggle="pill" class="text-center">
              <i class="fa fa-compass fa-2x"></i><br>
-              {% trans "Home" %}</a></li>
+              {% trans "Home" %}
+            </a>
+          </li>
          <li>
            <a href="#resources" data-toggle="pill" class="text-center">
              <i class="fa fa-tasks fa-2x"></i><br>
-              {% trans "Resources" %}</a></li>
+              {% trans "Resources" %}
+            </a>
+          </li>
 	  <li>
-            <a href="#virtualmachines" data-toggle="pill" class="text-center">
+            <a href="{% url "dashboard.views.vm-list" %}?s=node:{{ node.name }}" 
+              target="blank" class="text-center">
              <i class="fa fa-desktop fa-2x"></i><br>
-              {% trans "Virtual Machines" %}</a></li>
+              {% trans "Virtual Machines" %}
+            </a>
+          </li>
 	  <li>
            <a href="#activity" data-toggle="pill" class="text-center">
              <i class="fa fa-clock-o fa-2x"></i><br>
-              {% trans "Activity" %}</a></li>
+              {% trans "Activity" %}
+            </a>
+          </li>
 	</ul>
        <div id="panel-body"  class="tab-content panel-body">
          <div class="tab-pane active" id="home">{% include "dashboard/node-detail/home.html" %}</div>
 	  <div class="tab-pane" id="resources">{% include "dashboard/node-detail/resources.html" %}</div>
          <div class="tab-pane" id="activity">{% include "dashboard/node-detail/activity.html" %}</div>
-          <div class="tab-pane" id="virtualmachines">{% include "dashboard/node-detail/vm.html" %}</div>
  	</div>
      </div>
    </div>
  </div>
 </div>
-<style>
-  .popover {
-    max-width: 600px;
-  }
-</style>
 {% endblock %}
 {% block extra_js %}
-<script src="{{ STATIC_URL}}dashboard/node-details.js"></script>
+  <script src="{{ STATIC_URL}}dashboard/node-details.js"></script>
 {% endblock %}
--- a/circle/dashboard/templates/dashboard/node-detail/_activity-timeline.html
+++ b/circle/dashboard/templates/dashboard/node-detail/_activity-timeline.html
@@ -6,9 +6,9 @@
  <i class="fa {% if not a.finished %}fa-refresh fa-spin {% else %}fa-plus{% endif %}"></i>
 </span>
 <strong>{% if user.is_superuser %}
-    {{ a.readable_name.get_admin_text }}
+    {{ a.readable_name.get_admin_text|capfirst }}
    {% else %}
-    {{ a.readable_name.get_user_text }}{% endif %}</strong>
+    {{ a.readable_name.get_user_text|capfirst }}{% endif %}</strong>
 {{ a.started|date:"Y-m-d H:i" }}, {{ a.user }}
  {% if a.children.count > 0 %}
    <div class="sub-timeline">

--- a/circle/dashboard/templates/dashboard/node-detail/resources.html
+++ b/circle/dashboard/templates/dashboard/node-detail/resources.html
@@ -4,15 +4,25 @@
  <dl class="dl-horizontal">
    <dt>{% trans "Node name" %}:</dt><dd>{{ node.name }}</dd>
    <dt>{% trans "CPU cores" %}:</dt><dd>{{ node.info.core_num }}</dd>
-    <dt>{% trans "RAM size" %}:</dt> <dd>{% widthratio node.info.ram_size 1048576 1 %} MB</dd>
+    <dt>{% trans "RAM size" %}:</dt> <dd>{% widthratio node.info.ram_size 1048576 1 %} MiB</dd>
    <dt>{% trans "Architecture" %}:</dt><dd>{{ node.info.architecture }}</dd>
    <dt>{% trans "Host IP" %}:</dt><dd>{{ node.host.ipv4 }}</dd>
    <dt>{% trans "Enabled" %}:</dt><dd>{{ node.enabled }}</dd>
    <dt>{% trans "Host online" %}:</dt><dd> {{ node.online }}</dd>
    <dt>{% trans "Priority" %}:</dt><dd>{{ node.priority }}</dd>
-    <dt>{% trans "Host owner" %}:</dt><dd>{{ node.host.owner }}</dd>
+    <dt>{% trans "Host owner" %}:</dt>
+    <dd>
+      {% include "dashboard/_display-name.html" with user=node.host.owner show_org=True %}
+    </dd>
    <dt>{% trans "Vlan" %}:</dt><dd>{{ node.host.vlan }}</dd>
-    <dt>{% trans "Host name" %}:</dt><dd>{{ node.host.hostname }}</dd>
+    <dt>{% trans "Host name" %}:</dt>
+    <dd>
+      {{ node.host.hostname }}
+      <a href="{{ node.host.get_absolute_url }}" class="btn btn-default btn-xs">
+        <i class="fa fa-pencil"></i>
+        {% trans "Edit host" %}
+      </a>
+    </dd>
    </dl>
 {% block extra_js %}

--- a/circle/dashboard/templates/dashboard/node-detail/vm.html
+++ b/circle/dashboard/templates/dashboard/node-detail/vm.html
-{% load render_table from django_tables2 %}
-{% block content %}
-<div class="panel-body">
-  {% render_table table %}
-</div>
-{% endblock %}
-<script>
-    "use strict";
-    $('a[data-toggle$="pill"][href!="#virtualmachines"]').click(function() {
-        $("#node-info-pane").fadeIn();
-        $("#node-detail-pane").removeClass("col-md-12");
-    });
-    $('a[href$="virtualmachines"]').click(function() {
-        $("#node-info-pane").hide();
-        $("#node-detail-pane").addClass("col-md-12");
-    });
-    </script>
-{% block extra_js %}
-<script src="{{ STATIC_URL}}dashboard/vm-list.js"></script>
-{% endblock %}
--- a/circle/dashboard/views.py
+++ b/circle/dashboard/views.py
@@ -74,7 +74,7 @@ from .forms import (
 )
 from .tables import (
-    NodeListTable, NodeVmListTable, TemplateListTable, LeaseListTable,
+    NodeListTable, TemplateListTable, LeaseListTable,
    GroupListTable, UserKeyListTable
 )
 from common.models import HumanReadableObject, HumanReadableException
@@ -997,7 +997,6 @@ class NodeDetailView(LoginRequiredMixin, SuperuserRequiredMixin, DetailView):
            form = self.form_class()
        context = super(NodeDetailView, self).get_context_data(**kwargs)
        instances = Instance.active.filter(node=self.object)
-        context['table'] = NodeVmListTable(instances)
        na = NodeActivity.objects.filter(
            node=self.object, parent=None
        ).order_by('-started').select_related()