summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/static/css/kill.ccss42
-rw-r--r--web/static/js/corporation.js6
-rw-r--r--web/static/js/kill.js70
-rw-r--r--web/templates/kill.html45
4 files changed, 134 insertions, 29 deletions
diff --git a/web/static/css/kill.ccss b/web/static/css/kill.ccss
index 2ea2e38..6fada2f 100644
--- a/web/static/css/kill.ccss
+++ b/web/static/css/kill.ccss
@@ -1,7 +1,45 @@
+#wrapper:
+ padding: 20px
+
#ship:
float: left
- width: 256px
- height: 256px
+ width: 356px // 256 + 32 * 2 + 32 (last 32 is for medium charges)
+ height: 320px
+ line-height: 0
+ background-position: 32px 32px
+ background-repeat: no-repeat
+
+ #high:
+ margin-left: 32px
+ #high_charges:
+ display: inline-block;
+ margin-left: 32px
+ #medium:
+ width: 32px
+ float: right
+ #medium_charges:
+ width: 32px
+ float: right
+ #rig:
+ width: 32px
+ float: left
+ margin-top: 48px
+ #subsystem:
+ width: 32px
+ float: left
+ margin-top: 16px
+ #low:
+ margin-left: 32px
+ #low_charges:
+ display: inline-block
+ margin: 16px 0 0 32px
+
+ .slot:
+ display: inline-block
+ width: 32px
+ height: 32px
+ .avail:
+ border: 1px solid #888
table#victim:
float: right
diff --git a/web/static/js/corporation.js b/web/static/js/corporation.js
index 5900477..e0573f3 100644
--- a/web/static/js/corporation.js
+++ b/web/static/js/corporation.js
@@ -26,9 +26,6 @@ window.addEvent('domready', function() {
ykill.portrait(victim['ship_type_id'], victim['ship_name'], 'type', '_32.png'),
ykill.portrait(victim['character_id'], victim['character_name'], 'character', '_32.jpg')
);
- if (victim['faction_id']) {
- td.grab(ykill.portrait(victim['faction_id'], victim['faction_name'], 'faction', '_32.png'));
- }
tr.grab(td);
td = new Element('td');
@@ -47,9 +44,6 @@ window.addEvent('domready', function() {
ykill.portrait(final_blow['ship_type_id'], final_blow['ship_name'], 'type', '_32.png'),
ykill.portrait(final_blow['character_id'], final_blow['character_name'], 'character', '_32.jpg')
);
- if (final_blow['faction_id']) {
- td.grab(ykill.portrait(final_blow['faction_id'], final_blow['faction_name'], 'faction', '_32.png'));
- }
tr.grab(td);
td = new Element('td');
diff --git a/web/static/js/kill.js b/web/static/js/kill.js
index 8fe142a..18ad6ab 100644
--- a/web/static/js/kill.js
+++ b/web/static/js/kill.js
@@ -36,7 +36,7 @@ window.addEvent('domready', function() {
if (victim['faction_id'])
table.grab(new Element('tr').adopt(
new Element('td').grab(
- ykill.portrait(victim['faction_id'], victim['faction_name'], 'faction', '_64.png')
+ ykill.portrait(victim['faction_id'], victim['faction_name'], 'alliance', '_64.png')
),
new Element('td', {'html': victim['faction_name']})
));
@@ -47,8 +47,30 @@ window.addEvent('domready', function() {
new Element('td', {'html': victim['ship_name']})
));
+ var items = data['items'];
var div = $('ship');
div.setStyle('background-image', 'url(//image.eveonline.com/render/' + victim['ship_type_id'] + '_256.png)');
+ Object.each(data['slots'], function(num, slot) {
+ var divs = $(slot).getChildren();
+ for (var i = 0; i < num; i++)
+ divs[i].addClass('avail');
+
+ items[slot].each(function(item) {
+ var div = $('slot_' + item['flag']);
+ var bg_img = div.getStyle('background-image');
+ if (bg_img == 'none')
+ set_bg_item(div, item['type_id']);
+ else {
+ var charge_div = $('charge_' + item['flag']);
+ if (item['capacity']) {
+ set_bg_item(div, item['type_id']);
+ charge_div.setStyle('background-image', bg_img);
+ } else {
+ set_bg_item(charge_div, item['type_id']);
+ }
+ }
+ });
+ });
table = $('attackers');
show_attacker(table, data['final_blow']);
@@ -57,7 +79,6 @@ window.addEvent('domready', function() {
});
table = $('items');
- var items = data['items'];
var slots = ['subsystem', 'high', 'medium', 'low', 'rig', 'drone bay', 'cargo', 'special hold', 'implant', '???'];
slots.each(function(slot) {
if (!items[slot])
@@ -65,27 +86,36 @@ window.addEvent('domready', function() {
table.grab(new Element('tr').grab(
new Element('td', {'html': slot, 'colspan': 3, 'class': 'slot'})
));
- var slot_items = items[slot];
- ['dropped', 'destroyed'].each(function(item_class) {
- Object.each(slot_items[item_class], function(item, item_ids) {
- var type_id = item_ids.split(',', 2)[0]
- var item_name = item[1];
- var count = item[0];
- table.grab(new Element('tr').adopt(
- new Element('td').grab(
- new Element('img', {
- 'src': '//image.eveonline.com/Type/' + type_id + '_32.png',
- 'alt': item_name,
- })
- ),
- new Element('td', {'html': item_name}),
- new Element('td', {'html': count, 'class': item_class})
- ));
- });
+ items[slot].each(function(item) {
+ var type_id = item['type_id'];
+ if (type_id instanceof String)
+ type_id = type_id.split(',', 2)[0];
+ var count, item_class;
+ if (item['dropped']) {
+ count = item['dropped'];
+ item_class = 'dropped';
+ } else {
+ count = item['destroyed'];
+ item_class = 'destroyed';
+ }
+ table.grab(new Element('tr').adopt(
+ new Element('td').grab(
+ new Element('img', {
+ 'src': '//image.eveonline.com/Type/' + type_id + '_32.png',
+ 'alt': item['item_name'],
+ })
+ ),
+ new Element('td', {'html': item['item_name']}),
+ new Element('td', {'html': count, 'class': item_class})
+ ));
});
});
});
+ function set_bg_item(div, type_id) {
+ div.setStyle('background-image', 'url(//image.eveonline.com/type/' + type_id + '_32.png)');
+ }
+
function show_attacker(table, char) {
var tr = new Element('tr');
@@ -96,7 +126,7 @@ window.addEvent('domready', function() {
if (char['alliance_id'])
td.grab(ykill.portrait(char['alliance_id'], char['alliance_name'], 'alliance', '_32.png'));
if (char['faction_id'])
- td.grab(ykill.portrait(char['faction_id'], char['faction_name'], 'faction', '_32.png'));
+ td.grab(ykill.portrait(char['faction_id'], char['faction_name'], 'alliance', '_32.png'));
tr.grab(td);
td = new Element('td');
diff --git a/web/templates/kill.html b/web/templates/kill.html
index 6a22ba1..48abdaa 100644
--- a/web/templates/kill.html
+++ b/web/templates/kill.html
@@ -10,7 +10,48 @@
{% block main %}
-<div id="ship"></div>
+<div id="ship">
+ <div id="high">
+ {% for i in range(27, 35) %}
+ <div id="slot_{{ i }}" class="slot"></div>
+ {% end %}
+ </div>
+ <div id="high_charges">
+ {% for i in range(27, 35) %}
+ <div id="charge_{{ i }}" class="slot"></div>
+ {% end %}
+ </div>
+ <div id="medium_charges">
+ {% for i in range(19, 27) %}
+ <div id="charge_{{ i }}" class="slot"></div>
+ {% end %}
+ </div>
+ <div id="medium">
+ {% for i in range(19, 27) %}
+ <div id="slot_{{ i }}" class="slot"></div>
+ {% end %}
+ </div>
+ <div id="rig">
+ {% for i in range(92, 95) %}
+ <div id="slot_{{ i }}" class="slot"></div>
+ {% end %}
+ </div>
+ <div id="subsystem">
+ {% for i in range(125, 130) %}
+ <div id="slot_{{ i }}" class="slot"></div>
+ {% end %}
+ </div>
+ <div id="low_charges">
+ {% for i in range(11, 19) %}
+ <div id="charge_{{ i }}" class="slot"></div>
+ {% end %}
+ </div>
+ <div id="low">
+ {% for i in range(11, 19) %}
+ <div id="slot_{{ i }}" class="slot"></div>
+ {% end %}
+ </div>
+</div>
<table id="victim"></table>
<div class="clear"></div>
@@ -18,4 +59,6 @@
<table id="items"></table>
+<div class="clear"></div>
+
{% end %}
generated by cgit v1.2.3 (git 2.46.0) at 2025-06-28 23:41:31 +0000