diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py index c48efa91f9..a0b830d535 100644 --- a/lms/djangoapps/instructor/views/instructor_dashboard.py +++ b/lms/djangoapps/instructor/views/instructor_dashboard.py @@ -45,7 +45,7 @@ def instructor_dashboard_2(request, course_id): raise Http404() sections = [ - _section_course_info(course_id, access), + _section_course_info(course_id), _section_membership(course_id, access), _section_student_admin(course_id, access), _section_data_download(course_id), @@ -86,15 +86,19 @@ section_display_name will be used to generate link titles in the nav bar. """ # pylint: disable=W0105 -def _section_course_info(course_id, access): +def _section_course_info(course_id): """ Provide data for the corresponding dashboard section """ course = get_course_by_id(course_id, depth=None) + (course_org, course_num, course_name) = course_id.split('/') + section_data = { 'section_key': 'course_info', 'section_display_name': _('Course Info'), 'course_id': course_id, - 'access': access, + 'course_org': course_org, + 'course_num': course_num, + 'course_name': course_name, 'course_display_name': course.display_name, 'enrollment_count': CourseEnrollment.objects.filter(course_id=course_id).count(), 'has_started': course.has_started(), diff --git a/lms/static/coffee/src/instructor_dashboard/course_info.coffee b/lms/static/coffee/src/instructor_dashboard/course_info.coffee index beca8db712..98e85be349 100644 --- a/lms/static/coffee/src/instructor_dashboard/course_info.coffee +++ b/lms/static/coffee/src/instructor_dashboard/course_info.coffee @@ -41,7 +41,7 @@ class CourseInfo ### Pending Instructor Tasks Section #### # Currently running tasks - @$table_running_tasks = @$section.find ".running-tasks-table" + @$table_running_tasks = @$section.find ".running-tasks-table" # start polling for task list # if the list is in the DOM diff --git a/lms/static/coffee/src/instructor_dashboard/data_download.coffee b/lms/static/coffee/src/instructor_dashboard/data_download.coffee index ffc24a574b..f9051f5260 100644 --- a/lms/static/coffee/src/instructor_dashboard/data_download.coffee +++ b/lms/static/coffee/src/instructor_dashboard/data_download.coffee @@ -84,7 +84,7 @@ class DataDownload ### Pending Instructor Tasks Section #### # Currently running tasks - @$table_running_tasks = @$section.find ".running-tasks-table" + @$table_running_tasks = @$section.find ".running-tasks-table" # start polling for task list # if the list is in the DOM diff --git a/lms/static/coffee/src/instructor_dashboard/send_email.coffee b/lms/static/coffee/src/instructor_dashboard/send_email.coffee index 27eea3d339..14eda493a8 100644 --- a/lms/static/coffee/src/instructor_dashboard/send_email.coffee +++ b/lms/static/coffee/src/instructor_dashboard/send_email.coffee @@ -92,7 +92,7 @@ class Email ### Pending Instructor Tasks Section #### # Currently running tasks - @$table_running_tasks = @$section.find ".running-tasks-table" + @$table_running_tasks = @$section.find ".running-tasks-table" # start polling for task list # if the list is in the DOM diff --git a/lms/templates/instructor/instructor_dashboard_2/course_info.html b/lms/templates/instructor/instructor_dashboard_2/course_info.html index 626d1b8ec8..c97ab0af32 100644 --- a/lms/templates/instructor/instructor_dashboard_2/course_info.html +++ b/lms/templates/instructor/instructor_dashboard_2/course_info.html @@ -1,44 +1,68 @@ <%! from django.utils.translation import ugettext as _ %> <%page args="section_data"/> -

${_("Course Information")}

+
+

${_("Enrollment Information")}

+ ${_("Total number of enrollees (instructors, staff members, and students)")} +

+ ${ section_data['enrollment_count'] } -
- ${_("Course Name")}: - ${ section_data['course_display_name'] } +
+
+ +
+

${_("Basic Course Information")}

+ +
-
- ${_("Course ID")}: - ${ section_data['course_id'] } -
-
- ${_("Students Enrolled")}: - ${ section_data['enrollment_count'] } -
- -
- ${_("Started")}: - ${ section_data['has_started'] } -
- -
- ${_("Ended")}: - ${ section_data['has_ended'] } -
- -
- ${_("Grade Cutoffs")}: - ${ section_data['grade_cutoffs'] } -
- -##
-## Offline Grades Available: -## ${ section_data['offline_grades'] } -##
- -%if settings.MITX_FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS') and section_data['access']['instructor']: +%if settings.MITX_FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS'):

${_("Pending Instructor Tasks")}

@@ -70,6 +94,3 @@

%endif - - -