dashboard: fix node traits css, cleanup views

circle/dashboard/static/dashboard/dashboard.css

@@ -191,31 +191,31 @@ body {
   /* pass */
   /* pass */
 }
 }
 
 
-#vm-details-tags-form {
+#vm-details-tags-form, #node-details-traits-form {
   margin-top: 15px;
   margin-top: 15px;
   max-width: 250px;
   max-width: 250px;
 }
 }
 
 
-.vm-details-remove-tag {
+.vm-details-remove-tag, .node-details-remove-trait {
   color: white;
   color: white;
   padding-left: 5px;
   padding-left: 5px;
 }
 }
 
 
-.vm-details-remove-tag:hover {
+.vm-details-remove-tag:hover, .node-details-remove-trait:hover {
   cursor: pointer;
   cursor: pointer;
   color: black;
   color: black;
   text-decoration: none;
   text-decoration: none;
 }
 }
 
 
 /* small buttons for tags, copied from Bootstraps input-sm, bnt-sm */
 /* small buttons for tags, copied from Bootstraps input-sm, bnt-sm */
-.btn-tags {
+.btn-tags, .btn-traits {
   padding: 3px 6px;
   padding: 3px 6px;
   font-size: 11px;
   font-size: 11px;
   line-height: 1.5;
   line-height: 1.5;
   border-radius: 3px;
   border-radius: 3px;
 }
 }
 
 
-.input-tags {
+.input-tags, .input-tratis {
   height: 22px;
   height: 22px;
   padding: 2px 8px;
   padding: 2px 8px;
   font-size: 11px;
   font-size: 11px;

circle/dashboard/templates/dashboard/node-detail-home.html

@@ -12,7 +12,7 @@
       <div id="node-details-traits-list">
       <div id="node-details-traits-list">
         {% if node.traits.all %}
         {% if node.traits.all %}
           {% for t in node.traits.all %}
           {% for t in node.traits.all %}
-            <div class="label label-primary label-tag" style="display: inline-block">
+            <div class="label label-success label-tag" style="display: inline-block">
               {{ t }}
               {{ t }}
               <a href="#" class="node-details-remove-trait"><i class="icon-remove"></i></a>
               <a href="#" class="node-details-remove-trait"><i class="icon-remove"></i></a>
             </div>
             </div>
@@ -23,7 +23,7 @@
       </div>
       </div>
       <form action="" method="POST">
       <form action="" method="POST">
         {% csrf_token %}
         {% csrf_token %}
-        <div class="input-group" id="node-details-trait-form">
+        <div class="input-group" id="node-details-traits-form">
           <input type="text" class="form-control input-sm input-traits" name="new_trait" id="node-details-traits-input"/>
           <input type="text" class="form-control input-sm input-traits" name="new_trait" id="node-details-traits-input"/>
           <div class="input-group-btn">
           <div class="input-group-btn">
             <input type="submit" class="btn btn-default btn-sm input-traits" value="{% trans "Add trait" %}"/>
             <input type="submit" class="btn btn-default btn-sm input-traits" value="{% trans "Add trait" %}"/>

circle/dashboard/views.py

@@ -34,7 +34,7 @@ from .tables import (VmListTable, NodeListTable, NodeVmListTable,
                      TemplateListTable, LeaseListTable, GroupListTable,)
                      TemplateListTable, LeaseListTable, GroupListTable,)
 from vm.models import (Instance, InstanceTemplate, InterfaceTemplate,
 from vm.models import (Instance, InstanceTemplate, InterfaceTemplate,
                        InstanceActivity, Node, instance_activity, Lease,
                        InstanceActivity, Node, instance_activity, Lease,
-                       Interface, NodeActivity, Trait)
+                       Interface, NodeActivity, )
 from firewall.models import Vlan, Host, Rule
 from firewall.models import Vlan, Host, Rule
 from storage.models import Disk
 from storage.models import Disk
 from dashboard.models import Favourite
 from dashboard.models import Favourite