diff --git a/lms/static/sass/views/_shoppingcart.scss b/lms/static/sass/views/_shoppingcart.scss index 12e9ef5365..4e86d9b9d0 100644 --- a/lms/static/sass/views/_shoppingcart.scss +++ b/lms/static/sass/views/_shoppingcart.scss @@ -225,7 +225,7 @@ $light-border: 1px solid $gray-l5; color: $dark-gray1; } - ul.steps { + ol.steps { @extend %ui-no-list; border-top: $steps-border; border-bottom: $steps-border; @@ -262,9 +262,15 @@ $light-border: 1px solid $gray-l5; } &:after { - @include right(-$baseline*2); - @include ltr {content: "\f178";} - @include rtl {content: "\f177";} + @include ltr { + right: -($baseline*2); + content: "\f178"; + } + + @include rtl { + left: -($baseline*2); + content: "\f177"; + } position: absolute; top: ($baseline*1.3); color: $light-gray; @@ -303,6 +309,34 @@ $light-border: 1px solid $gray-l5; color: $light-gray2; } + .course-registration-title, + .course-dates-title { + @extend %t-title6; + display: block; + padding: 0; + text-transform: uppercase; + color: $light-gray2; + } + + .course-display-name, + .course-display-dates { + @extend %t-title4; + display: block; + color: $dark-gray2; + } + + .course-title-info { + display: inline-block; + width: 60%; + } + + .course-meta-info { + @include float(right); + @include text-align(right); + display: inline-block; + width: 35%; + } + h1 { @include float(left); @extend %t-title4; @@ -1036,7 +1070,7 @@ $light-border: 1px solid $gray-l5; content: none !important; } - ul.steps, a.blue.pull-right, .bordered-bar span.pull-right, .left.nav-global.authenticated { + ol.steps, a.blue.pull-right, .bordered-bar span.pull-right, .left.nav-global.authenticated { display: none; } diff --git a/lms/templates/shoppingcart/cybersource_form.html b/lms/templates/shoppingcart/cybersource_form.html index fec4231628..7a176b5a2a 100644 --- a/lms/templates/shoppingcart/cybersource_form.html +++ b/lms/templates/shoppingcart/cybersource_form.html @@ -1,7 +1,7 @@ <%! from django.utils.translation import ugettext as _ %>
% for pk, pv in params.iteritems(): - + % endfor diff --git a/lms/templates/shoppingcart/shopping_cart.html b/lms/templates/shoppingcart/shopping_cart.html index 26d3570a93..478ea89cf0 100644 --- a/lms/templates/shoppingcart/shopping_cart.html +++ b/lms/templates/shoppingcart/shopping_cart.html @@ -73,10 +73,14 @@ from django.utils.translation import ungettext
## Translators: "Registration for:" is followed by a course name -

${_('Registration for:')} - ${_('Course Dates:')} +

+ ${_('Registration for:')} + ${ course.display_name }

-

${ course.display_name }

${course.start_datetime_text()} - ${course.end_datetime_text()} +

+ ${_('Course Dates:')} + ${ course.start_datetime_text() } - ${ course.end_datetime_text() } +


@@ -100,19 +104,29 @@ from django.utils.translation import ungettext % endif
-
- +
+
- +
- + + - +
- +
@@ -124,10 +138,11 @@ from django.utils.translation import ungettext
% if not discount_applied: -
+
+ - +
% else:
@@ -149,31 +164,37 @@ from django.utils.translation import ungettext
% if order_type == 'business':
- -

- ${_('After this purchase is complete, a receipt is generated with relative billing details and registration codes for students.')} -

+ +

+ ${_('After this purchase is complete, a receipt is generated with relative billing details and registration codes for students.')} +