diff options
| author | raylu <raylu@gridium.com> | 2013-10-21 23:13:33 -0700 |
|---|---|---|
| committer | raylu <raylu@gridium.com> | 2013-10-21 23:13:33 -0700 |
| commit | e38de9534b3c5d38a77f94c9843ce88856f5a802 (patch) | |
| tree | e59286cebdeaee0c0954924028670fadf309da71 | |
| parent | 48d146a1cb0aa0cd90cbcc0236a84754615fe7d6 (diff) | |
| download | ykill-e38de9534b3c5d38a77f94c9843ce88856f5a802.tar.xz | |
set title on every page
| -rw-r--r-- | db/queries.py | 5 | ||||
| -rw-r--r-- | web/api.py | 2 | ||||
| -rw-r--r-- | web/static/js/corporation.js | 7 | ||||
| -rw-r--r-- | web/static/js/kill.js | 5 | ||||
| -rw-r--r-- | web/static/js/search.js | 1 | ||||
| -rw-r--r-- | web/templates/base.html | 1 |
6 files changed, 16 insertions, 5 deletions
diff --git a/db/queries.py b/db/queries.py index a760c34..0493af0 100644 --- a/db/queries.py +++ b/db/queries.py @@ -32,6 +32,7 @@ def corporation(corp_id): WHERE kill_id IN ({}) '''.format(','.join(map(str, kill_ids)))) characters = defaultdict(dict) + corp_name = None for kill_id in kill_ids: characters[kill_id]['attackers'] = 1 # count final_blow now for char in char_rows: @@ -42,13 +43,15 @@ def corporation(corp_id): characters[kill_id]['final_blow'] = char else: characters[kill_id]['attackers'] += 1 + if corp_name is None and char['corporation_id'] == corp_id: + corp_name = char['corporation_name'] for kill in kills: kill['kill_time'] = _format_kill_time(kill['kill_time']) chars = characters[kill['kill_id']] kill['victim'] = chars['victim'] kill['final_blow'] = chars['final_blow'] kill['attackers'] = chars['attackers'] - return kills + return {'corporation_name': corp_name, 'kills': kills} def kill(kill_id): with db.cursor() as c: @@ -31,7 +31,7 @@ class SearchHandler(APIHandler): class CorporationHandler(APIHandler): def get(self, corp_id): - kills = db.queries.corporation(corp_id) + kills = db.queries.corporation(int(corp_id)) self.respond_json(kills) class KillHandler(APIHandler): diff --git a/web/static/js/corporation.js b/web/static/js/corporation.js index e0573f3..73d1b4b 100644 --- a/web/static/js/corporation.js +++ b/web/static/js/corporation.js @@ -1,8 +1,11 @@ window.addEvent('domready', function() { var corp_id = document.location.pathname.split('/').getLast(); - ykill.api('/corporation/' + corp_id, function(kills) { + ykill.api('/corporation/' + corp_id, function(data) { + if (data['corporation_name']) + document.title += ' - ' + data['corporation_name']; + var table = $('kills').getChildren('tbody')[0]; - kills.each(function(kill) { + data['kills'].each(function(kill) { var tr = new Element('tr'); var kill_time = kill['kill_time'].split(' ', 2); diff --git a/web/static/js/kill.js b/web/static/js/kill.js index b026722..feb47ea 100644 --- a/web/static/js/kill.js +++ b/web/static/js/kill.js @@ -1,9 +1,12 @@ window.addEvent('domready', function() { var kill_id = document.location.pathname.split('/').getLast(); ykill.api('/kill/' + kill_id, function(data) { - var table = $('victim'); + var kill = data['kill']; var victim = data['victim']; + document.title += ' - ' + victim['character_name'] + ' - ' + victim['ship_name']; + + var table = $('victim'); table.adopt( new Element('tr').adopt( new Element('td', {'html': 'time'}), diff --git a/web/static/js/search.js b/web/static/js/search.js index 127291e..1bb2d51 100644 --- a/web/static/js/search.js +++ b/web/static/js/search.js @@ -1,4 +1,5 @@ window.addEvent('domready', function() { + document.title += ' - search'; ykill.api('/search' + document.location.search, function(results) { var corps = $('corps'); results.corporations.each(function(corp) { diff --git a/web/templates/base.html b/web/templates/base.html index 47b7a99..5573839 100644 --- a/web/templates/base.html +++ b/web/templates/base.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html> <head> + <title>u r ded</title> <link rel="stylesheet" type="text/css" href="/css/base.css"> <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Metrophobic"> {% block css %}{% end %} |