diff --git a/common/templates/course_modes/choose.html b/common/templates/course_modes/choose.html index c6810697aa..97499d8f87 100644 --- a/common/templates/course_modes/choose.html +++ b/common/templates/course_modes/choose.html @@ -91,7 +91,7 @@ from django.core.urlresolvers import reverse @@ -117,7 +117,7 @@ from django.core.urlresolvers import reverse diff --git a/lms/djangoapps/courseware/tests/test_about.py b/lms/djangoapps/courseware/tests/test_about.py index 5adba1a528..7678e70718 100644 --- a/lms/djangoapps/courseware/tests/test_about.py +++ b/lms/djangoapps/courseware/tests/test_about.py @@ -430,7 +430,7 @@ class AboutPurchaseCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase): url = reverse('about_course', args=[self.course.id.to_deprecated_string()]) resp = self.client.get(url) self.assertEqual(resp.status_code, 200) - self.assertIn("Add buyme to Cart ($10)", resp.content) + self.assertIn("Add buyme to Cart ($10 USD)", resp.content) def test_logged_in(self): """ @@ -440,7 +440,7 @@ class AboutPurchaseCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase): url = reverse('about_course', args=[self.course.id.to_deprecated_string()]) resp = self.client.get(url) self.assertEqual(resp.status_code, 200) - self.assertIn("Add buyme to Cart ($10)", resp.content) + self.assertIn("Add buyme to Cart ($10 USD)", resp.content) def test_already_in_cart(self): """ @@ -455,7 +455,7 @@ class AboutPurchaseCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase): resp = self.client.get(url) self.assertEqual(resp.status_code, 200) self.assertIn("This course is in your", resp.content) - self.assertNotIn("Add buyme to Cart ($10)", resp.content) + self.assertNotIn("Add buyme to Cart ($10 USD)", resp.content) def test_already_enrolled(self): """ @@ -474,7 +474,7 @@ class AboutPurchaseCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase): self.assertEqual(resp.status_code, 200) self.assertIn("You are registered for this course", resp.content) self.assertIn("View Courseware", resp.content) - self.assertNotIn("Add buyme to Cart ($10)", resp.content) + self.assertNotIn("Add buyme to Cart ($10 USD)", resp.content) def test_closed_enrollment(self): """ @@ -494,7 +494,7 @@ class AboutPurchaseCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase): resp = self.client.get(url) self.assertEqual(resp.status_code, 200) self.assertIn("Enrollment is Closed", resp.content) - self.assertNotIn("Add buyme to Cart ($10)", resp.content) + self.assertNotIn("Add buyme to Cart ($10 USD)", resp.content) # course price is visible ihe course_about page when the course # mode is set to honor and it's price is set @@ -531,7 +531,7 @@ class AboutPurchaseCourseTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase): url = reverse('about_course', args=[course.id.to_deprecated_string()]) resp = self.client.get(url) self.assertEqual(resp.status_code, 200) - self.assertIn("Add buyme to Cart ($10)", resp.content) + self.assertIn("Add buyme to Cart ($10 USD)", resp.content) # note that we can't call self.enroll here since that goes through # the Django student views, which doesn't allow for enrollments diff --git a/lms/djangoapps/courseware/tests/test_microsites.py b/lms/djangoapps/courseware/tests/test_microsites.py index fcf55f4809..739944897b 100644 --- a/lms/djangoapps/courseware/tests/test_microsites.py +++ b/lms/djangoapps/courseware/tests/test_microsites.py @@ -220,5 +220,7 @@ class TestMicrosites(ModuleStoreTestCase, LoginEnrollmentTestCase): resp = self.client.get(url, HTTP_HOST=settings.MICROSITE_TEST_HOSTNAME) self.assertEqual(resp.status_code, 200) self.assertNotIn("Register for {}".format(self.course_with_visibility.id.course), resp.content) - self.assertIn("Add {} to Cart ($10)".format(self.course_with_visibility.id.course), resp.content) + self.assertIn("Add {} to Cart ($10 USD)".format( + self.course_with_visibility.id.course + ), resp.content) self.assertIn('$("#add_to_cart_post").click', resp.content) diff --git a/lms/static/sass/multicourse/_course_about.scss b/lms/static/sass/multicourse/_course_about.scss index 4b836b9afc..d3c2f7d375 100644 --- a/lms/static/sass/multicourse/_course_about.scss +++ b/lms/static/sass/multicourse/_course_about.scss @@ -113,6 +113,9 @@ &:hover, &:focus { color: rgb(255,255,255); } + span { + display: inline-block; + } } a { diff --git a/lms/templates/courseware/course_about.html b/lms/templates/courseware/course_about.html index f7f3fc0143..86f094b45b 100644 --- a/lms/templates/courseware/course_about.html +++ b/lms/templates/courseware/course_about.html @@ -167,8 +167,9 @@ from edxmako.shortcuts import marketing_link reg_element_id = "reg_then_add_to_cart" %> - ${_("Add {course_name} to Cart ({price})")\ + ${_("Add {course_name} to Cart ({price} USD)")\ .format(course_name=course.display_number_with_default, price=course_price)} +
%else: diff --git a/lms/templates/verify_student/make_payment_step.underscore b/lms/templates/verify_student/make_payment_step.underscore index f4e29a2c5d..06094a2997 100644 --- a/lms/templates/verify_student/make_payment_step.underscore +++ b/lms/templates/verify_student/make_payment_step.underscore @@ -101,7 +101,7 @@