[Debconf-video-commits] r371 - package/branches/pycon09/src/debconfvideo/web

Sat Mar 21 19:20:04 UTC 2009

Author: benh
Date: 2009-03-21 19:20:03 +0000 (Sat, 21 Mar 2009)
New Revision: 371

Modified:
   package/branches/pycon09/src/debconfvideo/web/urls.py
Log:
Remove URL remapping kluge which doesn't work well.


Modified: package/branches/pycon09/src/debconfvideo/web/urls.py
===================================================================

--- package/branches/pycon09/src/debconfvideo/web/urls.py	2009-03-21 19:09:50 UTC (rev 370)
+++ package/branches/pycon09/src/debconfvideo/web/urls.py	2009-03-21 19:20:03 UTC (rev 371)
@@ -11,17 +11,14 @@
   <head><title>Pycon Video Management</title></head>
   <body>
     <h1>Pycon Video Management</h1>
-    <p><a href="event/">Events</a> - all known events in the conference</p>
-    <p><a href="videorecording/">Recordings</a> - all recorded files</p>
-    <p><a href="videoeventrecording/">Event-recordings</a> - events known to have been recorded</p>
-    <p><a href="videotargetfile/">Target files</a> - completed files for publication or archival</p>
+    <p><a href="admin/pyconvideo/event/">Events</a> - all known events in the conference</p>
+    <p><a href="admin/pyconvideo/videorecording/">Recordings</a> - all recorded files</p>
+    <p><a href="admin/pyconvideo/videoeventrecording/">Event-recordings</a> - events known to have been recorded</p>
+    <p><a href="admin/pyconvideo/videotargetfile/">Target files</a> - completed files for publication or archival</p>
   </body>
 </html>
 ''')
 
-def admin_pyconvideo(request, url):
-    return admin.site.root(request, 'pyconvideo/' + url)
-
 urlpatterns = patterns('',
     # Example:
     # (r'^web/', include('web.foo.urls')),
@@ -33,8 +30,5 @@
     # Uncomment the next line to enable the admin:
     (r'^admin/(.*)', admin.site.root),
 
-    (r'^((?:event|videorecording|videoeventrecording|videotargetfile)/.*)',
-     admin_pyconvideo),
-
     (r'^$', front_page),
 )


