X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=xonstat%2F__init__.py;h=f72e5b95b9b8718b48f342ed1fe7bffb0e554508;hb=9c3fd90e6e6d82639cc035395b455a05add6433e;hp=aca302daadba45bd1236a20a9f599989084d1f8a;hpb=caa86432988acf03266fb7cd81eb49b378f0b8b0;p=xonotic%2Fxonstat.git

diff --git a/xonstat/__init__.py b/xonstat/__init__.py
index aca302d..f72e5b9 100644
--- a/xonstat/__init__.py
+++ b/xonstat/__init__.py
@@ -1,6 +1,5 @@
 import sqlahelper
 from pyramid_beaker import set_cache_regions_from_settings
-from pyramid.authentication import AuthTktAuthenticationPolicy
 from pyramid.config import Configurator
 from pyramid.httpexceptions import HTTPNotFound
 from pyramid.renderers import JSONP
@@ -28,15 +27,6 @@ def main(global_config, **settings):
     # mako for templating
     config.include('pyramid_mako')
 
-    # Mozilla Persona as the login verifier. It defines default
-    # authentication and authorization policies.
-    config.include('pyramid_persona')
-
-    # override the authn policy to provide a callback
-    secret = settings.get('persona.secret', None)
-    authn_policy = AuthTktAuthenticationPolicy(secret, callback=groupfinder, hashalg='sha512')
-    config.set_authentication_policy(authn_policy)
-
     # for json-encoded responses
     config.add_renderer('jsonp', JSONP(param_name='callback'))
 
@@ -165,11 +155,17 @@ def main(global_config, **settings):
                     accept="application/json")
 
     # MAP ROUTES
-    config.add_route("map_index",      "/maps")
-    config.add_view(map_index,      route_name="map_index",      renderer="map_index.mako")
+    config.add_route("map_index", "/maps")
+    config.add_view(view=MapIndex, route_name="map_index", attr="html",
+                    renderer="map_index.mako", accept="text/html")
+    config.add_view(view=MapIndex, route_name="map_index", attr="json", renderer="json",
+                    accept="application/json")
 
-    config.add_route("map_index_json", "/maps.json")
-    config.add_view(map_index_json, route_name="map_index_json", renderer="jsonp")
+    config.add_route("map_top_scorers", "/map/{id:\d+}/topscorers")
+    config.add_view(view=MapTopScorers, route_name="map_top_scorers", attr="html",
+                    renderer="map_top_scorers.mako", accept="text/html")
+    config.add_view(view=MapTopScorers, route_name="map_top_scorers", attr="json",
+                    renderer="json", accept="application/json")
 
     config.add_route("map_info",      "/map/{id:\d+}")
     config.add_view(map_info,      route_name="map_info",      renderer="map_info.mako")