Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix more rebase conflicts

Browse Source
This commit is contained in:
Chris Dodge
2013-08-02 11:25:05 -04:00
parent f041ab1ccc
commit c20ca2bf5e
3 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/templates/discussion/single_thread.html
View File

@@ -7,11 +7,7 @@
<%inherit file="../main.html" />
<%namespace name='static' file='../static_content.html'/>
<%block name="bodyclass">discussion</%block>
<<<<<<< HEAD
<%block name="title"><title>${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h}</title></%block>
=======
<%block name="title"><title>Discussion – ${course.display_number_with_default | h}</title></%block>
>>>>>>> add escaping
<%block name="headextra">
<%static:css group='course'/>

6
lms/templates/instructor/staff_grading.html
View File

@@ -7,11 +7,7 @@
<%static:css group='course'/>
</%block>
<<<<<<< HEAD
<%block name="title"><title>${_("{course_number} Staff Grading").format(course_number=course.display_number_with_default)}</title></%block>
=======
<%block name="title"><title>${course.display_number_with_default | h} Staff Grading</title></%block>
>>>>>>> add escaping
<%block name="title"><title>${_("{course_number} Staff Grading").format(course_number=course.display_number_with_default) | h}</title></%block>
<%include file="/courseware/course_navigation.html" args="active_page='staff_grading'" />

6
lms/templates/open_ended_problems/open_ended_flagged_problems.html
View File

@@ -7,11 +7,7 @@
<%static:css group='course'/>
</%block>
<<<<<<< HEAD
<%block name="title"><title>${_("{course_number} Flagged Open Ended Problems").format(course_number=course.display_number_with_default)}</title></%block>
=======
<%block name="title"><title>${course.display_number_with_default | h} Flagged Open Ended Problems</title></%block>
>>>>>>> add escaping
<%block name="title"><title>${_("{course_number} Flagged Open Ended Problems").format(course_number=course.display_number_with_default) | h}</title></%block>
<%include file="/courseware/course_navigation.html" args="active_page='open_ended_flagged_problems'" />