diff options
author | Mike Crute <mcrute@gmail.com> | 2010-07-10 23:56:13 -0400 |
---|---|---|
committer | Mike Crute <mcrute@gmail.com> | 2010-07-10 23:56:13 -0400 |
commit | d471329e7a5bf7819bb557241bf580a1c6e1fae5 (patch) | |
tree | ce6f31ef8da98ab23134c7555c68afd227bededb | |
parent | 1093383ae03816387956b1c21e3799029fda0721 (diff) | |
download | snakeplan-d471329e7a5bf7819bb557241bf580a1c6e1fae5.tar.bz2 snakeplan-d471329e7a5bf7819bb557241bf580a1c6e1fae5.tar.xz snakeplan-d471329e7a5bf7819bb557241bf580a1c6e1fae5.zip |
Tidying up URLs. Still needs some work.
-rw-r--r-- | snakeplan/projects/urls.py | 20 | ||||
-rw-r--r-- | snakeplan/urls.py | 21 |
2 files changed, 18 insertions, 23 deletions
diff --git a/snakeplan/projects/urls.py b/snakeplan/projects/urls.py index 259cbc9..7f47d04 100644 --- a/snakeplan/projects/urls.py +++ b/snakeplan/projects/urls.py | |||
@@ -20,12 +20,18 @@ SnakePlan Project Urls | |||
20 | 20 | ||
21 | from django.conf.urls.defaults import patterns, url | 21 | from django.conf.urls.defaults import patterns, url |
22 | 22 | ||
23 | |||
23 | urlpatterns = patterns('snakeplan.projects.views', | 24 | urlpatterns = patterns('snakeplan.projects.views', |
24 | url(r'^$', 'projects.index'), | 25 | url(r'^$', 'projects.index', name='project-list'), |
25 | url(r'^projects/$', 'projects.index', name='project-list'), | 26 | |
26 | url(r'^project/create/', 'projects.create_project', name='create-project'), | 27 | # Projects |
27 | url(r'^project/(.*)/iterations/', 'projects.project_iterations', name='project-iterations'), | 28 | url(r'^create/', 'projects.create_project', name='create-project'), |
28 | url(r'^iteration/(.*)/stories/', 'iterations.index'), | 29 | url(r'^(\d+)/edit/', 'projects.update_project', name='edit-project'), |
29 | url(r'^story/(.*)/tasks/', 'stories.index'), | 30 | url(r'^(\d+)/', 'projects.project_iterations', name='project-iterations'), |
30 | url(r'^task/(.*)/', 'tasks.index'), | 31 | |
32 | # Iterations | ||
33 | url(r'^(\d+)/iterations/(\d+)/', 'projects.index'), | ||
34 | |||
35 | # Stories | ||
36 | url(r'^(\d+)/stories/(\d+)/', 'projects.index', name='iteration-stories'), | ||
31 | ) | 37 | ) |
diff --git a/snakeplan/urls.py b/snakeplan/urls.py index 168390d..6d910f1 100644 --- a/snakeplan/urls.py +++ b/snakeplan/urls.py | |||
@@ -21,23 +21,12 @@ SnakePlan URL Configuration | |||
21 | from django.views import static | 21 | from django.views import static |
22 | from django.conf.urls.defaults import patterns, include | 22 | from django.conf.urls.defaults import patterns, include |
23 | 23 | ||
24 | from django.contrib import admin | 24 | from django.contrib import admin; admin.autodiscover() |
25 | admin.autodiscover() | ||
26 | |||
27 | # Just get the admin stuff, don't actually do anything with it | ||
28 | from snakeplan.projects import admin as _ | ||
29 | from snakeplan.accounts import admin as _ | ||
30 | 25 | ||
31 | 26 | ||
32 | urlpatterns = patterns('django.views.generic.simple', | 27 | urlpatterns = patterns('django.views.generic.simple', |
33 | (r'^$', 'redirect_to', dict(url='/p/projects/')), | 28 | (r'^$', 'redirect_to', {'url': 'projects/' }), |
34 | (r'^p/project/(?P<id>\d+)/$', 'redirect_to', dict(url='/p/project/%(id)s/iterations/')), | 29 | (r'^projects/', include('projects.urls')), |
35 | (r'^p/iteration/(?P<id>\d+)/$', 'redirect_to', dict(url='/p/iteration/%(id)s/stories/')), | 30 | (r'^admin/', include(admin.site.urls)), |
36 | (r'^p/story/(?P<id>\d+)/$', 'redirect_to', dict(url='/p/story/%(id)s/tasks/')) | 31 | (r'^media/(?P<path>.*)$', static.serve, {'document_root':'templates/media'}), |
37 | ) | ||
38 | |||
39 | urlpatterns += patterns('', | ||
40 | (r'^admin/', include(admin.site.urls)), | ||
41 | (r'^p/', include('projects.urls')), | ||
42 | (r'^media/(?P<path>.*)$', static.serve, {'document_root':'templates/media'}), | ||
43 | ) | 32 | ) |