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, 18 insertions, 7 deletions

diff --git a/news/urls.py b/news/urls.py
index 10020f31..0eec6d86 100644
--- a/news/urls.py
+++ b/news/urls.py
@@ -1,14 +1,25 @@
 from django.conf.urls import patterns
+from django.contrib.auth.decorators import permission_required
+from .views import (NewsDetailView, NewsListView,
+        NewsCreateView, NewsEditView, NewsDeleteView)
+
 
 urlpatterns = patterns('news.views',
-    (r'^$',                         'news_list', {}, 'news-list'),
-    (r'^add/$',                     'add'),
-    (r'^preview/$',                 'preview'),
+    (r'^$',
+        NewsListView.as_view(), {}, 'news-list'),
+
+    (r'^preview/$', 'preview'),
     # old news URLs, permanent redirect view so we don't break all links
-    (r'^(?P<object_id>\d+)/$',      'view_redirect'),
-    (r'^(?P<slug>[-\w]+)/$',        'view'),
-    (r'^(?P<slug>[-\w]+)/edit/$',   'edit'),
-    (r'^(?P<slug>[-\w]+)/delete/$', 'delete'),
+    (r'^(?P<object_id>\d+)/$', 'view_redirect'),
+
+    (r'^add/$',
+        permission_required('news.add_news')(NewsCreateView.as_view())),
+    (r'^(?P<slug>[-\w]+)/$',
+        NewsDetailView.as_view()),
+    (r'^(?P<slug>[-\w]+)/edit/$',
+        permission_required('news.change_news')(NewsEditView.as_view())),
+    (r'^(?P<slug>[-\w]+)/delete/$',
+        permission_required('news.delete_news')(NewsDeleteView.as_view())),
 )
 
 # vim: set ts=4 sw=4 et: