Merging changes from benjaminws

10 files changed, 77 insertions, 12 deletions

diff --git a/snakeplan/TODO.txt b/snakeplan/TODO.txt
index ed43c64..06cc314 100644
--- a/snakeplan/TODO.txt
+++ b/snakeplan/TODO.txt
@@ -2,3 +2,8 @@ Work To Do
 ==========
  * Fix imports of snakeplan, instead place projects in the pythonpath
  * Move templates from the application to the project
+ * View/Form for Logged Time (where is the relationship?) - bsmith
+ * Some sort of menu layout static across all pages (make it a model/view for flexability?)
+ * Header linking back to the main page
+ * Authentication on the user pages.
+ * UI Design -- HARDCORE BITCH
diff --git a/snakeplan/projects/urls.py b/snakeplan/projects/urls.py
index 6aec48a..ca1077a 100644
--- a/snakeplan/projects/urls.py
+++ b/snakeplan/projects/urls.py
@@ -1,10 +1,11 @@
 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'),
-    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'),
+    (r'^task/(.*)/', 'tasks.index'),
 )
diff --git a/snakeplan/projects/views/stories.py b/snakeplan/projects/views/stories.py
index 39bc323..504d930 100644
--- a/snakeplan/projects/views/stories.py
+++ b/snakeplan/projects/views/stories.py
@@ -1,10 +1,14 @@
 from django.views.generic import list_detail
 from snakeplan.projects.models import Story
+from snakeplan.projects.models import Task
 
 
 def index(request, story_id):
+    tasks = Task.objects.filter(story=story_id).all()
+
     return list_detail.object_detail(
         request=request,
         queryset=Story.objects.filter(id=story_id).all(),
         object_id=story_id,
+        extra_context={'tasks': tasks},
         )
diff --git a/snakeplan/projects/views/tasks.py b/snakeplan/projects/views/tasks.py
new file mode 100644
index 0000000..8e74cfa
--- /dev/null
+++ b/snakeplan/projects/views/tasks.py
@@ -0,0 +1,12 @@
+from django.views.generic import list_detail
+import snakeplan.projects.models as sp_models
+from snakeplan.projects.models import Task
+
+
+def index(request, task_id):
+    return list_detail.object_detail(
+        request=request,
+        queryset=Task.objects.filter(id=task_id).all(),
+        object_id=task_id,
+        extra_context={'dispositions': sp_models.DISPOSITIONS}
+        )
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 3b8ddee..331d7c2 100644
--- a/snakeplan/templates/projects/project_list.html
+++ b/snakeplan/templates/projects/project_list.html
@@ -5,7 +5,7 @@
 
 <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..4e73397 100644
--- a/snakeplan/templates/projects/story_detail.html
+++ b/snakeplan/templates/projects/story_detail.html
@@ -1,5 +1,20 @@
-<h1>{{ object.name }}</h1>
+{% extends "base.html" %}
+
+{% block content %}
+
+<h1>Story: {{ object.name }}</h1>
+
+<h2>Descipton:</h2>
+<p class="story_description">{{ object.description }}</p>
+
+<h2>Tasks:</h2>
 
 <ol>
-    <li> {{ object }} </li>
+    {% for task in tasks %}
+    <li>
+        <a href="/p/task/{{ task.id }}/">{{ task.name }}</a>
+    </li>
+    {% endfor %}
 </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/templates/projects/task_detail.html b/snakeplan/templates/projects/task_detail.html
new file mode 100644
index 0000000..2d655ba
--- /dev/null
+++ b/snakeplan/templates/projects/task_detail.html
@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<h1>Task: {{ object.name }}</h1>
+
+<h2>Descipton:</h2>
+<p>{{ object.description }}</p>
+
+<h3>Details</h3>
+
+<ul>
+    <li>{{ object.acceptor }}</li>
+    <li>{{ object.task_type }}</li>
+    <li>{{ object.disposition }}</li>
+    <li>{{ object.estimated_hours }}</li>
+</ul>
+
+{% 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'}),
 )