Commit 3fe8768d by marjev Committed by Marko Jevtic

(SOL-883) RTL support for Registration Code redemption page

parent 62797a3f
...@@ -284,11 +284,6 @@ $light-border: 1px solid $gray-l5; ...@@ -284,11 +284,6 @@ $light-border: 1px solid $gray-l5;
.image { .image {
@include float(left); @include float(left);
width: ($baseline*11); width: ($baseline*11);
img {
width: 100%;
height: 100%;
}
} }
.data-input { .data-input {
...@@ -988,6 +983,13 @@ $light-border: 1px solid $gray-l5; ...@@ -988,6 +983,13 @@ $light-border: 1px solid $gray-l5;
} }
} }
.course-image, .image {
.item-image {
width: 100%;
height: 100%;
}
}
.empty-cart { .empty-cart {
@include border-radius(3px); @include border-radius(3px);
@include text-align(center); @include text-align(center);
......
...@@ -288,7 +288,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c ...@@ -288,7 +288,7 @@ from courseware.courses import course_image_url, get_course_about_section, get_c
<div class="user-data"> <div class="user-data">
<div class="clearfix"> <div class="clearfix">
<div class="image"> <div class="image">
<img style="width: 100%; height: 100%;" src="${course_image_url(course)}" <img class="item-image" src="${course_image_url(course)}"
alt="${course.display_number_with_default | h} ${get_course_about_section(course, 'title')} Image"/> alt="${course.display_number_with_default | h} ${get_course_about_section(course, 'title')} Image"/>
</div> </div>
<div class="data-input"> <div class="data-input">
......
...@@ -17,8 +17,11 @@ from courseware.courses import course_image_url, get_course_about_section ...@@ -17,8 +17,11 @@ from courseware.courses import course_image_url, get_course_about_section
</header> </header>
<section> <section>
<div class="course-image"> <div class="course-image">
<img style="width: 100%; height: auto;" src="${course_image_url(course)}" <img class="item-image" src="${course_image_url(course)}"
alt="${course.display_number_with_default | h} ${get_course_about_section(course, 'title')} Cover Image"/> alt="${_("{course_number} {course_title} Cover Image").format(
course_number=course.display_number_with_default,
course_title=get_course_about_section(course, 'title'),
)}"/>
</div> </div>
<div class="enrollment-details"> <div class="enrollment-details">
<div class="sub-title"> <div class="sub-title">
...@@ -26,21 +29,23 @@ from courseware.courses import course_image_url, get_course_about_section ...@@ -26,21 +29,23 @@ from courseware.courses import course_image_url, get_course_about_section
span_start='<span class="course-date-label">', span_start='<span class="course-date-label">',
span_end='</span>' span_end='</span>'
)} )}
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="course-title"> <div class="course-title">
<h1> <h1>
${_("{course_name}").format(course_name=course.display_name)} ${_("{course_name}").format(course_name=course.display_name)}
<span class="course-dates">${_("{start_date}").format(start_date=course.start_datetime_text())} - ${_("{end_date}").format(end_date=course.end_datetime_text())} <span class="course-dates">
${_("{start_date} - {end_date}").format(
start_date=course.start_datetime_text(),
end_date=course.end_datetime_text()
)}
</span> </span>
</h1> </h1>
</div> </div>
<hr> <hr>
<div> <div>
% if reg_code_already_redeemed:
<p class="enrollment-text"> <p class="enrollment-text">
% if reg_code_already_redeemed:
${_("You've clicked a link for an enrollment code that has already been used." ${_("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," " Check your {link_start}course dashboard{link_end} to see if you're enrolled in the course,"
" or contact your company's administrator." " or contact your company's administrator."
...@@ -48,51 +53,39 @@ from courseware.courses import course_image_url, get_course_about_section ...@@ -48,51 +53,39 @@ from courseware.courses import course_image_url, get_course_about_section
link_start=u'<a href="{url}">'.format(url=reverse('dashboard')), link_start=u'<a href="{url}">'.format(url=reverse('dashboard')),
link_end='</a>' link_end='</a>'
)} )}
</p>
% elif redemption_success: % elif redemption_success:
<p class="enrollment-text">
${_("You have successfully enrolled in {course_name}." ${_("You have successfully enrolled in {course_name}."
" This course has now been added to your dashboard.").format(course_name=course.display_name)} " This course has now been added to your dashboard.").format(course_name=course.display_name)}
</p>
% elif registered_for_course: % elif registered_for_course:
<p class="enrollment-text">
${_("You're already enrolled for this course." ${_("You're already enrolled for this course."
" Visit your {link_start}dashboard{link_end} to see the course." " Visit your {link_start}dashboard{link_end} to see the course."
).format( ).format(
link_start=u'<a href="{url}">'.format(url=reverse('dashboard')), link_start=u'<a href="{url}">'.format(url=reverse('dashboard')),
link_end='</a>' link_end='</a>'
)} )}
</p>
% elif course_full: % elif course_full:
<p class="enrollment-text">
${_("The course you are enrolling for is full.")} ${_("The course you are enrolling for is full.")}
</p>
% elif enrollment_closed: % elif enrollment_closed:
<p class="enrollment-text">
${_("The course you are enrolling for is closed.")} ${_("The course you are enrolling for is closed.")}
</p>
% elif redeem_code_error: % elif redeem_code_error:
<p class="enrollment-text">
${_("There was an error processing your redeem code.")} ${_("There was an error processing your redeem code.")}
</p>
% else: % else:
<p class="enrollment-text">
${_("You're about to activate an enrollment code for {course_name} by {site_name}. " ${_("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" "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)} " recipient.").format(course_name=course.display_name, site_name=site_name)}
</p>
% endif % endif
</p>
</div> </div>
</div> </div>
% if not reg_code_already_redeemed: % if not reg_code_already_redeemed:
%if redemption_success: %if redemption_success:
<% course_url = reverse('info', args=[course.id.to_deprecated_string()]) %> <% course_url = reverse('info', args=[course.id.to_deprecated_string()]) %>
<a href="${course_url}" class="link-button course-link-bg-color">${_("View Course")} <i class="icon fa fa-caret-right"></i></a> <a href="${course_url}" class="link-button course-link-bg-color">${_("View Course")} <i class="icon fa fa-caret-right" aria-hidden="true"></i></a>
%elif not registered_for_course: %elif not registered_for_course:
<form method="post"> <form method="post">
<input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }"> <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }">
<button type="submit" id="id_active_course_enrollment" <button type="submit" id="id_active_course_enrollment"
name="active_course_enrollment">${_("Activate Course Enrollment")} <i class="icon fa fa-caret-right"></i></button> name="active_course_enrollment">${_("Activate Course Enrollment")} <i class="icon fa fa-caret-right" aria-hidden="true"></i></button>
</form> </form>
%endif %endif
%endif %endif
......
...@@ -17,7 +17,7 @@ from courseware.courses import course_image_url, get_course_about_section ...@@ -17,7 +17,7 @@ from courseware.courses import course_image_url, get_course_about_section
</header> </header>
<section> <section>
<div class="course-image"> <div class="course-image">
<img style="width: 100%; height: auto;" src="${course_image_url(course)}" <img class="item-image" src="${course_image_url(course)}"
alt="${_("{course_number} {course_title} Cover Image").format( alt="${_("{course_number} {course_title} Cover Image").format(
course_number=course.display_number_with_default, course_number=course.display_number_with_default,
course_title=get_course_about_section(course, 'title'), course_title=get_course_about_section(course, 'title'),
...@@ -29,10 +29,8 @@ from courseware.courses import course_image_url, get_course_about_section ...@@ -29,10 +29,8 @@ from courseware.courses import course_image_url, get_course_about_section
span_start='<span class="course-date-label">', span_start='<span class="course-date-label">',
span_end='</span>' span_end='</span>'
)} )}
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<div class="course-title"> <div class="course-title">
<h1> <h1>
${course.display_name} ${course.display_name}
...@@ -45,8 +43,8 @@ from courseware.courses import course_image_url, get_course_about_section ...@@ -45,8 +43,8 @@ from courseware.courses import course_image_url, get_course_about_section
</div> </div>
<hr> <hr>
<div> <div>
% if reg_code_already_redeemed:
<p class="enrollment-text"> <p class="enrollment-text">
% if reg_code_already_redeemed:
${_( ${_(
"You've clicked a link for an enrollment code that has already " "You've clicked a link for an enrollment code that has already "
"been used. Check your {link_start}course dashboard{link_end} " "been used. Check your {link_start}course dashboard{link_end} "
...@@ -56,18 +54,14 @@ from courseware.courses import course_image_url, get_course_about_section ...@@ -56,18 +54,14 @@ from courseware.courses import course_image_url, get_course_about_section
link_start=u'<a href="{url}">'.format(url=reverse('dashboard')), link_start=u'<a href="{url}">'.format(url=reverse('dashboard')),
link_end='</a>', link_end='</a>',
)} )}
</p>
% elif redemption_success: % elif redemption_success:
<p class="enrollment-text">
${_( ${_(
"You have successfully enrolled in {course_name}. " "You have successfully enrolled in {course_name}. "
"This course has now been added to your dashboard." "This course has now been added to your dashboard."
).format( ).format(
course_name=course.display_name, course_name=course.display_name,
)} )}
</p>
% elif registered_for_course: % elif registered_for_course:
<p class="enrollment-text">
${_( ${_(
"You're already enrolled for this course. " "You're already enrolled for this course. "
"Visit your {link_start}dashboard{link_end} to see the course." "Visit your {link_start}dashboard{link_end} to see the course."
...@@ -75,13 +69,9 @@ from courseware.courses import course_image_url, get_course_about_section ...@@ -75,13 +69,9 @@ from courseware.courses import course_image_url, get_course_about_section
link_start=u'<a href="{url}">'.format(url=reverse('dashboard')), link_start=u'<a href="{url}">'.format(url=reverse('dashboard')),
link_end='</a>', link_end='</a>',
)} )}
</p>
% elif redeem_code_error: % elif redeem_code_error:
<p class="enrollment-text">
${_( "There was an error processing your redeem code.")} ${_( "There was an error processing your redeem code.")}
</p>
% else: % else:
<p class="enrollment-text">
${_( ${_(
"You're about to activate an enrollment code for {course_name} " "You're about to activate an enrollment code for {course_name} "
"by {site_name}. This code can only be used one time, so you " "by {site_name}. This code can only be used one time, so you "
...@@ -91,19 +81,19 @@ from courseware.courses import course_image_url, get_course_about_section ...@@ -91,19 +81,19 @@ from courseware.courses import course_image_url, get_course_about_section
course_name=course.display_name, course_name=course.display_name,
site_name=site_name, site_name=site_name,
)} )}
</p>
% endif % endif
</p>
</div> </div>
</div> </div>
% if not reg_code_already_redeemed: % if not reg_code_already_redeemed:
%if redemption_success: %if redemption_success:
<a href="${reverse('dashboard')}" class="link-button course-link-bg-color">${_("View Dashboard")} <i class="icon fa fa-caret-right"></i></a> <a href="${reverse('dashboard')}" class="link-button course-link-bg-color">${_("View Dashboard")} <i class="icon fa fa-caret-right" aria-hidden="true"></i></a>
%elif not registered_for_course: %elif not registered_for_course:
<form method="post"> <form method="post">
<input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }"> <input type="hidden" name="csrfmiddlewaretoken" value="${ csrf_token }" aria-hidden="true">
<button type="submit" <button type="submit"
id="id_active_course_enrollment" id="id_active_course_enrollment"
name="active_course_enrollment">${_("Activate Course Enrollment")} <i class="icon fa fa-caret-right"></i></button> name="active_course_enrollment">${_("Activate Course Enrollment")} <i class="icon fa fa-caret-right" aria-hidden="true"></i></button>
</form> </form>
%endif %endif
%endif %endif
......
...@@ -66,10 +66,8 @@ from django.utils.translation import ungettext ...@@ -66,10 +66,8 @@ from django.utils.translation import ungettext
<div class="user-data"> <div class="user-data">
<div class="clearfix"> <div class="clearfix">
<div class="image"> <div class="image">
<img class="item-image" src="${course_image_url(course)}"
<img src="${course_image_url(course)}"
alt="${course.display_number_with_default | h} ${get_course_about_section(course, 'title')} ${_('Cover Image')}" /> alt="${course.display_number_with_default | h} ${get_course_about_section(course, 'title')} ${_('Cover Image')}" />
</div> </div>
<div class="data-input"> <div class="data-input">
## Translators: "Registration for:" is followed by a course name ## Translators: "Registration for:" is followed by a course name
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment