alliance and character pages

4 files changed, 17 insertions, 10 deletions

diff --git a/web/api.py b/web/api.py
index 523880b..5f21441 100644
--- a/web/api.py
+++ b/web/api.py
@@ -29,9 +29,9 @@ class SearchHandler(APIHandler):
 		data = db.queries.search(q)
 		self.respond_json(data)
 
-class CorporationHandler(APIHandler):
-	def get(self, corp_id):
-		kills = db.queries.corporation(int(corp_id))
+class KillListHandler(APIHandler):
+	def get(self, entity_type, entity_id):
+		kills = db.queries.kill_list(entity_type, int(entity_id))
 		self.respond_json(kills)
 
 class KillHandler(APIHandler):
@@ -43,7 +43,7 @@ def start():
 	tornado.web.Application(
 		handlers=[
 			(r'/search', SearchHandler),
-			(r'/corporation/(.+)', CorporationHandler),
+			(r'/(alliance|corporation|character)/(.+)', KillListHandler),
 			(r'/kill/(.+)', KillHandler),
 		],
 		debug=config.debug,
diff --git a/web/static/css/corporation.ccss b/web/static/css/kill_list.ccss
index 575a040..3985a58 100644
--- a/web/static/css/corporation.ccss
+++ b/web/static/css/kill_list.ccss
@@ -22,3 +22,6 @@ table#kills:
 
 	td:nth-child(7):
 		text-align: right
+
+	.loss:
+		color: #a44
diff --git a/web/static/js/corporation.js b/web/static/js/kill_list.js
index 606ce3e..c8341c8 100644
--- a/web/static/js/corporation.js
+++ b/web/static/js/kill_list.js
@@ -1,8 +1,10 @@
 window.addEvent('domready', function() {
-	var corp_id = document.location.pathname.split('/').getLast();
-	ykill.api('/corporation/' + corp_id, function(data) {
-		if (data['corporation_name'])
-			document.title += ' - ' + data['corporation_name'];
+	var split = document.location.pathname.split('/');
+	var entity_type = split[1];
+	var entity_id = split[2];
+	ykill.api(document.location.pathname, function(data) {
+		if (data['entity_name'])
+			document.title += ' - ' + data['entity_name'];
 
 		var table = $('kills').getChildren('tbody')[0];
 		data['kills'].each(function(kill) {
@@ -62,6 +64,8 @@ window.addEvent('domready', function() {
 			td = new Element('td');
 			var millions = kill['cost'] / (100 * 1000000);
 			td.appendText(ykill.format_isk(millions));
+			if (victim[entity_type + '_id'] == entity_id)
+				td.addClass('loss');
 			tr.grab(td);
 
 			table.grab(tr);
diff --git a/web/templates/corporation.html b/web/templates/kill_list.html
index c8550d7..1c672d3 100644
--- a/web/templates/corporation.html
+++ b/web/templates/kill_list.html
@@ -1,11 +1,11 @@
 {% extends "base.html" %}
 
 {% block js %}
-	<script src="/static/js/corporation.js"></script>
+	<script src="/static/js/kill_list.js"></script>
 {% end %}
 
 {% block css %}
-	<link rel="stylesheet" type="text/css" href="/css/corporation.css" />
+	<link rel="stylesheet" type="text/css" href="/css/kill_list.css" />
 {% end %}
 
 {% block main %}