Merge branch 'archweb' into archweb-generic2

Conflicts:
	devel/views.py
	feeds.py
	public/views.py
	settings.py
	sitestatic/archweb.js
	templates/base.html
	templates/devel/profile.html
	templates/mirrors/status.html
	templates/news/view.html
	templates/packages/flaghelp.html
	templates/packages/opensearch.xml
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/registration/login.html
	templates/releng/results.html
	templates/todolists/public_list.html

1 files changed, 19 insertions, 10 deletions

diff --git a/todolists/urls.py b/todolists/urls.py
index a379468f..6617d7dd 100644
--- a/todolists/urls.py
+++ b/todolists/urls.py
@@ -1,17 +1,26 @@
 from django.conf.urls import patterns
 from django.contrib.auth.decorators import permission_required
 
-from .views import DeleteTodolist
+from .views import (view_redirect, view, todolist_list, add, edit, flag,
+        list_pkgbases, DeleteTodolist)
 
-urlpatterns = patterns('todolists.views',
-    (r'^$',                       'todolist_list'),
-    (r'^(?P<list_id>\d+)/$',      'view'),
-    (r'^(?P<list_id>\d+)/pkgbases/(?P<svn_root>[a-z]+)/$', 'list_pkgbases'),
-    (r'^add/$',                   'add'),
-    (r'^edit/(?P<list_id>\d+)/$', 'edit'),
-    (r'^flag/(\d+)/(\d+)/$',      'flag'),
-    (r'^delete/(?P<pk>\d+)/$',
-        permission_required('main.delete_todolist')(DeleteTodolist.as_view())),
+urlpatterns = patterns('',
+    (r'^$', todolist_list),
+
+    # old todolists URLs, permanent redirect view so we don't break all links
+    (r'^(?P<old_id>\d+)/$', view_redirect),
+
+    (r'^add/$',
+        permission_required('todolists.add_todolist')(add)),
+    (r'^(?P<slug>[-\w]+)/$', view),
+    (r'^(?P<slug>[-\w]+)/edit/$',
+        permission_required('todolists.change_todolist')(edit)),
+    (r'^(?P<slug>[-\w]+)/delete/$',
+        permission_required('todolists.delete_todolist')(DeleteTodolist.as_view())),
+    (r'^(?P<slug>[-\w]+)/flag/(?P<pkg_id>\d+)/$',
+        permission_required('todolists.change_todolistpackage')(flag)),
+    (r'^(?P<slug>[-\w]+)/pkgbases/(?P<svn_root>[a-z]+)/$',
+        list_pkgbases),
 )
 
 # vim: set ts=4 sw=4 et: