Show player medals on the player_info page.

[xonotic/xonstat.git] / xonstat / __init__.py

diff --git a/xonstat/__init__.py b/xonstat/__init__.py
index 29555048da6a01e98fcb0330159385fa59ca71d8..10632d627b4771b519ca6d0a443d7ba346aec79e 100644 (file)
--- a/xonstat/__init__.py
+++ b/xonstat/__init__.py
@@ -42,6 +42,10 @@ def main(global_config, **settings):
     # for static assets
     config.add_static_view('static', 'xonstat:static')
 
+    # robots
+    config.add_route("robots", "robots.txt")
+    config.add_view(robots, route_name="robots")
+
     # for 404s
     config.add_view(notfound, context=HTTPNotFound, renderer="404.mako")
 
@@ -51,7 +55,7 @@ def main(global_config, **settings):
 
     # MAIN SUBMISSION ROUTE
     config.add_route("submit_stats", "stats/submit")
-    config.add_view(submit_stats, route_name="submit_stats")
+    config.add_view(submit_stats, route_name="submit_stats", renderer="submit_stats.mako")
 
     # PLAYER ROUTES
     config.add_route("player_game_index",      "/player/{player_id:\d+}/games")
@@ -97,14 +101,17 @@ def main(global_config, **settings):
     config.add_route("player_weaponstats_data_json", "/player/{id:\d+}/weaponstats.json")
     config.add_view(player_weaponstats_data_json, route_name="player_weaponstats_data_json", renderer="jsonp")
 
-    config.add_route("top_players_by_time", "/topactive")
-    config.add_view(top_players_by_time, route_name="top_players_by_time", renderer="top_players_by_time.mako")
+    config.add_route("top_players_index", "/topactive")
+    config.add_view(top_players_index, route_name="top_players_index", renderer="top_players_index.mako")
+
+    config.add_route("top_servers_index", "/topservers")
+    config.add_view(top_servers_index, route_name="top_servers_index", renderer="top_servers_index.mako")
 
-    config.add_route("top_servers_by_players", "/topservers")
-    config.add_view(top_servers_by_players, route_name="top_servers_by_players", renderer="top_servers_by_players.mako")
+    config.add_route("top_maps_index", "/topmaps")
+    config.add_view(top_maps_index, route_name="top_maps_index", renderer="top_maps_index.mako")
 
-    config.add_route("top_maps_by_times_played", "/topmaps")
-    config.add_view(top_maps_by_times_played, route_name="top_maps_by_times_played", renderer="top_maps_by_times_played.mako")
+    config.add_route("player_versus", "/versus")
+    config.add_view(player_versus, route_name="player_versus", renderer="player_versus.mako")
 
     # GAME ROUTES
     config.add_route("game_info",      "/game/{id:\d+}")
@@ -113,15 +120,18 @@ def main(global_config, **settings):
     config.add_route("game_info_json", "/game/{id:\d+}.json")
     config.add_view(game_info_json, route_name="game_info_json", renderer="jsonp")
 
-    config.add_route("rank_index",      "/ranks/{game_type_cd:ctf|dm|tdm|duel|ca|ft}")
+    config.add_route("rank_index", "/ranks/{game_type_cd}")
     config.add_view(rank_index,      route_name="rank_index",      renderer="rank_index.mako")
 
-    config.add_route("rank_index_json", "/ranks/{game_type_cd:ctf|dm|tdm|duel|ca|ft}.json")
+    config.add_route("rank_index_json", "/ranks/{game_type_cd}.json")
     config.add_view(rank_index_json, route_name="rank_index_json", renderer="jsonp")
 
     config.add_route("game_index", "/games")
     config.add_view(game_finder, route_name="game_index", renderer="game_finder.mako")
 
+    config.add_route("game_index_json", "/games.json")
+    config.add_view(game_finder_json, route_name="game_index_json", renderer="jsonp")
+
     # SERVER ROUTES
     config.add_route("server_index",      "/servers")
     config.add_view(server_index,      route_name="server_index",      renderer="server_index.mako")
@@ -129,12 +139,6 @@ def main(global_config, **settings):
     config.add_route("server_index_json", "/servers.json")
     config.add_view(server_index_json, route_name="server_index_json", renderer="jsonp")
 
-    config.add_route("server_game_index",      "/server/{server_id:\d+}/games/page/{page:\d+}")
-    config.add_view(server_game_index,      route_name="server_game_index",      renderer="server_game_index.mako")
-
-    config.add_route("server_game_index_json", "/server/{server_id:\d+}/games.json")
-    config.add_view(server_game_index_json, route_name="server_game_index_json", renderer="jsonp")
-
     config.add_route("server_info",      "/server/{id:\d+}")
     config.add_view(server_info,      route_name="server_info",      renderer="server_info.mako")
 
@@ -173,7 +177,7 @@ def main(global_config, **settings):
     config.add_route("login", "/login")
     config.add_view(login, route_name="login", check_csrf=True, renderer="json")
 
-    #config.add_route("merge", "/merge")
-    #config.add_view(merge, route_name="merge", renderer="merge.mako")
+    config.add_route("merge", "/admin/merge")
+    config.add_view(merge, route_name="merge", renderer="merge.mako", permission="merge")
 
     return config.make_wsgi_app()