From d19dc6a9b03de7cade0a7971b02ee32bc93579fa Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Wed, 29 Aug 2012 13:34:30 -0400
Subject: [PATCH] added new post button to primary nav

---
 lms/static/sass/_discussion.scss            | 24 +++++++------
 lms/templates/discussion/single_thread.html | 38 ++++++++++++++++++---
 2 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 62c56cd921..099d3d7f16 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -22,17 +22,21 @@
 
 
 body.discussion {
-  .new-post-btn {
-    @include blue-button;
-  }
+  .course-tabs .right {
+    float: right;
 
-  .new-post-icon {
-    display: block;
-    float: left;
-    width: 16px;
-    height: 17px;
-    margin: 8px 7px 0 0;
-    background: url(../images/new-post-icon.png) no-repeat;
+    .new-post-btn {
+      @include blue-button;
+    }
+
+    .new-post-icon {
+      display: block;
+      float: left;
+      width: 16px;
+      height: 17px;
+      margin: 8px 7px 0 0;
+      background: url(../images/new-post-icon.png) no-repeat;
+    }
   }
 }
 
diff --git a/lms/templates/discussion/single_thread.html b/lms/templates/discussion/single_thread.html
index 757b33cf3a..ba7226f21e 100644
--- a/lms/templates/discussion/single_thread.html
+++ b/lms/templates/discussion/single_thread.html
@@ -15,11 +15,41 @@
 <%static:js group='discussion'/>
 </%block>
 
-<%include file="../courseware/course_navigation.html" args="active_page='discussion'" />
+<%! from django.core.urlresolvers import reverse %>
+<%! from courseware.access import has_access %>
 
-<div class="">
-  <a href="#" class="new-post-btn"><span class="new-post-icon"></span>New Post</a>
-</div>
+<nav class="course-material">
+  <div class="inner-wrapper">
+    <ol class="course-tabs">
+      <li class="courseware"><a href="${reverse('courseware', args=[course.id])}">Courseware</a></li>
+      <li class="info"><a href="${reverse('info', args=[course.id])}">Course Info</a></li>
+% if hasattr(course,'syllabus_present') and course.syllabus_present:
+      <li class="syllabus"><a href="${reverse('syllabus', args=[course.id])}">Syllabus</a></li>
+% endif
+% if user.is_authenticated():
+  % if settings.MITX_FEATURES.get('ENABLE_TEXTBOOK'):
+        % for index, textbook in enumerate(course.textbooks):
+            <li class="book"><a href="${reverse('book', args=[course.id, index])}">${textbook.title}</a></li>
+        % endfor
+  % endif
+  % if settings.MITX_FEATURES.get('ENABLE_DISCUSSION_SERVICE'):
+        <li class="discussion"><a href="${reverse('django_comment_client.forum.views.forum_form_discussion', args=[course.id])}" class="active">Discussion</a></li>
+  % endif
+% endif
+% if settings.WIKI_ENABLED:
+      <li class="wiki"><a href="${reverse('course_wiki', args=[course.id])}">Wiki</a></li>
+% endif
+% if user.is_authenticated():
+      <li class="profile"><a href="${reverse('progress', args=[course.id])}">Progress</a></li>
+% endif
+% if staff_access:
+      <li class="instructor"><a href="${reverse('instructor_dashboard', args=[course.id])}">Instructor</a></li>
+% endif
+      <li class="right"><a href="#" class="new-post-btn"><span class="new-post-icon"></span>New Post</a></li>
+    </ol>
+
+  </div>
+</nav>
 
 <div class="discussion container">
   <div class="discussion-body">