Merge pull request #482 from MITx/feature/dave/nav_fixes

Remove non-functioning News tab. Enable Instructor tab from Discussion page

lms/djangoapps/django_comment_client/forum/views.py

@@ -8,6 +8,7 @@ from django.contrib.auth.models import User
 
 from mitxmako.shortcuts import render_to_response, render_to_string
 from courseware.courses import get_course_with_access
+from courseware.access import has_access
 
 from urllib import urlencode
 from django_comment_client.permissions import check_permissions_by_view
@@ -156,8 +157,9 @@ def forum_form_discussion(request, course_id):
             'content': content,
             'recent_active_threads': recent_active_threads,
             'trending_tags': trending_tags,
+            'staff_access' : has_access(request.user, course, 'staff'),
         }
-        print "start rendering.."
+        # print "start rendering.."
         return render_to_response('discussion/index.html', context)
 
 def render_single_thread(request, discussion_id, course_id, thread_id):

lms/templates/courseware/course_navigation.html

@@ -27,7 +27,7 @@ def url_class(url):
   % 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="${url_class('discussion')}">Discussion</a></li>
-        <li class="news"><a href="${reverse('news', args=[course.id])}" class="${url_class('news')}">News</a></li>
+        ## <li class="news"><a href="${reverse('news', args=[course.id])}" class="${url_class('news')}">News</a></li>
   % endif 
         
   % if settings.MITX_FEATURES.get('ENABLE_DISCUSSION'):