diff options
-rw-r--r-- | snakeplan/projects/urls.py | 11 | ||||
-rw-r--r-- | snakeplan/templates/projects/iteration_list.html | 2 | ||||
-rw-r--r-- | snakeplan/templates/projects/project_list.html | 8 | ||||
-rw-r--r-- | snakeplan/templates/projects/story_detail.html | 6 | ||||
-rw-r--r-- | snakeplan/templates/projects/story_list.html | 8 | ||||
-rwxr-xr-x | snakeplan/urls.py | 7 |
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 @@ | |||
1 | from django.conf.urls.defaults import patterns, url | 1 | from django.conf.urls.defaults import patterns, url |
2 | 2 | ||
3 | |||
4 | urlpatterns = patterns('snakeplan.projects.views', | 3 | urlpatterns = patterns('snakeplan.projects.views', |
5 | (r'^$', 'projects.index'), | 4 | (r'^$', 'projects.index'), |
6 | (r'^story/(.*)/', 'stories.index'), | 5 | (r'^projects/$', 'projects.index'), |
7 | (r'^iteration/(.*)/', 'iterations.index'), | 6 | (r'^project/create/', 'projects.create_project'), |
8 | (r'^create/', 'projects.create_project'), | 7 | (r'^project/(.*)/iterations/', 'projects.project_iterations'), |
9 | (r'^(.*)/iterations', 'projects.project_iterations'), | 8 | (r'^iteration/(.*)/stories/', 'iterations.index'), |
10 | url(r'^(.*)/', 'projects.project_iterations', name='project_iterations'), | 9 | (r'^story/(.*)/tasks/', 'stories.index'), |
11 | ) | 10 | ) |
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 @@ | |||
14 | </tr> | 14 | </tr> |
15 | {% for iteration in object_list %} | 15 | {% for iteration in object_list %} |
16 | <tr> | 16 | <tr> |
17 | <td><a href="/iteration/{{iteration.id}}">{{iteration.name}}</a></td> | 17 | <td><a href="/p/iteration/{{iteration.id}}/stories/">{{iteration.name}}</a></td> |
18 | <td>{{iteration.description}}</td> | 18 | <td>{{iteration.description}}</td> |
19 | <td>{{iteration.start_date}}</td> | 19 | <td>{{iteration.start_date}}</td> |
20 | <td>{{iteration.end_date}}</td> | 20 | <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 @@ | |||
1 | {% extends "base.html" %} | ||
2 | |||
3 | {% block content %} | ||
4 | |||
1 | <h1>Projects</h1> | 5 | <h1>Projects</h1> |
2 | 6 | ||
3 | <ol> | 7 | <ol> |
4 | {% for project in object_list %} | 8 | {% for project in object_list %} |
5 | <li><a href="{{project.id}}">{{project.name}}</a></li> | 9 | <li><a href="/p/project/{{project.id}}/iterations/">{{project.name}}</a></li> |
6 | {% endfor %} | 10 | {% endfor %} |
7 | </ol> | 11 | </ol> |
12 | |||
13 | {% 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 @@ | |||
1 | {% extends "base.html" %} | ||
2 | |||
3 | {% block content %} | ||
4 | |||
1 | <h1>{{ object.name }}</h1> | 5 | <h1>{{ object.name }}</h1> |
2 | 6 | ||
3 | <ol> | 7 | <ol> |
4 | <li> {{ object }} </li> | 8 | <li> {{ object }} </li> |
5 | </ol> | 9 | </ol> |
10 | |||
11 | {% 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 @@ | |||
1 | {% extends "base.html" %} | ||
2 | |||
3 | {% block content %} | ||
4 | |||
1 | <h1>Iteration: {{ iteration_name }}</h1> | 5 | <h1>Iteration: {{ iteration_name }}</h1> |
2 | 6 | ||
3 | <h2>Stories</h2> | 7 | <h2>Stories</h2> |
4 | <ol> | 8 | <ol> |
5 | {% for story in object_list %} | 9 | {% for story in object_list %} |
6 | <li><a href="/project/story/{{story.id}}/">{{story.name}}</a></li> | 10 | <li><a href="/p/story/{{story.id}}/tasks/">{{story.name}}</a></li> |
7 | {% endfor %} | 11 | {% endfor %} |
8 | </ol> | 12 | </ol> |
13 | |||
14 | {% 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 | |||
9 | 9 | ||
10 | 10 | ||
11 | urlpatterns = patterns('django.views.generic.simple', | 11 | urlpatterns = patterns('django.views.generic.simple', |
12 | (r'^$', 'redirect_to', dict(url='/project/')) | 12 | (r'^$', 'redirect_to', dict(url='/p/projects/')), |
13 | (r'^p/project/(?P<id>\d+)/$', 'redirect_to', dict(url='/p/project/%(id)s/iterations/')), | ||
14 | (r'^p/iteration/(?P<id>\d+)/$', 'redirect_to', dict(url='/p/iteration/%(id)s/stories/')), | ||
15 | (r'^p/story/(?P<id>\d+)/$', 'redirect_to', dict(url='/p/story/%(id)s/tasks/')) | ||
13 | ) | 16 | ) |
14 | 17 | ||
15 | urlpatterns += patterns('', | 18 | urlpatterns += patterns('', |
16 | (r'^admin/', include(admin.site.urls)), | 19 | (r'^admin/', include(admin.site.urls)), |
17 | (r'^project/', include('snakeplan.projects.urls')), | 20 | (r'^p/', include('projects.urls')), |
18 | (r'^static/(?P<path>.*)$', static.serve, {'document_root':'../static'}), | 21 | (r'^static/(?P<path>.*)$', static.serve, {'document_root':'../static'}), |
19 | ) | 22 | ) |