4 files changed, 11 insertions, 5 deletions
diff --git a/web/static/js/common.js b/web/static/js/common.js
index d9eb595..c987242 100644
--- a/web/static/js/common.js
+++ b/web/static/js/common.js
@@ -35,6 +35,14 @@
 		},
 		'format_billions': function(isk) {
 			return ykill.format_millions(isk / 1000);
+		},
+
+		'format_system': function(system, security, security_status) {
+			if (security_status == '?') // placeholder for w-space
+				security = '?';
+			else
+				security = security.toFixed(1);
+			return system + ' <span class="' + security_status + '">' + security + '</span>';
 		}
 	});
 })();
diff --git a/web/static/js/home.js b/web/static/js/home.js
index 11e1422..b0bc9d0 100644
--- a/web/static/js/home.js
+++ b/web/static/js/home.js
@@ -5,7 +5,7 @@ window.addEvent('domready', function() {
 			table.grab(new Element('tr').adopt(
 				new Element('td').grab(ykill.portrait(kill['ship_type_id'], kill['ship_name'], 'type', '_32.png')),
 				new Element('td', {'html': kill['ship_name']}),
-				new Element('td', {'html': kill['system_name'] + ' (' + kill['security'].toFixed(1) + ')'}),
+				new Element('td', {'html': ykill.format_system(kill['system_name'], kill['security'], kill['security_status'])}),
 				new Element('td').grab(
 					new Element('a', {
 						'href': '/kill/' + kill['kill_id'],
diff --git a/web/static/js/kill.js b/web/static/js/kill.js
index 03652d5..7a5dea1 100644
--- a/web/static/js/kill.js
+++ b/web/static/js/kill.js
@@ -13,7 +13,7 @@ window.addEvent('domready', function() {
 			),
 			new Element('tr').adopt(
 				new Element('td', {'html': 'system'}),
-				new Element('td', {'html': kill['solarSystemName'] + ' (' + kill['security'].toFixed(1) + ')'})
+				new Element('td', {'html': ykill.format_system(kill['system_name'], kill['security'], kill['security_status'])})
 			),
 			new Element('tr').adopt(
 				new Element('td').grab(
diff --git a/web/static/js/kill_list.js b/web/static/js/kill_list.js
index 9384228..5a68bcf 100644
--- a/web/static/js/kill_list.js
+++ b/web/static/js/kill_list.js
@@ -18,9 +18,7 @@ window.addEvent('domready', function() {
 			var td = new Element('td').grab(a);
 			tr.grab(td);
 
-			td = new Element('td');
-			td.appendText(kill['system_name'] + ' ');
-			td.grab(new Element('span', {'html': kill['security'].toFixed(1)}));
+			td = new Element('td', {'html': ykill.format_system(kill['system_name'], kill['security'], kill['security_status'])});
 			td.grab(new Element('br'));
 			td.appendText(kill['region']);
 			tr.grab(td);