Skip to content

E
edx-platform
Commit f041ab1c by Chris Dodge
Options

fix rebase conflicts

parent e41554b2
Showing with 14 additions and 87 deletions
lms/templates/courseware/course_about.html
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<a href="${course_target}"> <a href="${course_target}">
%endif %endif
<span class="register disabled">${_("You are registered for this course {course.display_number_with_default}"). <span class="register disabled">${_("You are registered for this course {course.display_number_with_default}").format(course=course) | h}</span>
%if show_courseware_link: %if show_courseware_link:
<strong>${_("View Courseware")}</strong> <strong>${_("View Courseware")}</strong>
</a> </a>
......
lms/templates/courseware/courseware.html
...@@ -2,11 +2,7 @@ ...@@ -2,11 +2,7 @@
<%inherit file="/main.html" /> <%inherit file="/main.html" />
<%namespace name='static' file='/static_content.html'/> <%namespace name='static' file='/static_content.html'/>
<%block name="bodyclass">courseware ${course.css_class}</%block> <%block name="bodyclass">courseware ${course.css_class}</%block>
<<<<<<< HEAD <%block name="title"><title>${_("{course_number} Courseware").format(course_number=course.display_number_with_default) | h}</title></%block>
<%block name="title"><title>${_("{course_number} Courseware").format(course_number=course.display_number_with_default)}</title></%block>
=======
<%block name="title"><title>${course.display_number_with_default | h} Courseware</title></%block>
>>>>>>> add escaping
<%block name="headextra"> <%block name="headextra">
<%static:css group='course'/> <%static:css group='course'/>
......
lms/templates/courseware/info.html
...@@ -7,12 +7,7 @@ ...@@ -7,12 +7,7 @@
<%static:css group='course'/> <%static:css group='course'/>
</%block> </%block>
<<<<<<< HEAD <%block name="title"><title>${_("{course.number} Course Info").format(course=course.display_number_with_default) | h}</title></%block>
<%block name="title"><title>${_("{course.number} Course Info").format(course=course.display_number_with_default)}</title></%block>
=======
<%block name="title"><title>${course.display_number_with_default | h} Course Info</title></%block>
>>>>>>> add escaping
<%include file="/courseware/course_navigation.html" args="active_page='info'" /> <%include file="/courseware/course_navigation.html" args="active_page='info'" />
<%! <%!
from courseware.courses import get_course_info_section from courseware.courses import get_course_info_section
......
lms/templates/courseware/mktg_course_about.html
...@@ -8,11 +8,7 @@ ...@@ -8,11 +8,7 @@
<%inherit file="../mktg_iframe.html" /> <%inherit file="../mktg_iframe.html" />
<<<<<<< HEAD <%block name="title"><title>${_("About {course_number}").format(course_number=course.display_number_with_default) | h}</title></%block>
<%block name="title"><title>${_("About {course_number}").format(course_number=course.display_number_with_default)}</title></%block>
=======
<%block name="title"><title>About ${course.display_number_with_default | h}</title></%block>
>>>>>>> add escaping
<%block name="bodyclass">view-partial-mktgregister</%block> <%block name="bodyclass">view-partial-mktgregister</%block>
...@@ -56,11 +52,7 @@ ...@@ -56,11 +52,7 @@
<div class="action is-registered">${_("You Are Registered")}</div> <div class="action is-registered">${_("You Are Registered")}</div>
%endif %endif
%elif allow_registration: %elif allow_registration:
<<<<<<< HEAD <a class="action action-register register" href="#">${_("Register for")} <strong>${course.display_number_with_default | h}</strong></a>
<a class="action action-register register" href="#">${_("Register for")} <strong>${course.display_number_with_default}</strong></a>
=======
<a class="action action-register register" href="#">Register for <strong>${course.display_number_with_default | h}</strong></a>
>>>>>>> add escaping
%else: %else:
<div class="action registration-closed is-disabled">${_("Registration Is Closed")}</div> <div class="action registration-closed is-disabled">${_("Registration Is Closed")}</div>
%endif %endif
......
lms/templates/courseware/progress.html
...@@ -8,11 +8,7 @@ ...@@ -8,11 +8,7 @@
<%namespace name="progress_graph" file="/courseware/progress_graph.js"/> <%namespace name="progress_graph" file="/courseware/progress_graph.js"/>
<<<<<<< HEAD <%block name="title"><title>${_("{course_number} Progress").format(course_number=course.display_number_with_default) | h}</title></%block>
<%block name="title"><title>${_("{course_number} Progress").format(course_number=course.display_number_with_default)}</title></%block>
=======
<%block name="title"><title>${course.display_number_with_default | h} Progress</title></%block>
>>>>>>> add escaping
<%! <%!
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
......
lms/templates/courseware/syllabus.html
...@@ -6,11 +6,7 @@ ...@@ -6,11 +6,7 @@
<%static:css group='course'/> <%static:css group='course'/>
</%block> </%block>
<<<<<<< HEAD <%block name="title"><title>${_("{course.display_number_with_default} Course Info").format(course=course) | h}</title></%block>
<%block name="title"><title>${_("{course.display_number_with_default} Course Info").format(course=course)}</title></%block>
=======
<%block name="title"><title>${course.display_number_with_default | h} Course Info</title></%block>
>>>>>>> add escaping
<%include file="/courseware/course_navigation.html" args="active_page='syllabus'" /> <%include file="/courseware/course_navigation.html" args="active_page='syllabus'" />
<%! <%!
......
lms/templates/dashboard.html
...@@ -140,27 +140,11 @@ ...@@ -140,27 +140,11 @@
% if course.id in show_courseware_links_for: % if course.id in show_courseware_links_for:
<a href="${course_target}" class="cover"> <a href="${course_target}" class="cover">
<<<<<<< HEAD <img src="${course_image_url(course)}" alt="${_('{course_number} {course_name} Cover Image').format(course_number='${course.number}', course_name='${course.display_name_with_default}') |h}" />
<<<<<<< HEAD
<img src="${course_image_url(course)}" alt="${_('{course_number} {course_name} Cover Image').format(course_number='${course.number}', course_name='${course.display_name_with_default}')}" />
</a> </a>
% else: % else:
<div class="cover"> <div class="cover">
<img src="${course_image_url(course)}" alt="${_('{course_number} {course_name} Cover Image').format(course_number='${course.number}', course_name='${course.display_name_with_default}')}" /> <img src="${course_image_url(course)}" alt="${_('{course_number} {course_name} Cover Image').format(course_number='${course.number}', course_name='${course.display_name_with_default}')}" />
=======
<img src="${course_image_url(course)}" alt="${course.display_number_with_default} ${course.display_name_with_default} Cover Image" />
</a>
% else:
<div class="cover">
<img src="${course_image_url(course)}" alt="${course.display_number_with_default} ${course.display_name_with_default} Cover Image" />
>>>>>>> add display_coursenumber and display_organization fields on the CourseModule, with some property accessors. Update LMS/CMS pages to use those display strings as appropraite.
=======
<img src="${course_image_url(course)}" alt="${course.display_number_with_default | h} ${course.display_name_with_default} Cover Image" />
</a>
% else:
<div class="cover">
<img src="${course_image_url(course)}" alt="${course.display_number_with_default | h} ${course.display_name_with_default} Cover Image" />
>>>>>>> add escaping
</div> </div>
% endif % endif
...@@ -213,23 +197,15 @@ ...@@ -213,23 +197,15 @@
% endif % endif
% if registration.is_rejected: % if registration.is_rejected:
<div class="message message-status is-shown exam-schedule"> <div class="message message-status is-shown exam-schedule">
<<<<<<< HEAD
<<<<<<< HEAD
<p class="message-copy"> <p class="message-copy">
<strong>${_("Your registration for the Pearson exam has been rejected. Please {link_start}see your registration status details{link_end}.").format( <strong>${_("Your registration for the Pearson exam has been rejected. Please {link_start}see your registration status details{link_end}.").format(
link_start='<a href="{url}" id="exam_register_link">'.format(url=testcenter_register_target), link_start='<a href="{url}" id="exam_register_link">'.format(url=testcenter_register_target),
link_end='</a>')}</strong> link_end='</a>')}</strong>
${_("Otherwise {link_start}contact edX at {email}{link_end} for further help.").format( ${_("Otherwise {link_start}contact edX at {email}{link_end} for further help.").format(
link_start='<a class="contact-link" href="mailto:{email}?subject=Pearson VUE Exam - {about} {number}">'.format(email="exam-help@edx.org", about=get_course_about_section(course, 'university'), number=course.number), link_start='<a class="contact-link" href="mailto:{email}?subject=Pearson VUE Exam - {about} {number}">'.format(email="exam-help@edx.org", about=get_course_about_section(course, 'university'), number=course.display_number_with_default),
link_end='</a>', link_end='</a>',
email="exam-help@edx.org", email="exam-help@edx.org",
)} )}
=======
<p class="message-copy"><strong>Your registration for the Pearson exam has been rejected. Please <a href="${testcenter_register_target}" id="exam_register_link">see your registration status details</a></strong>. Otherwise <a class="contact-link" href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.display_number_with_default}">contact edX at exam-help@edx.org</a> for further help.</p>
>>>>>>> add display_coursenumber and display_organization fields on the CourseModule, with some property accessors. Update LMS/CMS pages to use those display strings as appropraite.
=======
<p class="message-copy"><strong>Your registration for the Pearson exam has been rejected. Please <a href="${testcenter_register_target}" id="exam_register_link">see your registration status details</a></strong>. Otherwise <a class="contact-link" href="mailto:exam-help@edx.org?subject=Pearson VUE Exam - ${get_course_about_section(course, 'university')} ${course.display_number_with_default | h}">contact edX at exam-help@edx.org</a> for further help.</p>
>>>>>>> add escaping
</div> </div>
% endif % endif
% if not registration.is_accepted and not registration.is_rejected: % if not registration.is_accepted and not registration.is_rejected:
......
lms/templates/open_ended_problems/combined_notifications.html
...@@ -7,11 +7,7 @@ ...@@ -7,11 +7,7 @@
<%static:css group='course'/> <%static:css group='course'/>
</%block> </%block>
<<<<<<< HEAD <%block name="title"><title>${_("{course_number} Combined Notifications").format(course_number=course.display_number_with_default) | h}</title></%block>
<%block name="title"><title>${_("{course_number} Combined Notifications").format(course_number=course.display_number_with_default)}</title></%block>
=======
<%block name="title"><title>${course.display_number_with_default | h} Combined Notifications</title></%block>
>>>>>>> add escaping
<%include file="/courseware/course_navigation.html" args="active_page='open_ended'" /> <%include file="/courseware/course_navigation.html" args="active_page='open_ended'" />
......
lms/templates/open_ended_problems/open_ended_problems.html
...@@ -7,11 +7,7 @@ ...@@ -7,11 +7,7 @@
<%static:css group='course'/> <%static:css group='course'/>
</%block> </%block>
<<<<<<< HEAD <%block name="title"><title>${_("{course_number} Open Ended Problems").format(course_number=course.display_number_with_default) | h}</title></%block>
<%block name="title"><title>${_("{course_number} Open Ended Problems").format(course_number=course.display_number_with_default)}</title></%block>
=======
<%block name="title"><title>${course.display_number_with_default | h} Open Ended Problems</title></%block>
>>>>>>> add escaping
<%include file="/courseware/course_navigation.html" args="active_page='open_ended_problems'" /> <%include file="/courseware/course_navigation.html" args="active_page='open_ended_problems'" />
......
lms/templates/static_htmlbook.html
...@@ -2,12 +2,7 @@ ...@@ -2,12 +2,7 @@
<%inherit file="main.html" /> <%inherit file="main.html" />
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
<<<<<<< HEAD <%block name="title"><title>${_('{course_number} Textbook').format(course_number=course.display_number_with_default) | h}</title>
<%block name="title"><title>${_('{course_number} Textbook').format(course_number=course.display_number_with_default)}</title>
=======
<%block name="title"><title>${course.display_number_with_default | h} Textbook</title>
>>>>>>> add escaping
</%block> </%block>
<%block name="headextra"> <%block name="headextra">
......
lms/templates/static_pdfbook.html
...@@ -3,16 +3,9 @@ ...@@ -3,16 +3,9 @@
<%inherit file="main.html" /> <%inherit file="main.html" />
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
<%block name="title"> <%block name="title">
<<<<<<< HEAD
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<title>${_('{course_number} Textbook').format(course_number=course.display_number_with_default)}</title> <title>${_('{course_number} Textbook').format(course_number=course.display_number_with_default) | h}</title>
=======
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<title>${course.display_number_with_default | h} Textbook</title>
>>>>>>> add escaping
</%block> </%block>
<%block name="headextra"> <%block name="headextra">
......
lms/templates/staticbook.html
...@@ -2,11 +2,7 @@ ...@@ -2,11 +2,7 @@
<%inherit file="main.html" /> <%inherit file="main.html" />
<%namespace name='static' file='static_content.html'/> <%namespace name='static' file='static_content.html'/>
<<<<<<< HEAD <%block name="title"><title>${_("{course_number} Textbook").format(course_number=course.display_number_with_default) | h}</title></%block>
<%block name="title"><title>${_("{course_number} Textbook").format(course_number=course.display_number_with_default)}</title></%block>
=======
<%block name="title"><title>${course.display_number_with_default | h} Textbook</title></%block>
>>>>>>> add escaping
<%block name="headextra"> <%block name="headextra">
<%static:css group='course'/> <%static:css group='course'/>
......
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