1 files changed, 59 insertions, 37 deletions

diff --git a/web/static/js/corporation.js b/web/static/js/corporation.js
index 10a1753..b19bbc3 100644
--- a/web/static/js/corporation.js
+++ b/web/static/js/corporation.js
@@ -1,49 +1,71 @@
 window.addEvent('domready', function() {
 	var corp_id = document.location.pathname.split('/').getLast();
 	ykill.api('/corporation/' + corp_id, function(kills) {
-		var div = $('kills');
+		var table = $('kills').getChildren('tbody')[0];
 		kills.each(function(kill) {
+			var tr = new Element('tr');
+
+			var kill_time = kill['kill_time'].split(' ', 2);
 			var a = new Element('a', {'href': '/kill/' + kill['kill_id']});
-			a.appendText(kill['kill_time']);
-
-			a.adopt(new Element('img', {
-				'src': '//image.eveonline.com/Character/' + kill['victim']['character_id'] + '_32.jpg',
-				'alt': kill['victim']['character_name'],
-			}));
-			a.appendText(kill['victim']['character_name']);
-			a.adopt(new Element('img', {
-				'src': '//image.eveonline.com/Corporation/' + kill['victim']['corporation_id'] + '_32.png',
-				'alt': kill['victim']['corporation_name'],
-			}));
-			a.appendText(kill['victim']['corporation_name']);
-			if (kill['victim']['alliance_id']) {
-				a.adopt(new Element('img', {
-					'src': '//image.eveonline.com/Alliance/' + kill['victim']['alliance_id'] + '_32.png',
-					'alt': kill['victim']['alliance_name'],
-				}));
-				a.appendText(kill['victim']['alliance_name']);
+			a.appendText(kill_time[0]);
+			a.adopt(new Element('br'));
+			a.appendText(kill_time[1]);
+			var td = new Element('td').adopt(a);
+			tr.adopt(td);
+
+			td = new Element('td');
+			td.appendText(kill['system_name'] + ' ');
+			td.adopt(new Element('span', {'html': kill['security'].toFixed(1)}));
+			td.adopt(new Element('br'));
+			td.appendText(kill['region']);
+			tr.adopt(td);
+
+			td = new Element('td');
+			var victim = kill['victim'];
+			show_portrait(td, victim['ship_type_id'], victim['ship_name'], 'type', '_32.png');
+			show_portrait(td, victim['character_id'], victim['character_name'], 'character', '_32.jpg');
+			if (victim['faction_id']) {
+				show_portrait(td, victim['faction_id'], victim['faction_name'], 'faction', '_32.png');
 			}
+			tr.adopt(td);
 
-			a.adopt(new Element('img', {
-				'src': '//image.eveonline.com/Character/' + kill['final_blow']['character_id'] + '_32.jpg',
-				'alt': kill['final_blow']['character_name'],
-			}));
-			a.appendText(kill['final_blow']['character_name']);
-			a.adopt(new Element('img', {
-				'src': '//image.eveonline.com/Corporation/' + kill['final_blow']['corporation_id'] + '_32.png',
-				'alt': kill['final_blow']['corporation_name'],
-			}));
-			a.appendText(kill['final_blow']['corporation_name']);
-			if (kill['final_blow']['alliance_id']) {
-				a.adopt(new Element('img', {
-					'src': '//image.eveonline.com/Alliance/' + kill['final_blow']['alliance_id'] + '_32.png',
-					'alt': kill['final_blow']['alliance_name'],
-				}));
-				a.appendText(kill['final_blow']['alliance_name']);
+			td = new Element('td');
+			td.appendText(victim['character_name']);
+			td.adopt(new Element('br'));
+			td.appendText(victim['corporation_name']);
+			if (victim['alliance_id'])
+				td.appendText(' / ' + victim['alliance_name']);
+			if (victim['faction_id'])
+				td.appendText(' / ' + victim['faction_name']);
+			tr.adopt(td);
+
+			td = new Element('td');
+			var final_blow = kill['final_blow'];
+			show_portrait(td, final_blow['ship_type_id'], final_blow['ship_name'], 'type', '_32.png');
+			show_portrait(td, final_blow['character_id'], final_blow['character_name'], 'character', '_32.jpg');
+			if (final_blow['faction_id']) {
+				show_portrait(td, final_blow['faction_id'], final_blow['faction_name'], 'faction', '_32.png');
 			}
+			tr.adopt(td);
+
+			td = new Element('td');
+			td.appendText(final_blow['character_name'] + ' (' + kill['attackers'] + ')');
+			td.adopt(new Element('br'));
+			td.appendText(final_blow['corporation_name']);
+			if (final_blow['alliance_id'])
+				td.appendText(' / ' + final_blow['alliance_name']);
+			if (final_blow['faction_id'])
+				td.appendText(' / ' + final_blow['faction_name']);
+			tr.adopt(td);
 
-			div.adopt(a);
-			div.adopt(new Element('br'));
+			table.adopt(tr);
 		});
 	});
+
+	function show_portrait(el, id, text, img_dir, img_suffix) {
+		el.adopt(new Element('img', {
+			'src': '//image.eveonline.com/' + img_dir + '/' + id + img_suffix,
+			'alt': text,
+		}));
+	}
 });