Merge git://projects.archlinux.org/archweb

Conflicts:
	templates/public/index.html
	urls.py

1 files changed, 14 insertions, 0 deletions

diff --git a/news/urls.py b/news/urls.py
new file mode 100644
index 00000000..548d80ea
--- /dev/null
+++ b/news/urls.py
@@ -0,0 +1,14 @@
+from django.conf.urls.defaults import patterns
+
+urlpatterns = patterns('news.views',
+    (r'^$',                         'news_list', {}, 'news-list'),
+    (r'^add/$',                     'add'),
+    (r'^preview/$',                 'preview'),
+    (r'^(?P<slug>[-\w]+)/$',        'view'),
+    (r'^(?P<slug>[-\w]+)/edit/$',   'edit'),
+    (r'^(?P<slug>[-\w]+)/delete/$', 'delete'),
+    # old news URLs, permanent redirect view so we don't break all links
+    (r'^(?P<object_id>\d+)/$',      'view_redirect'),
+)
+
+# vim: set ts=4 sw=4 et: