From 71f8c9741a7d8e0103d2ca2a7e1689f1f5cd690c Mon Sep 17 00:00:00 2001
From: Kálmán Viktor <kviktor@cloud.bme.hu>
Date: Mon, 6 Oct 2014 13:12:25 +0200
Subject: [PATCH] dashboard: fix node box labels
---
circle/dashboard/static/dashboard/dashboard.js | 2 +-
circle/vm/models/node.py | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/circle/dashboard/static/dashboard/dashboard.js b/circle/dashboard/static/dashboard/dashboard.js
index a497d6b..dcac619 100644
--- a/circle/dashboard/static/dashboard/dashboard.js
+++ b/circle/dashboard/static/dashboard/dashboard.js
@@ -445,7 +445,7 @@ function generateNodeHTML(name, icon, _status, url, is_last) {
function generateNodeTagHTML(name, icon, _status, label , url) {
return '<a href="' + url + '" class="label ' + label + '" >' +
- '<i class="' + icon + '" title="' + _status + '"></i> ' + name +
+ '<i class="fa ' + icon + '" title="' + _status + '"></i> ' + name +
'</a> ';
}
diff --git a/circle/vm/models/node.py b/circle/vm/models/node.py
index 3aea89a..bf82ccc 100644
--- a/circle/vm/models/node.py
+++ b/circle/vm/models/node.py
@@ -313,10 +313,11 @@ class Node(OperatedMixin, TimeStampedModel):
def get_status_label(self):
return {
'OFFLINE': 'label-warning',
- 'DISABLED': 'label-warning',
+ 'DISABLED': 'label-danger',
'MISSING': 'label-danger',
- 'ONLINE': 'label-success'}.get(self.get_state(),
- 'label-danger')
+ 'ACTIVE': 'label-success',
+ 'PASSIVE': 'label-warning',
+ }.get(self.get_state(), 'label-danger')
@node_available
def update_vm_states(self):
--
libgit2 0.26.0