From 96ca09f45ccb7572a46ee7039b23819be0ec4b1b Mon Sep 17 00:00:00 2001 From: Chris Rodriguez Date: Wed, 27 Apr 2016 15:47:41 -0400 Subject: [PATCH] Membership page label additions and fixes --- .../pages/lms/instructor_dashboard.py | 2 +- .../sass/course/instructor/_instructor_2.scss | 53 +++-- .../instructor_dashboard_2/membership.html | 205 +++++++++--------- 3 files changed, 129 insertions(+), 131 deletions(-) diff --git a/common/test/acceptance/pages/lms/instructor_dashboard.py b/common/test/acceptance/pages/lms/instructor_dashboard.py index 9bf3c53741..a47d2710db 100644 --- a/common/test/acceptance/pages/lms/instructor_dashboard.py +++ b/common/test/acceptance/pages/lms/instructor_dashboard.py @@ -755,7 +755,7 @@ class MembershipPageAutoEnrollSection(PageObject): """ Fill in the form with the provided email and submit it. """ - email_selector = "{} >p>textarea".format(self.batch_enrollment_selector) + email_selector = "{} textarea".format(self.batch_enrollment_selector) enrollment_button = "{} .enrollment-button[data-action='enroll']".format(self.batch_enrollment_selector) # Fill the email addresses after the email selector is visible. diff --git a/lms/static/sass/course/instructor/_instructor_2.scss b/lms/static/sass/course/instructor/_instructor_2.scss index aab370eaec..991107a108 100644 --- a/lms/static/sass/course/instructor/_instructor_2.scss +++ b/lms/static/sass/course/instructor/_instructor_2.scss @@ -435,6 +435,12 @@ &:last-child { margin-bottom: 0; } + + legend { + // use the same styles as H3s + font-size: 1.2em; + margin-bottom: 15px; + } } .batch-enrollment, .batch-beta-testers { @@ -478,19 +484,15 @@ margin: ($baseline/2) 0; position: relative; - label { - border-bottom: 1px dotted $base-font-color; - } - .hint { @extend %t-copy-sub2; - display: none; + display: block; position: absolute; - top: 15px; - @include left($baseline*10); + top: ($baseline/2); + left: -9999em; padding: ($baseline/2); width: 50%; - background-color: $light-gray; + background-color: $light-gray3; box-shadow: 2px 2px 3px $shadow; .hint-caret { @@ -498,30 +500,24 @@ position: absolute; top: 0; @include left(-15px); - @include border-right(8px solid $light-gray); + @include border-right(8px solid $light-gray3); @include border-left(8px solid transparent); - border-top: 8px solid $light-gray; + border-top: 8px solid $light-gray3; border-bottom: 8px solid transparent; } } - } - - label[for="auto-enroll"]:hover + .auto-enroll-hint { - display: block; - } - - label[for="auto-enroll-beta"]:hover + .auto-enroll-beta-hint { - width: 30%; - display: block; - } - - label[for="email-students"]:hover + .email-students-hint { - display: block; - } - - label[for="email-students-beta"]:hover + .email-students-beta-hint { - width: 30%; - display: block; + + /* *** + * Ideally we want to handle functionality with JS. + * This functionality should eventually be moved into CS/JS, and out of here. */ + .has-hint:hover > .hint { + @include left($baseline*10); + } + + .has-hint input:focus ~ .hint { + @include left($baseline*10); + } + /* *** */ } .enroll-actions { @@ -595,6 +591,7 @@ border-bottom: 1px solid $light-gray; } + th, td { @extend %t-copy-sub1; vertical-align: middle; diff --git a/lms/templates/instructor/instructor_dashboard_2/membership.html b/lms/templates/instructor/instructor_dashboard_2/membership.html index cf00fb208a..a9fef75104 100644 --- a/lms/templates/instructor/instructor_dashboard_2/membership.html +++ b/lms/templates/instructor/instructor_dashboard_2/membership.html @@ -17,7 +17,7 @@ from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_ {{#labels}} - {{.}} + {{.}} {{/labels}} @@ -25,132 +25,133 @@ from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_
- - +
-
-

${_("Batch Enrollment")}

-

- - -

- - % if section_data['is_white_label']: -

- - -

- %endif -
- - -
- -

- ${_("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)} -

- ${_("Checking this box has no effect if 'Unenroll' is selected.")} -

+

Enrollment

+
+ ${_("Batch Enrollment")} + + + % if section_data['is_white_label']: + + %endif +
+
-
- -
- - - - -
- - -
-
-
-
+
+ + +
+
+
+ %if static.get_value('ALLOW_AUTOMATED_SIGNUPS', settings.FEATURES.get('ALLOW_AUTOMATED_SIGNUPS', False)): -
+
-
-

${_("Register/Enroll Students")}

-

- ${_("To register and enroll a list of users in this course, choose a CSV file that contains the following columns in this exact order: email, username, name, and country. Please include one student per row and do not include any headers, footers, or blank lines.")} -

+
+

${_("Register/Enroll Students")}

+

${_("To register and enroll a list of users in this course, choose a CSV file that contains the following columns in this exact order: email, username, name, and country. Please include one student per row and do not include any headers, footers, or blank lines.")}

+
Browse +
-
-
+
%endif
%if section_data['access']['instructor']: -
-

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

-

-

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

- -
- - -
- -

- ${_("If this option is checked, users who have not enrolled in your course will be automatically enrolled.")} -

- ${_("Checking this box has no effect if 'Remove beta testers' is selected.")} -

+
+
-
- -
- - - - -
- - -
- -
-
-
+
+ + +
+
+
+
%endif @@ -163,11 +164,11 @@ from openedx.core.djangoapps.course_groups.partition_scheme import get_cohorted_
## Translators: an "Administrator Group" is a group, such as Course Staff, that users can be added to. - - - +