* Add some filters and search fields to the admin.

[matthijs/projects/xerxes.git] / urls.py

diff --git a/urls.py b/urls.py
index 8890ef5a22951149a7502d2f8d2b7c521d1c6e36..9fed21d348fdd11448115409dc626cbf01d746a6 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -1,18 +1,30 @@
+from django.conf import settings
 from django.conf.urls.defaults import *
-from ee.influences.models import Character
-
-chars_dict = {
-       'queryset': Character.objects.all(),
-}
+from xerxes.influences.models import Character
+from xerxes.influences.models import Influence
+import os
  
 urlpatterns = patterns('',
-    (r'^admin/', include('django.contrib.admin.urls')),
-       (r'^events/event/(?P<event_id>\d+)/$', 'ee.events.views.event.detail'),
-       (r'^events/event/(?P<event_id>\d+)/regs$', 'ee.events.views.event.regs'),
-       (r'^influences/add/(\d+)?/?$', 'ee.influences.views.add'),
-       (r'^influences/$', 'django.views.generic.list_detail.object_list', chars_dict),
-       (r'^influences/character/(?P<object_id>\d+)/$', 'django.views.generic.list_detail.object_detail', chars_dict),
-       (r'^influences/character/add/$', 'ee.influences.views.addCharacter'),
-       (r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'base/login.html'}),
-       (r'^accounts/logout/$', 'django.contrib.auth.views.logout_then_login'),
+    url(r'^$', 'django.views.generic.simple.redirect_to', {'url' : '/influences/'}),
+    url(r'^admin/', include('django.contrib.admin.urls')),
+
+    url(r'^influences/$', 'xerxes.influences.views.index', name='influences_index'),
+    url(r'^influences/influence/$', 'xerxes.influences.views.influence_list', name='influences_influence_list'),
+    url(r'^influences/influence/(?P<object_id>\d+)/$', 'xerxes.influences.views.influence_detail', name='influences_influence_detail'),
+    url(r'^influences/influence/add/(\d+)/$', 'xerxes.influences.views.add_influence', name='influences_add_influence_for_character'),
+    url(r'^influences/influence/add/$', 'xerxes.influences.views.add_influence', name='influences_add_influence'),
+    
+    url(r'^influences/character/$', 'xerxes.influences.views.character_list', name='influences_character_list'),
+    url(r'^influences/character/(?P<object_id>\d+)/$', 'xerxes.influences.views.character_detail', name='influences_character_detail'),
+    url(r'^influences/character/add/$', 'xerxes.influences.views.add_character', name='influences_add_character'),
+
+    url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name': 'base/login.html'}, name='login'),
+    url(r'^accounts/logout/$', 'django.contrib.auth.views.logout_then_login', name='logout'),
 )
+
+if settings.DEBUG:
+    urlpatterns += patterns('',
+        (r'^static/(?P<path>.*)$', 'django.views.static.serve',
+        {'document_root': os.path.join(settings.PROJECT_DIR, 'static')}),
+    )
+# vim: set sts=4 sw=4 expandtab: