From 0dea8f430e4905da98d7009bdf111e0965fedd22 Mon Sep 17 00:00:00 2001 From: raylu Date: Tue, 22 Oct 2013 19:29:47 -0700 Subject: alliance and character pages --- web/static/css/corporation.ccss | 24 ------------- web/static/css/kill_list.ccss | 27 +++++++++++++++ web/static/js/corporation.js | 70 -------------------------------------- web/static/js/kill_list.js | 74 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 94 deletions(-) delete mode 100644 web/static/css/corporation.ccss create mode 100644 web/static/css/kill_list.ccss delete mode 100644 web/static/js/corporation.js create mode 100644 web/static/js/kill_list.js (limited to 'web/static') diff --git a/web/static/css/corporation.ccss b/web/static/css/corporation.ccss deleted file mode 100644 index 575a040..0000000 --- a/web/static/css/corporation.ccss +++ /dev/null @@ -1,24 +0,0 @@ -table#kills: - table-layout: fixed - width: 900px - - tr:nth-child(odd): - background-color: #1a1a1a - - th.time: - width: 90px - th.system: - width: 120px - th.victim_portrait: - width: 64px - th.victim: - width: 250px - th.killer_portrait: - width: 64px - th.killer: - width: 250px - th.value: - width: 62px - - td:nth-child(7): - text-align: right diff --git a/web/static/css/kill_list.ccss b/web/static/css/kill_list.ccss new file mode 100644 index 0000000..3985a58 --- /dev/null +++ b/web/static/css/kill_list.ccss @@ -0,0 +1,27 @@ +table#kills: + table-layout: fixed + width: 900px + + tr:nth-child(odd): + background-color: #1a1a1a + + th.time: + width: 90px + th.system: + width: 120px + th.victim_portrait: + width: 64px + th.victim: + width: 250px + th.killer_portrait: + width: 64px + th.killer: + width: 250px + th.value: + width: 62px + + td:nth-child(7): + text-align: right + + .loss: + color: #a44 diff --git a/web/static/js/corporation.js b/web/static/js/corporation.js deleted file mode 100644 index 606ce3e..0000000 --- a/web/static/js/corporation.js +++ /dev/null @@ -1,70 +0,0 @@ -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 table = $('kills').getChildren('tbody')[0]; - data['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_time[0]); - a.grab(new Element('br')); - a.appendText(kill_time[1]); - 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.grab(new Element('br')); - td.appendText(kill['region']); - tr.grab(td); - - td = new Element('td'); - var victim = kill['victim']; - td.adopt( - ykill.portrait(victim['ship_type_id'], victim['ship_name'], 'type', '_32.png'), - ykill.portrait(victim['character_id'], victim['character_name'], 'character', '_32.jpg') - ); - tr.grab(td); - - td = new Element('td'); - td.appendText(victim['character_name']); - td.grab(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.grab(td); - - td = new Element('td'); - var final_blow = kill['final_blow']; - td.adopt( - 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') - ); - tr.grab(td); - - td = new Element('td'); - td.appendText(final_blow['character_name'] + ' (' + kill['attackers'] + ')'); - td.grab(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.grab(td); - - td = new Element('td'); - var millions = kill['cost'] / (100 * 1000000); - td.appendText(ykill.format_isk(millions)); - tr.grab(td); - - table.grab(tr); - }); - }); -}); diff --git a/web/static/js/kill_list.js b/web/static/js/kill_list.js new file mode 100644 index 0000000..c8341c8 --- /dev/null +++ b/web/static/js/kill_list.js @@ -0,0 +1,74 @@ +window.addEvent('domready', function() { + 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) { + 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_time[0]); + a.grab(new Element('br')); + a.appendText(kill_time[1]); + 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.grab(new Element('br')); + td.appendText(kill['region']); + tr.grab(td); + + td = new Element('td'); + var victim = kill['victim']; + td.adopt( + ykill.portrait(victim['ship_type_id'], victim['ship_name'], 'type', '_32.png'), + ykill.portrait(victim['character_id'], victim['character_name'], 'character', '_32.jpg') + ); + tr.grab(td); + + td = new Element('td'); + td.appendText(victim['character_name']); + td.grab(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.grab(td); + + td = new Element('td'); + var final_blow = kill['final_blow']; + td.adopt( + 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') + ); + tr.grab(td); + + td = new Element('td'); + td.appendText(final_blow['character_name'] + ' (' + kill['attackers'] + ')'); + td.grab(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.grab(td); + + 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); + }); + }); +}); -- cgit v1.2.3