diff --git a/AUTHORS b/AUTHORS index aa74e4be65..8a215a3edc 100644 --- a/AUTHORS +++ b/AUTHORS @@ -145,4 +145,4 @@ John Cox Ben Weeks David Bodor Sébastien Hinderer - +Kristin Stephens diff --git a/common/lib/xmodule/xmodule/split_test_module.py b/common/lib/xmodule/xmodule/split_test_module.py index ce9da1aba6..9553e3b898 100644 --- a/common/lib/xmodule/xmodule/split_test_module.py +++ b/common/lib/xmodule/xmodule/split_test_module.py @@ -21,6 +21,8 @@ log = logging.getLogger('edx.' + __name__) class SplitTestFields(object): """Fields needed for split test module""" + has_children = True + user_partition_id = Integer( help="Which user partition is used for this test", scope=Scope.content diff --git a/lms/djangoapps/dashboard/views.py b/lms/djangoapps/dashboard/views.py index cefa41252b..26e35f172c 100644 --- a/lms/djangoapps/dashboard/views.py +++ b/lms/djangoapps/dashboard/views.py @@ -56,7 +56,7 @@ def dashboard(request): # table queries need not take the form of raw SQL, but do in this case since # the MySQL backend for django isn't very friendly with group by or distinct table_queries = {} - table_queries["course enrollments"] = """ + table_queries["course registrations (current enrollments)"] = """ select course_id as Course, count(user_id) as Students diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index 6991fba25b..6f975475ca 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -390,6 +390,7 @@ img { width: 100%; + min-height: 100%; } }