From f7989cb2ab36818039fbfaedd27407510754cdfb Mon Sep 17 00:00:00 2001 From: Miles Steele Date: Mon, 29 Jul 2013 10:54:35 -0400 Subject: [PATCH] move to instructor template directory --- lms/djangoapps/instructor/views/instructor_dashboard.py | 7 ++----- .../instructor_dashboard_2/analytics.html | 0 .../instructor_dashboard_2/course_info.html | 0 .../instructor_dashboard_2/data_download.html | 0 .../instructor_dashboard_2/instructor_dashboard_2.html | 0 .../instructor_dashboard_2/membership.html | 0 .../instructor_dashboard_2/student_admin.html | 0 7 files changed, 2 insertions(+), 5 deletions(-) rename lms/templates/{courseware => instructor}/instructor_dashboard_2/analytics.html (100%) rename lms/templates/{courseware => instructor}/instructor_dashboard_2/course_info.html (100%) rename lms/templates/{courseware => instructor}/instructor_dashboard_2/data_download.html (100%) rename lms/templates/{courseware => instructor}/instructor_dashboard_2/instructor_dashboard_2.html (100%) rename lms/templates/{courseware => instructor}/instructor_dashboard_2/membership.html (100%) rename lms/templates/{courseware => instructor}/instructor_dashboard_2/student_admin.html (100%) diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py index 897e43fdfd..3c61f8baa8 100644 --- a/lms/djangoapps/instructor/views/instructor_dashboard.py +++ b/lms/djangoapps/instructor/views/instructor_dashboard.py @@ -1,7 +1,5 @@ """ Instructor Dashboard Views - -TODO add tracking """ from django_future.csrf import ensure_csrf_cookie @@ -25,13 +23,12 @@ from student.models import CourseEnrollment @ensure_csrf_cookie @cache_control(no_cache=True, no_store=True, must_revalidate=True) def instructor_dashboard_2(request, course_id): - """Display the instructor dashboard for a course.""" + """ Display the instructor dashboard for a course. """ course = get_course_by_id(course_id, depth=None) access = { 'admin': request.user.is_staff, - # an instructor can manage staff lists 'instructor': has_access(request.user, course, 'instructor'), 'staff': has_access(request.user, course, 'staff'), 'forum_admin': has_forum_access( @@ -57,7 +54,7 @@ def instructor_dashboard_2(request, course_id): 'sections': sections, } - return render_to_response('courseware/instructor_dashboard_2/instructor_dashboard_2.html', context) + return render_to_response('instructor/instructor_dashboard_2/instructor_dashboard_2.html', context) """ diff --git a/lms/templates/courseware/instructor_dashboard_2/analytics.html b/lms/templates/instructor/instructor_dashboard_2/analytics.html similarity index 100% rename from lms/templates/courseware/instructor_dashboard_2/analytics.html rename to lms/templates/instructor/instructor_dashboard_2/analytics.html diff --git a/lms/templates/courseware/instructor_dashboard_2/course_info.html b/lms/templates/instructor/instructor_dashboard_2/course_info.html similarity index 100% rename from lms/templates/courseware/instructor_dashboard_2/course_info.html rename to lms/templates/instructor/instructor_dashboard_2/course_info.html diff --git a/lms/templates/courseware/instructor_dashboard_2/data_download.html b/lms/templates/instructor/instructor_dashboard_2/data_download.html similarity index 100% rename from lms/templates/courseware/instructor_dashboard_2/data_download.html rename to lms/templates/instructor/instructor_dashboard_2/data_download.html diff --git a/lms/templates/courseware/instructor_dashboard_2/instructor_dashboard_2.html b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html similarity index 100% rename from lms/templates/courseware/instructor_dashboard_2/instructor_dashboard_2.html rename to lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html diff --git a/lms/templates/courseware/instructor_dashboard_2/membership.html b/lms/templates/instructor/instructor_dashboard_2/membership.html similarity index 100% rename from lms/templates/courseware/instructor_dashboard_2/membership.html rename to lms/templates/instructor/instructor_dashboard_2/membership.html diff --git a/lms/templates/courseware/instructor_dashboard_2/student_admin.html b/lms/templates/instructor/instructor_dashboard_2/student_admin.html similarity index 100% rename from lms/templates/courseware/instructor_dashboard_2/student_admin.html rename to lms/templates/instructor/instructor_dashboard_2/student_admin.html