Merge remote branch 'remotes/aaronw/feature410_markdown_bio'

[mediagoblin.git] / mediagoblin / routing.py

diff --git a/mediagoblin/routing.py b/mediagoblin/routing.py
index c60f121c369485576766f84526dc057d85721f8c..b854c85a5d3dcdf40393c095922011a257902f4d 100644 (file)
--- a/mediagoblin/routing.py
+++ b/mediagoblin/routing.py
@@ -1,4 +1,4 @@
-# GNU Mediagoblin -- federated, autonomous media hosting
+# GNU MediaGoblin -- federated, autonomous media hosting
 # Copyright (C) 2011 Free Software Foundation, Inc
 #
 # This program is free software: you can redistribute it and/or modify
@@ -16,6 +16,11 @@
 
 from routes import Mapper
 
+from mediagoblin.auth.routing import auth_routes
+from mediagoblin.submit.routing import submit_routes
+from mediagoblin.user_pages.routing import user_routes
+from mediagoblin.edit.routing import edit_routes
+
 def get_mapper():
     mapping = Mapper()
     mapping.minimization = False
@@ -23,8 +28,10 @@ def get_mapper():
     mapping.connect(
         "index", "/",
         controller="mediagoblin.views:root_view")
-    mapping.connect(
-        "test_submit", "/test_submit/",
-        controller="mediagoblin.views:submit_test")
+
+    mapping.extend(auth_routes, '/auth')
+    mapping.extend(submit_routes, '/submit')
+    mapping.extend(user_routes, '/u')
+    mapping.extend(edit_routes, '/edit')
 
     return mapping