From 585ad90d3cc59ad7d4fd306170b710699e48efda Mon Sep 17 00:00:00 2001
From: raylu <raylu@gridium.com>
Date: Sun, 20 Oct 2013 00:42:11 -0700
Subject: show more data

---
 web/templates/corporation.html | 27 +++++++++++++++++++++++++++
 web/templates/kill.html        | 37 ++++++++++++++-----------------------
 2 files changed, 41 insertions(+), 23 deletions(-)
 create mode 100644 web/templates/corporation.html

(limited to 'web/templates')

diff --git a/web/templates/corporation.html b/web/templates/corporation.html
new file mode 100644
index 0000000..0afe4c3
--- /dev/null
+++ b/web/templates/corporation.html
@@ -0,0 +1,27 @@
+{% extends "base.html" %}
+
+{% block main %}
+
+{% for kill in kills %}
+	<a href="/kill/{{ kill['kill_id'] }}">
+		{{ kill['kill_time'] }}
+		<img src="//image.eveonline.com/Character/{{ kill['victim']['character_id'] }}_32.jpg" alt="{{ kill['victim']['character_name'] }}">
+		{{ kill['victim']['character_name'] }}
+		<img src="//image.eveonline.com/Corporation/{{ kill['victim']['corporation_id'] }}_32.png" alt="{{ kill['victim']['corporation_name'] }}">
+		{{ kill['victim']['corporation_name'] }}
+		{% if kill['victim']['alliance_id'] != 0 %}
+			<img src="//image.eveonline.com/Alliance/{{ kill['victim']['alliance_id'] }}_32.png" alt="{{ kill['victim']['alliance_name'] }}">
+			{{ kill['victim']['alliance_name'] }}
+		{% end %}
+		<img src="//image.eveonline.com/Character/{{ kill['final_blow']['character_id'] }}_32.jpg" alt="{{ kill['final_blow']['character_name'] }}">
+		{{ kill['final_blow']['character_name'] }}
+		<img src="//image.eveonline.com/Corporation/{{ kill['final_blow']['corporation_id'] }}_32.png" alt="{{ kill['final_blow']['corporation_name'] }}">
+		{{ kill['final_blow']['corporation_name'] }}
+		{% if kill['final_blow']['alliance_id'] != 0 %}
+			<img src="//image.eveonline.com/Alliance/{{ kill['final_blow']['alliance_id'] }}_32.png" alt="{{ kill['final_blow']['alliance_name'] }}">
+			{{ kill['final_blow']['alliance_name'] }}
+		{% end %}
+	</a><br>
+{% end %}
+
+{% end %}
diff --git a/web/templates/kill.html b/web/templates/kill.html
index 6d4f69c..bb286bc 100644
--- a/web/templates/kill.html
+++ b/web/templates/kill.html
@@ -2,29 +2,20 @@
 
 {% block main %}
 
-<div class="kill_list">
-	{% for kill in kills %}
-		<a href="/kill/{{ kill['killID'] }}">
-			{{ kill['killTime'] }}
-			{{ kill['solarSystemID'] }}
-			<img src="//image.eveonline.com/Type/{{ kill['victim']['shipTypeID'] }}_64.png">
-			<img src="//image.eveonline.com/Character/{{ kill['victim']['characterID'] }}_64.jpg">
-			<img src="//image.eveonline.com/Corporation/{{ kill['victim']['corporationID'] }}_64.png">
-			<img src="//image.eveonline.com/Alliance/{{ kill['victim']['allianceID'] }}_64.png">
-			{{ kill['victim']['characterName'] }}
-			{{ kill['victim']['corporationName'] }}
-			{{ kill['victim']['allianceName'] }}
-			{% for attacker in kill['attackers'] %}
-				{% if attacker['finalBlow'] %}
-					{% set killer = attacker %}
-					{% break %}
-				{% end %}
-			{% end %}
-			{{ killer['characterName'] }}
-			{{ killer['corporationName'] }}
-			{{ killer['allianceName'] }}
-		</a>
+{{ kill['kill_time'] }}<br>
+{{ kill['solarSystemName'] }} ({{ round(kill['security'], 1) }})<br>
+
+{% for char in characters %}
+	<img src="//image.eveonline.com/Type/{{ char['ship_type_id'] }}_64.png" alt="{{ char ['typeName'] }}">
+	<img src="//image.eveonline.com/Character/{{ char['character_id'] }}_64.jpg" alt="{{ char['character_name'] }}">
+	{{ char['character_name'] }}
+	<img src="//image.eveonline.com/Corporation/{{ char['corporation_id'] }}_64.png" alt="{{ char['corporation_name'] }}">
+	{{ char['corporation_name'] }}
+	{% if char['alliance_id'] != 0 %}
+		<img src="//image.eveonline.com/Alliance/{{ char['alliance_id'] }}_64.png" alt="alliance">
+		{{ char['alliance_name'] }}
 	{% end %}
-</div>
+	<br>
+{% end %}
 
 {% end %}
-- 
cgit v1.2.3