diff --git a/lms/static/sass/views/_shoppingcart.scss b/lms/static/sass/views/_shoppingcart.scss index 4dd566a0a3..5a9cb3e021 100644 --- a/lms/static/sass/views/_shoppingcart.scss +++ b/lms/static/sass/views/_shoppingcart.scss @@ -284,11 +284,6 @@ $light-border: 1px solid $gray-l5; .image { @include float(left); width: ($baseline*11); - - img { - width: 100%; - height: 100%; - } } .data-input { @@ -988,6 +983,13 @@ $light-border: 1px solid $gray-l5; } } +.course-image, .image { + .item-image { + width: 100%; + height: 100%; + } +} + .empty-cart { @include border-radius(3px); @include text-align(center); diff --git a/lms/templates/shoppingcart/receipt.html b/lms/templates/shoppingcart/receipt.html index cd251234e4..8fa0dad639 100644 --- a/lms/templates/shoppingcart/receipt.html +++ b/lms/templates/shoppingcart/receipt.html @@ -288,7 +288,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
- ${_("You've clicked a link for an enrollment code that has already been used." - " Check your {link_start}course dashboard{link_end} to see if you're enrolled in the course," - " or contact your company's administrator." - ).format( - link_start=u''.format(url=reverse('dashboard')), - link_end='' - )} + % if reg_code_already_redeemed: + ${_("You've clicked a link for an enrollment code that has already been used." + " Check your {link_start}course dashboard{link_end} to see if you're enrolled in the course," + " or contact your company's administrator." + ).format( + link_start=u''.format(url=reverse('dashboard')), + link_end='' + )} + % elif redemption_success: + ${_("You have successfully enrolled in {course_name}." + " This course has now been added to your dashboard.").format(course_name=course.display_name)} + % elif registered_for_course: + ${_("You're already enrolled for this course." + " Visit your {link_start}dashboard{link_end} to see the course." + ).format( + link_start=u''.format(url=reverse('dashboard')), + link_end='' + )} + % elif course_full: + ${_("The course you are enrolling for is full.")} + % elif enrollment_closed: + ${_("The course you are enrolling for is closed.")} + % elif redeem_code_error: + ${_("There was an error processing your redeem code.")} + % else: + ${_("You're about to activate an enrollment code for {course_name} by {site_name}. " + "This code can only be used one time, so you should only activate this code if you're its intended" + " recipient.").format(course_name=course.display_name, site_name=site_name)} + % endif
- % elif redemption_success: -- ${_("You have successfully enrolled in {course_name}." - " This course has now been added to your dashboard.").format(course_name=course.display_name)} -
- % elif registered_for_course: -- ${_("You're already enrolled for this course." - " Visit your {link_start}dashboard{link_end} to see the course." - ).format( - link_start=u''.format(url=reverse('dashboard')), - link_end='' - )} -
- % elif course_full: -- ${_("The course you are enrolling for is full.")} -
- % elif enrollment_closed: -- ${_("The course you are enrolling for is closed.")} -
- % elif redeem_code_error: -- ${_("There was an error processing your redeem code.")} -
- % else: -- ${_("You're about to activate an enrollment code for {course_name} by {site_name}. " - "This code can only be used one time, so you should only activate this code if you're its intended" - " recipient.").format(course_name=course.display_name, site_name=site_name)} -
- % endif- ${_( - "You've clicked a link for an enrollment code that has already " - "been used. Check your {link_start}course dashboard{link_end} " - "to see if you're enrolled in the course, or contact your " - "company's administrator." - ).format( - link_start=u''.format(url=reverse('dashboard')), - link_end='', - )} + % if reg_code_already_redeemed: + ${_( + "You've clicked a link for an enrollment code that has already " + "been used. Check your {link_start}course dashboard{link_end} " + "to see if you're enrolled in the course, or contact your " + "company's administrator." + ).format( + link_start=u''.format(url=reverse('dashboard')), + link_end='', + )} + % elif redemption_success: + ${_( + "You have successfully enrolled in {course_name}. " + "This course has now been added to your dashboard." + ).format( + course_name=course.display_name, + )} + % elif registered_for_course: + ${_( + "You're already enrolled for this course. " + "Visit your {link_start}dashboard{link_end} to see the course." + ).format( + link_start=u''.format(url=reverse('dashboard')), + link_end='', + )} + % elif redeem_code_error: + ${_( "There was an error processing your redeem code.")} + % else: + ${_( + "You're about to activate an enrollment code for {course_name} " + "by {site_name}. This code can only be used one time, so you " + "should only activate this code if you're its intended " + "recipient." + ).format( + course_name=course.display_name, + site_name=site_name, + )} + % endif
- % elif redemption_success: -- ${_( - "You have successfully enrolled in {course_name}. " - "This course has now been added to your dashboard." - ).format( - course_name=course.display_name, - )} -
- % elif registered_for_course: -- ${_( - "You're already enrolled for this course. " - "Visit your {link_start}dashboard{link_end} to see the course." - ).format( - link_start=u''.format(url=reverse('dashboard')), - link_end='', - )} -
- % elif redeem_code_error: -- ${_( "There was an error processing your redeem code.")} -
- % else: -- ${_( - "You're about to activate an enrollment code for {course_name} " - "by {site_name}. This code can only be used one time, so you " - "should only activate this code if you're its intended " - "recipient." - ).format( - course_name=course.display_name, - site_name=site_name, - )} -
- % endif