X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=urls.py;h=9fed21d348fdd11448115409dc626cbf01d746a6;hb=refs%2Fheads%2Fproduction-master-something;hp=996e08a7c4ba617006c8957cdf1cda518c1d3acd;hpb=040f43fc74e8026c2aa804fe2bd1e7220a9cb96d;p=matthijs%2Fprojects%2Fxerxes.git diff --git a/urls.py b/urls.py index 996e08a..9fed21d 100644 --- a/urls.py +++ b/urls.py @@ -1,22 +1,22 @@ from django.conf import settings from django.conf.urls.defaults import * -from ee.influences.models import Character -from ee.influences.models import Influence +from xerxes.influences.models import Character +from xerxes.influences.models import Influence import os urlpatterns = patterns('', url(r'^$', 'django.views.generic.simple.redirect_to', {'url' : '/influences/'}), url(r'^admin/', include('django.contrib.admin.urls')), - url(r'^influences/$', 'ee.influences.views.index', name='influences_index'), - url(r'^influences/influence/$', 'ee.influences.views.influence_list', name='influences_influence_list'), - url(r'^influences/influence/(?P\d+)/$', 'ee.influences.views.influence_detail', name='influences_influence_detail'), - url(r'^influences/influence/add/(\d+)/$', 'ee.influences.views.add', name='influences_add_influence_for_character'), - url(r'^influences/influence/add/$', 'ee.influences.views.add', name='influences_add_influence'), + 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\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/$', 'ee.influences.views.character_list', name='influences_character_list'), - url(r'^influences/character/(?P\d+)/$', 'ee.influences.views.character_detail', name='influences_character_detail'), - url(r'^influences/character/add/$', 'ee.influences.views.addCharacter', name='influences_add_character'), + url(r'^influences/character/$', 'xerxes.influences.views.character_list', name='influences_character_list'), + url(r'^influences/character/(?P\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'),