diff --git a/common/static/js/vendor/ova/share-annotator.js b/common/static/js/vendor/ova/share-annotator.js index 3bf1f57920..16d4a5a829 100644 --- a/common/static/js/vendor/ova/share-annotator.js +++ b/common/static/js/vendor/ova/share-annotator.js @@ -141,7 +141,7 @@ Annotator.Plugin.Share = (function(_super) { event.preventDefault(); // disable normal link function so that it doesn't refresh the page annotation = share.getAnnotationFromId(event.currentTarget.attributes.annotationid); var _field = this; - var ovaId = annotation.id, + var ovaId = annotation.id; var title; if (method == 1) { title = 'Share'; @@ -221,7 +221,7 @@ Annotator.Plugin.Share = (function(_super) { source=this.annotation.id; } else {// method 2 var annotator = this.annotator; - var editor = annotator.editor, + var editor = annotator.editor; var textarea = $(editor.element).find('textarea')[0]; if (source == 'ovaText') @@ -258,7 +258,7 @@ Annotator.Plugin.Share = (function(_super) { The first option is to give a known id of an annotation Example http:// url.com/#id=rTcpOjIMT2aF1apDtboC-Q */ - var API = {}, + var API = {}; var ovaId = this.getParameterByName('ovaId'); // Method 1 (Obligatory) var start = this.getParameterByName('ovaStart'); // Method 2 (Obligatory) var end = this.getParameterByName('ovaEnd'); // Method 2 (Obligatory) diff --git a/lms/djangoapps/instructor/views/instructor_dashboard.py b/lms/djangoapps/instructor/views/instructor_dashboard.py index 52332d78a9..43a4eeb12c 100644 --- a/lms/djangoapps/instructor/views/instructor_dashboard.py +++ b/lms/djangoapps/instructor/views/instructor_dashboard.py @@ -97,7 +97,7 @@ def instructor_dashboard_2(request, course_id): if is_studio_course: studio_url = get_cms_course_link(course) - enrollment_count = sections[0]['enrollment_count'] + enrollment_count = sections[0]['enrollment_count']['total'] disable_buttons = False max_enrollment_for_buttons = settings.FEATURES.get("MAX_ENROLLMENT_INSTR_BUTTONS") if max_enrollment_for_buttons is not None: @@ -160,7 +160,7 @@ def _section_course_info(course_key, access): 'access': access, 'course_id': course_key, 'course_display_name': course.display_name, - 'enrollment_count': CourseEnrollment.num_enrolled_in(course_key), + 'enrollment_count': CourseEnrollment.enrollment_counts(course_key), 'has_started': course.has_started(), 'has_ended': course.has_ended(), 'list_instructor_tasks_url': reverse('list_instructor_tasks', kwargs={'course_id': course_key.to_deprecated_string()}), diff --git a/lms/static/sass/course/instructor/_instructor_2.scss b/lms/static/sass/course/instructor/_instructor_2.scss index 76a491e1cd..d1b1a70d78 100644 --- a/lms/static/sass/course/instructor/_instructor_2.scss +++ b/lms/static/sass/course/instructor/_instructor_2.scss @@ -774,6 +774,14 @@ input[name="subject"] { color: green; font-weight: bold; } + table { + tr { + height: 21px; + td { + width: 120px; + } + } + } } .ecommerce-wrapper{ diff --git a/lms/templates/instructor/instructor_dashboard_2/course_info.html b/lms/templates/instructor/instructor_dashboard_2/course_info.html index 7c710037b8..c27119fb60 100644 --- a/lms/templates/instructor/instructor_dashboard_2/course_info.html +++ b/lms/templates/instructor/instructor_dashboard_2/course_info.html @@ -3,10 +3,24 @@
| ${_("Verified")} | ${modes['verified']} | +
| ${_("Audit")} | ${modes['audit']} | +
| ${_("Honor")} | ${modes['honor']} | +
| ${_("Total")} | ${modes['total']} | +