Oláh István Gergely · @ogergo · Őry Máté · Oláh István Gergely · Őry Máté · Őry Máté
--- a/circle/dashboard/templates/dashboard/node-detail-home.html
+++ b/circle/dashboard/templates/dashboard/node-detail-home.html
      <dt>Description:</dt>
      <dd><small>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc est libero, hendrerit at posuere sed, molestie congue quam. </small></dd>
    </dl>
+    <div style="font-weight: bold;">{% trans "Traits" %}</div>
+    <div id="node-details-traits" style="margin-bottom: 20px;">
+      <div id="node-details-traits-list">
+        {% if node.traits.all %}
+          {% for t in node.traits.all %}
+            <div class="label label-success label-tag" style="display: inline-block">
+              {{ t }}
+	      <a data-trait-pk="{{ t.pk }}" href="#" class="node-details-remove-trait"><i class="icon-remove"></i></a>
+            </div>
+          {% endfor %}
+        {% else %}
+          <small>No trait added!</small>
--- a/circle/dashboard/views.py
+++ b/circle/dashboard/views.py
+                                     kwargs={'pk': self.object.pk}))
+
+    def __remove_trait(self, request):
+        try:
+            to_remove = request.POST.get('to_remove')
+            self.object = self.get_object()
+            self.object.traits.remove(to_remove)
+            message = u"Success"
+        except:  # note this won't really happen
+            message = u"Not success"
+
+        if request.is_ajax():
+            return HttpResponse(
+                json.dumps({'message': message}),
+                content_type="application=json"
+            )
--- a/circle/dashboard/views.py
+++ b/circle/dashboard/views.py
            return redirect(reverse_lazy("dashboard.views.node-detail",
                                         kwargs={'pk': self.object.pk}))
  
+    def __add_trait(self, request):
+        new_trait_name = request.POST.get('new_trait')
+        self.object = self.get_object()
+
+        if len(new_trait_name) < 1:
+            message = u"Please input something!"
--- a/circle/dashboard/views.py
+++ b/circle/dashboard/views.py
            return redirect(reverse_lazy("dashboard.views.node-detail",
                                         kwargs={'pk': self.object.pk}))
  
+    def __add_trait(self, request):
+        new_trait_name = request.POST.get('new_trait')
+        self.object = self.get_object()
+
+        if len(new_trait_name) < 1:
+            message = u"Please input something!"
+        elif len(new_trait_name) > 20:
+            message = u"Trait name is too long!"
--- a/circle/dashboard/views.py
+++ b/circle/dashboard/views.py
+        new_trait_name = request.POST.get('new_trait')
+        self.object = self.get_object()
+
+        if len(new_trait_name) < 1:
+            message = u"Please input something!"
+        elif len(new_trait_name) > 20:
+            message = u"Trait name is too long!"
+        else:
+            self.object.traits.create(name=new_trait_name)
+
+        try:
+            messages.error(request, message)
+        except:
+            pass
+
+        return redirect(reverse_lazy("dashboard.views.node-detail",