Tidying up URLs. Still needs some work.

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
 
 from django.conf.urls.defaults import patterns, url
 
+
 urlpatterns = patterns('snakeplan.projects.views',
-    url(r'^$', 'projects.index'),
-    url(r'^projects/$', 'projects.index', name='project-list'),
-    url(r'^project/create/', 'projects.create_project', name='create-project'),
-    url(r'^project/(.*)/iterations/', 'projects.project_iterations', name='project-iterations'),
-    url(r'^iteration/(.*)/stories/', 'iterations.index'),
-    url(r'^story/(.*)/tasks/', 'stories.index'),
-    url(r'^task/(.*)/', 'tasks.index'),
+    url(r'^$', 'projects.index', name='project-list'),
+
+    # Projects
+    url(r'^create/', 'projects.create_project', name='create-project'),
+    url(r'^(\d+)/edit/', 'projects.update_project', name='edit-project'),
+    url(r'^(\d+)/', 'projects.project_iterations', name='project-iterations'),
+
+    # Iterations
+    url(r'^(\d+)/iterations/(\d+)/', 'projects.index'),
+
+    # Stories
+    url(r'^(\d+)/stories/(\d+)/', 'projects.index', name='iteration-stories'),
 )
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
 from django.views import static
 from django.conf.urls.defaults import patterns, include
 
-from django.contrib import admin
-admin.autodiscover()
-
-# Just get the admin stuff, don't actually do anything with it
-from snakeplan.projects import admin as _
-from snakeplan.accounts import admin as _
+from django.contrib import admin; admin.autodiscover()
 
 
 urlpatterns = patterns('django.views.generic.simple',
-     (r'^$', 'redirect_to', dict(url='/p/projects/')),
-     (r'^p/project/(?P<id>\d+)/$', 'redirect_to', dict(url='/p/project/%(id)s/iterations/')),
-     (r'^p/iteration/(?P<id>\d+)/$', 'redirect_to', dict(url='/p/iteration/%(id)s/stories/')),
-     (r'^p/story/(?P<id>\d+)/$', 'redirect_to', dict(url='/p/story/%(id)s/tasks/'))
-)
-
-urlpatterns += patterns('',
-     (r'^admin/', include(admin.site.urls)),
-     (r'^p/', include('projects.urls')),
-     (r'^media/(?P<path>.*)$', static.serve, {'document_root':'templates/media'}),
+    (r'^$', 'redirect_to', {'url': 'projects/' }),
+    (r'^projects/', include('projects.urls')),
+    (r'^admin/', include(admin.site.urls)),
+    (r'^media/(?P<path>.*)$', static.serve, {'document_root':'templates/media'}),
 )