dashboard: node fixes

- remove verbose name where not needed
- add verbose name where needed
- add result for node activities

circle/dashboard/tables.py

@@ -39,12 +39,7 @@ class NodeListTable(Table):
         attrs={'th': {'class': 'node-list-table-thin'}},
         attrs={'th': {'class': 'node-list-table-thin'}},
     )
     )
 
 
-    host = Column(
-        verbose_name=_("Host"),
-    )
-
     enabled = BooleanColumn(
     enabled = BooleanColumn(
-        verbose_name=_("Enabled"),
         attrs={'th': {'class': 'node-list-table-thin'}},
         attrs={'th': {'class': 'node-list-table-thin'}},
     )
     )
 
 
@@ -54,7 +49,6 @@ class NodeListTable(Table):
     )
     )
 
 
     priority = Column(
     priority = Column(
-        verbose_name=_("Priority"),
         attrs={'th': {'class': 'node-list-table-thin'}},
         attrs={'th': {'class': 'node-list-table-thin'}},
     )
     )
 
 
@@ -65,12 +59,14 @@ class NodeListTable(Table):
     )
     )
 
 
     monitor = TemplateColumn(
     monitor = TemplateColumn(
+        verbose_name=_("Monitor"),
         template_name='dashboard/node-list/column-monitor.html',
         template_name='dashboard/node-list/column-monitor.html',
         attrs={'th': {'class': 'node-list-table-monitor'}},
         attrs={'th': {'class': 'node-list-table-monitor'}},
         orderable=False,
         orderable=False,
     )
     )
 
 
     actions = TemplateColumn(
     actions = TemplateColumn(
+        verbose_name=_("Actions"),
         attrs={'th': {'class': 'node-list-table-thin'}},
         attrs={'th': {'class': 'node-list-table-thin'}},
         template_code=('{% include "dashboard/node-list/column-'
         template_code=('{% include "dashboard/node-list/column-'
                        'actions.html" with btn_size="btn-xs" %}'),
                        'actions.html" with btn_size="btn-xs" %}'),

circle/dashboard/templates/dashboard/node-detail/_activity-timeline.html

@@ -5,15 +5,17 @@
   <span class="timeline-icon{% if a.has_failed %} timeline-icon-failed{% endif %}">
   <span class="timeline-icon{% if a.has_failed %} timeline-icon-failed{% endif %}">
   <i class="fa {% if not a.finished %}fa-refresh fa-spin {% else %}fa-plus{% endif %}"></i>
   <i class="fa {% if not a.finished %}fa-refresh fa-spin {% else %}fa-plus{% endif %}"></i>
 </span>
 </span>
-<strong>{% if user.is_superuser %}
+<strong title="{{ a.result.get_admin_text }}">
   {{ a.readable_name.get_admin_text|capfirst }}
   {{ a.readable_name.get_admin_text|capfirst }}
-    {% else %}
-    {{ a.readable_name.get_user_text|capfirst }}{% endif %}</strong>
+</strong>
+
 {{ a.started|date:"Y-m-d H:i" }}, {{ a.user }}
 {{ a.started|date:"Y-m-d H:i" }}, {{ a.user }}
   {% if a.children.count > 0 %}
   {% if a.children.count > 0 %}
     <div class="sub-timeline">
     <div class="sub-timeline">
       {% for s in a.children.all %}
       {% for s in a.children.all %}
-      <div data-activity-id="{{ s.pk }}" class="sub-activity{% if s.has_failed %} sub-activity-failed{% endif %}">
+      <div data-activity-id="{{ s.pk }}" 
+        class="sub-activity{% if s.has_failed %} sub-activity-failed{% endif %}"
+        >
     {% if user.is_superuser %}
     {% if user.is_superuser %}
     {{ s.readable_name.get_admin_text }}
     {{ s.readable_name.get_admin_text }}
     {% else %}
     {% else %}
@@ -25,7 +27,7 @@
           <i class="fa fa-refresh fa-spin" class="sub-activity-loading-icon"></i>
           <i class="fa fa-refresh fa-spin" class="sub-activity-loading-icon"></i>
         {% endif %}
         {% endif %}
         {% if s.has_failed %}
         {% if s.has_failed %}
-          <div class="label label-danger">{% trans "failed" %}</div>
+          <div title="{{ s.result.get_admin_text }}" class="label label-danger">{% trans "failed" %}</div>
         {% endif %}
         {% endif %}
         </div>
         </div>
       {% endfor %}
       {% endfor %}