...and comment out the jquery_ui bit

[djsite.git] / quotes / urls.py

diff --git a/quotes/urls.py b/quotes/urls.py
index 014b6901fae599d46c09fc4f429fddb6a04c78f1..a8cc355c150d32021d0ac80ac04ac9e5ef7f6dc4 100644 (file)
--- a/quotes/urls.py
+++ b/quotes/urls.py
@@ -1,11 +1,25 @@
 from django.conf.urls import url
+from django.contrib.auth.views import login
 
-from . import views
+from . import views, adminviews
 
 urlpatterns = [
-    url(r'^$', views.random, name='random'),
+    url(r'^$', views.index, name='index'),
+
+    url(r'^random$', views.random, name='random'),
+    url(r'^random/$', views.random, name='random'),
+
     url(r'^show/(?P<quote_id>[0-9]+)/$', views.onequote, name="onequote"),
     url(r'^tag/(?P<tag_id>[0-9]+)/$', views.tags, name="tags"),
     url(r'^author/(?P<author_id>[0-9]+)/$', views.author, name="author"),
+    url(r'^work/(?P<work_id>[0-9]+)/$', views.work, name="work"),
+
+    url(r'^cloud/$', views.cloud, name="cloud"),
+    url(r'^search/$', views.searchpage, name="search"),
+
+    url(r'^admin/$', adminviews.listadmintools, name='listadmintools'),
+    url(r'^admin/login$', login, {'template_name': 'admin/login.html'}),
+    url(r'^admin/massimport/$', adminviews.massimport, name='massimport'),
+
     url(r'^all/$', views.all, name="all"),
 ]