From f753a09fbd0c800dffffa949cce07b57ae258d35 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Fri, 5 Sep 2014 15:46:30 -0400 Subject: [PATCH] LMS: revises membership UI layout on instructor dashboard --- .../sass/course/instructor/_instructor_2.scss | 14 +++++--------- .../instructor_dashboard_2/membership.html | 16 ++++++++-------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/lms/static/sass/course/instructor/_instructor_2.scss b/lms/static/sass/course/instructor/_instructor_2.scss index 3b37b53ba6..bdd7fd462e 100644 --- a/lms/static/sass/course/instructor/_instructor_2.scss +++ b/lms/static/sass/course/instructor/_instructor_2.scss @@ -329,16 +329,12 @@ section.instructor-dashboard-content-2 { .instructor-dashboard-wrapper-2 section.idash-section#membership { $half_width: $baseline * 20; - .vert-left, - .vert-right { - display: inline-block; - vertical-align: top; - width: 48%; - margin-right: 2%; - } + .membership-section { + margin-bottom: $baseline; - .vert-right { - margin-right: 0; + &:last-child { + margin-bottom: 0; // last child! + } } .batch-enrollment, .batch-beta-testers { diff --git a/lms/templates/instructor/instructor_dashboard_2/membership.html b/lms/templates/instructor/instructor_dashboard_2/membership.html index 13ffd499d2..a4cfa08e5b 100644 --- a/lms/templates/instructor/instructor_dashboard_2/membership.html +++ b/lms/templates/instructor/instructor_dashboard_2/membership.html @@ -26,7 +26,7 @@ -
+

${_("Batch Enrollment")}

-

+

${_("If this option is checked, users who have not yet registered for {platform_name} will be automatically enrolled.").format(platform_name=settings.PLATFORM_NAME)} ${_("If this option is left unchecked, users who have not yet registered for {platform_name} will not be enrolled, but will be allowed to enroll once they make an account.").format(platform_name=settings.PLATFORM_NAME)}

@@ -54,7 +54,7 @@

@@ -66,10 +66,10 @@
-
+ %if section_data['access']['instructor']: -
+

${_("Batch Beta Tester Addition")}

-
+ %endif -
+
## Translators: an "Administration List" is a list, such as Course Staff, that users can be added to.

${_("Administration List Management")}

@@ -213,7 +213,7 @@ >
%endif - + %if course.is_cohorted: