Merge remote-tracking branch 'remotes/slikdigit/bassam'

[mediagoblin.git] / mediagoblin / user_pages / routing.py

diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py
index 96f97427273b1d495684685457b00b0830cbf446..f9780edcb4e88f0a2165749a08a9a033651a309f 100644 (file)
--- a/mediagoblin/user_pages/routing.py
+++ b/mediagoblin/user_pages/routing.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -19,8 +19,28 @@ from routes.route import Route
 user_routes = [
     Route('mediagoblin.user_pages.user_home', "/{user}/",
         controller="mediagoblin.user_pages.views:user_home"),
+    Route('mediagoblin.user_pages.user_gallery', "/{user}/gallery/",
+        controller="mediagoblin.user_pages.views:user_gallery"),
     Route('mediagoblin.user_pages.media_home', '/{user}/m/{media}/',
         requirements=dict(m_id="[0-9a-fA-F]{24}"),
         controller="mediagoblin.user_pages.views:media_home"),
+    Route('mediagoblin.user_pages.media_home.view_comment',
+          '/{user}/m/{media}/c/{comment}/',
+          controller="mediagoblin.user_pages.views:media_home"),
+    Route('mediagoblin.edit.edit_media', "/{user}/m/{media}/edit/",
+          controller="mediagoblin.edit.views:edit_media"),
+    Route('mediagoblin.edit.attachments',
+          '/{user}/m/{media}/attachments/',
+          controller="mediagoblin.edit.views:edit_attachments"),
+    Route('mediagoblin.user_pages.media_confirm_delete',
+          "/{user}/m/{media}/confirm-delete/",
+          controller="mediagoblin.user_pages.views:media_confirm_delete"),
     Route('mediagoblin.user_pages.atom_feed', '/{user}/atom/',
-        controller="mediagoblin.user_pages.views:atom_feed")]
+        controller="mediagoblin.user_pages.views:atom_feed"),
+    Route('mediagoblin.user_pages.media_post_comment',
+          '/{user}/m/{media}/comment/add/',
+          controller="mediagoblin.user_pages.views:media_post_comment"),
+    Route('mediagoblin.user_pages.processing_panel',
+          '/{user}/panel/',
+          controller="mediagoblin.user_pages.views:processing_panel"),
+    ]