Home Explore Help
Sign In
raylu
/
ykill
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

set title on every page

raylu 12 years ago
parent
48d146a1cb
commit
e38de9534b
6 changed files with 16 additions and 5 deletions
Split View Show Diff Stats
  1. 4 1
      db/queries.py
  2. 1 1
      web/api.py
  3. 5 2
      web/static/js/corporation.js
  4. 4 1
      web/static/js/kill.js
  5. 1 0
      web/static/js/search.js
  6. 1 0
      web/templates/base.html

+ 4 - 1
db/queries.py
View File 

@@ -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:

+ 1 - 1
web/api.py
View File 

@@ -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):

+ 5 - 2
web/static/js/corporation.js
View File 

@@ -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);

+ 4 - 1
web/static/js/kill.js
View File 

@@ -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'}),

+ 1 - 0
web/static/js/search.js
View File 

@@ -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) {

+ 1 - 0
web/templates/base.html
View File 

@@ -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 %}