From ab74f64e857713c41a897fa37d6593d58bbb890a Mon Sep 17 00:00:00 2001 From: zubair-arbi Date: Wed, 8 Jul 2015 14:31:33 +0500 Subject: [PATCH] update credit eligibility ui text ECOM-1648 --- .../views/tests/test_credit_eligibility.py | 12 ++++++------ cms/static/js/views/settings/main.js | 4 ++-- cms/static/sass/views/_settings.scss | 4 ++++ cms/templates/settings.html | 19 ++++++++++--------- cms/templates/settings_graders.html | 8 ++++---- 5 files changed, 26 insertions(+), 21 deletions(-) diff --git a/cms/djangoapps/contentstore/views/tests/test_credit_eligibility.py b/cms/djangoapps/contentstore/views/tests/test_credit_eligibility.py index d24007129d..6ce0cfce51 100644 --- a/cms/djangoapps/contentstore/views/tests/test_credit_eligibility.py +++ b/cms/djangoapps/contentstore/views/tests/test_credit_eligibility.py @@ -29,8 +29,8 @@ class CreditEligibilityTest(CourseTestCase): """ response = self.client.get_html(self.course_details_url) self.assertEqual(response.status_code, 200) - self.assertNotContains(response, "Credit Eligibility Requirements") - self.assertNotContains(response, "Steps needed for credit eligibility") + self.assertNotContains(response, "Course Credit Requirements") + self.assertNotContains(response, "Steps required to earn course credit") @mock.patch.dict("django.conf.settings.FEATURES", {'ENABLE_CREDIT_ELIGIBILITY': True}) def test_course_details_with_enabled_setting(self): @@ -41,8 +41,8 @@ class CreditEligibilityTest(CourseTestCase): # course is not set as credit course response = self.client.get_html(self.course_details_url) self.assertEqual(response.status_code, 200) - self.assertNotContains(response, "Credit Eligibility Requirements") - self.assertNotContains(response, "Steps needed for credit eligibility") + self.assertNotContains(response, "Course Credit Requirements") + self.assertNotContains(response, "Steps required to earn course credit") # verify that credit eligibility requirements block shows if the # course is set as credit course and it has eligibility requirements @@ -55,5 +55,5 @@ class CreditEligibilityTest(CourseTestCase): response = self.client.get_html(self.course_details_url) self.assertEqual(response.status_code, 200) - self.assertContains(response, "Credit Eligibility Requirements") - self.assertContains(response, "Steps needed for credit eligibility") + self.assertContains(response, "Course Credit Requirements") + self.assertContains(response, "Steps required to earn course credit") diff --git a/cms/static/js/views/settings/main.js b/cms/static/js/views/settings/main.js index 441d12d875..c21a6c48a4 100644 --- a/cms/static/js/views/settings/main.js +++ b/cms/static/js/views/settings/main.js @@ -54,8 +54,8 @@ var DetailsView = ValidatingView.extend({ if (options.showMinGradeWarning || false) { new NotificationView.Warning({ - title: gettext("Credit Eligibility Requirements"), - message: gettext("Minimum passing grade for credit is not set."), + title: gettext("Course Credit Requirements"), + message: gettext("The minimum grade for course credit is not set."), closeIcon: true }).show(); } diff --git a/cms/static/sass/views/_settings.scss b/cms/static/sass/views/_settings.scss index 14fb5750e7..e579baa6ad 100644 --- a/cms/static/sass/views/_settings.scss +++ b/cms/static/sass/views/_settings.scss @@ -97,6 +97,10 @@ } // in form -UI hints/tips/messages + .header-help { + margin: 0 0 $baseline 0; + } + .instructions { @extend %t-copy-sub1; margin: 0 0 $baseline 0; diff --git a/cms/templates/settings.html b/cms/templates/settings.html index d24b534cd7..4f0769e080 100644 --- a/cms/templates/settings.html +++ b/cms/templates/settings.html @@ -112,8 +112,8 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url}';

${_( 'Your course summary page will not be viewable until your course ' 'has been announced. To provide content for the page and preview ' - 'it, follow the instructions provided by your Program Manager.') - }

+ 'it, follow the instructions provided by your Program Manager.')} +

% endif @@ -123,16 +123,18 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url}'; % if credit_eligibility_enabled and is_credit_course:
-

${_("Credit Eligibility Requirements")}

- ${_("Steps needed for credit eligibility")} +

${_("Course Credit Requirements")}

+ ${_("Steps required to earn course credit")}
+ A requirement appears in this list when you publish the unit that contains the requirement. + % if credit_requirements:
    % if 'grade' in credit_requirements:
  1. - + % for requirement in credit_requirements['grade']: - + % endfor @@ -152,12 +154,11 @@ CMS.URL.UPLOAD_ASSET = '${upload_asset_url}'; % if 'reverification' in credit_requirements:
  2. - + % for requirement in credit_requirements['reverification']: - ## Translators: 'Access to Assessment 1' means the access for a requirement with name 'Assessment 1' + class="long" id="${requirement['name']}" value="${requirement['display_name']}" readonly /> % endfor
    3. % endif diff --git a/cms/templates/settings_graders.html b/cms/templates/settings_graders.html index 13871988e1..43c220bc5b 100644 --- a/cms/templates/settings_graders.html +++ b/cms/templates/settings_graders.html @@ -79,15 +79,15 @@ % if settings.FEATURES.get("ENABLE_CREDIT_ELIGIBILITY", False) and is_credit_course:
    -

    ${_("Credit Grade & Eligibility")}

    - ${_("Settings for credit eligibility")} +

    ${_("Credit Eligibility")}

    + ${_("Settings for course credit eligibility")}
    1. - + - ${_("Must be greater than or equal to passing grade")} + ${_("Must be greater than or equal to the course passing grade")}