CLeanup url scheme to make app more portable. Clean up templates to inherit base template (yay, style!)

6 files changed, 31 insertions, 11 deletions

diff --git a/snakeplan/projects/urls.py b/snakeplan/projects/urls.py
index ad17363..d823476 100644
--- a/snakeplan/projects/urls.py
+++ b/snakeplan/projects/urls.py
@@ -1,11 +1,10 @@
 from django.conf.urls.defaults import patterns, url
 
-
 urlpatterns = patterns('snakeplan.projects.views',
     (r'^$', 'projects.index'),
-    (r'^story/(.*)/', 'stories.index'),
-    (r'^iteration/(.*)/', 'iterations.index'),
-    (r'^create/', 'projects.create_project'),
-    (r'^(.*)/iterations', 'projects.project_iterations'),
-    url(r'^(.*)/', 'projects.project_iterations', name='project_iterations'),
+    (r'^projects/$', 'projects.index'),
+    (r'^project/create/', 'projects.create_project'),
+    (r'^project/(.*)/iterations/', 'projects.project_iterations'),
+    (r'^iteration/(.*)/stories/', 'iterations.index'),
+    (r'^story/(.*)/tasks/', 'stories.index'),
 )
diff --git a/snakeplan/templates/projects/iteration_list.html b/snakeplan/templates/projects/iteration_list.html
index cb39fc7..f48b812 100644
--- a/snakeplan/templates/projects/iteration_list.html
+++ b/snakeplan/templates/projects/iteration_list.html
@@ -14,7 +14,7 @@
     </tr>
 {% for iteration in object_list %}
     <tr>
-        <td><a href="/iteration/{{iteration.id}}">{{iteration.name}}</a></td>
+        <td><a href="/p/iteration/{{iteration.id}}/stories/">{{iteration.name}}</a></td>
         <td>{{iteration.description}}</td>
         <td>{{iteration.start_date}}</td>
         <td>{{iteration.end_date}}</td>
diff --git a/snakeplan/templates/projects/project_list.html b/snakeplan/templates/projects/project_list.html
index 5ede56e..d668603 100644
--- a/snakeplan/templates/projects/project_list.html
+++ b/snakeplan/templates/projects/project_list.html
@@ -1,7 +1,13 @@
+{% extends "base.html" %}
+
+{% block content %}
+
 <h1>Projects</h1>
 
 <ol>
     {% for project in object_list %}
-    <li><a href="{{project.id}}">{{project.name}}</a></li>
+    <li><a href="/p/project/{{project.id}}/iterations/">{{project.name}}</a></li>
     {% endfor %}
 </ol>
+
+{% endblock %}
diff --git a/snakeplan/templates/projects/story_detail.html b/snakeplan/templates/projects/story_detail.html
index f8ade89..360ce79 100644
--- a/snakeplan/templates/projects/story_detail.html
+++ b/snakeplan/templates/projects/story_detail.html
@@ -1,5 +1,11 @@
+{% extends "base.html" %}
+
+{% block content %}
+
 <h1>{{ object.name }}</h1>
 
 <ol>
     <li> {{ object }} </li>
 </ol>
+
+{% endblock %}
diff --git a/snakeplan/templates/projects/story_list.html b/snakeplan/templates/projects/story_list.html
index 4424ac4..f606cc5 100644
--- a/snakeplan/templates/projects/story_list.html
+++ b/snakeplan/templates/projects/story_list.html
@@ -1,8 +1,14 @@
+{% extends "base.html" %}
+
+{% block content %}
+
 <h1>Iteration: {{ iteration_name }}</h1>
 
 <h2>Stories</h2>
 <ol>
     {% for story in object_list %}
-    <li><a href="/project/story/{{story.id}}/">{{story.name}}</a></li>
+    <li><a href="/p/story/{{story.id}}/tasks/">{{story.name}}</a></li>
     {% endfor %}
 </ol>
+
+{% endblock %}
diff --git a/snakeplan/urls.py b/snakeplan/urls.py
index 9b777e4..e2620d6 100755
--- a/snakeplan/urls.py
+++ b/snakeplan/urls.py
@@ -9,11 +9,14 @@ from snakeplan.projects import admin as snakeplan_admin
 
 
 urlpatterns = patterns('django.views.generic.simple',
-     (r'^$', 'redirect_to', dict(url='/project/'))
+     (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'^project/', include('snakeplan.projects.urls')),
+     (r'^p/', include('projects.urls')),
      (r'^static/(?P<path>.*)$', static.serve, {'document_root':'../static'}),
 )