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

resolve merge conflicts

Browse Source
This commit is contained in:
Chris Dodge
2013-08-02 09:41:02 -04:00
parent 042b7d5f60
commit 93df9c4c30
25 changed files with 85 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/templates/widgets/header.html
View File

@@ -13,7 +13,7 @@
<h2 class="info-course">
<span class="sr">${_("Current Course:")}</span>
<a class="course-link" href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">
<span class="course-org">${ctx_loc.org}</span><span class="course-number">${ctx_loc.course}</span>
<span class="course-org">${context_course.display_org_with_default}</span><span class="course-number">${context_course.display_number_with_default}</span>
<span class="course-title" title="${context_course.display_name_with_default}">${context_course.display_name_with_default}</span>
</a>
</h2>

25
common/lib/xmodule/xmodule/course_module.py
View File

@@ -362,6 +362,11 @@ class CourseFields(object):
# Explicit comparison to True because we always want to return a bool.
hide_progress_tab = Boolean(help="DO NOT USE THIS", scope=Scope.settings)
display_organization = String(help="An optional display string for the course organization that will get rendered in the LMS",
scope=Scope.settings)
display_coursenumber = String(help="An optional display string for the course number that will get rendered in the LMS",
scope=Scope.settings)
class CourseDescriptor(CourseFields, SequenceDescriptor):
module_class = SequenceModule
@@ -933,6 +938,26 @@ class CourseDescriptor(CourseFields, SequenceDescriptor):
def number(self):
return self.location.course
@property
def display_number_with_default(self):
"""
Return a display course number if it has been specified, otherwise return the 'course' that is in the location
"""
if self.display_coursenumber:
return self.display_coursenumber
return self.location.course
@property
def org(self):
return self.location.org
@property
def display_org_with_default(self):
"""
Return a display organization if it has been specified, otherwise return the 'org' that is in the location
"""
if self.display_organization:
return self.display_organization
return self.location.org

2
lms/djangoapps/course_wiki/views.py
View File

@@ -95,7 +95,7 @@ def course_wiki_redirect(request, course_id):
root,
course_slug,
title=course_slug,
content="This is the wiki for **{0}**'s _{1}_.".format(course.org, course.display_name_with_default),
content="This is the wiki for **{0}**'s _{1}_.".format(course.display_org_with_default, course.display_name_with_default),
user_message="Course page automatically created.",
user=None,
ip_address=None,

4
lms/djangoapps/courseware/courses.py
View File

@@ -174,9 +174,9 @@ def get_course_about_section(course, section_key):
elif section_key == "title":
return course.display_name_with_default
elif section_key == "university":
return course.location.org
return course.display_org_with_default
elif section_key == "number":
return course.number
return course.display_number_with_default
raise KeyError("Invalid about key " + str(section_key))

4
lms/templates/course.html
View File

@@ -14,13 +14,13 @@ from courseware.courses import course_image_url, get_course_about_section
<div class="inner-wrapper">
<header class="course-preview">
<hgroup>
<h2><span class="course-number">${course.number}</span> ${get_course_about_section(course, 'title')}</h2>
<h2><span class="course-number">${course.display_number_with_default}</span> ${get_course_about_section(course, 'title')}</h2>
</hgroup>
<div class="info-link">&#x2794;</div>
</header>
<section class="info">
<div class="cover-image">
<img src="${course_image_url(course)}" alt="${course.number} ${get_course_about_section(course, 'title')} Cover Image" />
<img src="${course_image_url(course)}" alt="${course.display_number_with_default} ${get_course_about_section(course, 'title')} Cover Image" />
</div>
<div class="desc">
<p>${get_course_about_section(course, 'short_description')}</p>

19
lms/templates/courseware/course_about.html
View File

@@ -66,7 +66,11 @@
<script src="${static.url('js/course_info.js')}"></script>
</%block>
<<<<<<< HEAD
<%block name="title"><title>${_("About {course.number}").format(course=course)}</title></%block>
=======
<%block name="title"><title>About ${course.display_number_with_default}</title></%block>
>>>>>>> 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.
<section class="course-info">
<header class="course-profile">
@@ -75,7 +79,7 @@
<section class="intro">
<hgroup>
<h1>
${course.number}: ${get_course_about_section(course, "title")}
${course.display_number_with_default}: ${get_course_about_section(course, "title")}
% if not self.theme_enabled():
<a href="#">${get_course_about_section(course, "university")}</a>
% endif
@@ -87,13 +91,21 @@
%if show_courseware_link:
<a href="${course_target}">
%endif
<<<<<<< HEAD
<span class="register disabled">${_("You are registered for this course {course.number}").format(course=course)}</span>
=======
<span class="register disabled">You are registered for this course (${course.display_number_with_default})</span>
>>>>>>> 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.
%if show_courseware_link:
<strong>${_("View Courseware")}</strong>
</a>
%endif
%else:
<<<<<<< HEAD
<a href="#" class="register">${_("Register for {course.number}").format(course=course)}</a>
=======
<a href="#" class="register">Register for ${course.display_number_with_default}</a>
>>>>>>> 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.
<div id="register_error"></div>
%endif
</div>
@@ -162,8 +174,13 @@
</header>
<ol class="important-dates">
<<<<<<< HEAD
<li><div class="icon course-number"></div><p>${_("Course Number")}</p><span class="course-number">${course.number}</span></li>
<li><div class="icon start"></div><p>${_("Classes Start")}</p><span class="start-date">${course.start_date_text}</span></li>
=======
<li><div class="icon course-number"></div><p>Course Number</p><span class="course-number">${course.display_number_with_default}</span></li>
<li><div class="icon start"></div><p>Classes Start</p><span class="start-date">${course.start_date_text}</span></li>
>>>>>>> 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.
## We plan to ditch end_date (which is not stored in course metadata),
## but for backwards compatibility, show about/end_date blob if it exists.

2
lms/templates/courseware/courseware.html
View File

@@ -2,7 +2,7 @@
<%inherit file="/main.html" />
<%namespace name='static' file='/static_content.html'/>
<%block name="bodyclass">courseware ${course.css_class}</%block>
<%block name="title"><title>${_("{course_number} Courseware").format(course_number=course.number)}</title></%block>
<%block name="title"><title>${_("{course_number} Courseware").format(course_number=course.display_number_with_default)}</title></%block>
<%block name="headextra">
<%static:css group='course'/>

2
lms/templates/courseware/info.html
View File

@@ -7,7 +7,7 @@
<%static:css group='course'/>
</%block>
<%block name="title"><title>${_("{course.number} Course Info").format(course=course)}</title></%block>
<%block name="title"><title>${_("{course.number} Course Info").format(course=course.display_number_with_default)}</title></%block>
<%include file="/courseware/course_navigation.html" args="active_page='info'" />
<%!

4
lms/templates/courseware/mktg_course_about.html
View File

@@ -8,7 +8,7 @@
<%inherit file="../mktg_iframe.html" />
<%block name="title"><title>${_("About {course_number}").format(course_number=course.number)}</title></%block>
<%block name="title"><title>${_("About {course_number}").format(course_number=course.display_number_with_default)}</title></%block>
<%block name="bodyclass">view-partial-mktgregister</%block>
@@ -52,7 +52,7 @@
<div class="action is-registered">${_("You Are Registered")}</div>
%endif
%elif allow_registration:
<a class="action action-register register" href="#">${_("Register for")} <strong>${course.number}</strong></a>
<a class="action action-register register" href="#">${_("Register for")} <strong>${course.display_number_with_default}</strong></a>
%else:
<div class="action registration-closed is-disabled">${_("Registration Is Closed")}</div>
%endif

2
lms/templates/courseware/progress.html
View File

@@ -8,7 +8,7 @@
<%namespace name="progress_graph" file="/courseware/progress_graph.js"/>
<%block name="title"><title>${_("{course_number} Progress").format(course_number=course.number)}</title></%block>
<%block name="title"><title>${_("{course_number} Progress").format(course_number=course.display_number_with_default)}</title></%block>
<%!
from django.core.urlresolvers import reverse

2
lms/templates/courseware/static_tab.html
View File

@@ -6,7 +6,7 @@
<%static:css group='course'/>
</%block>
<%block name="title"><title>${course.number} ${tab['name']}</title></%block>
<%block name="title"><title>${course.display_number_with_default} ${tab['name']}</title></%block>
<%include file="/courseware/course_navigation.html" args="active_page='static_tab_{0}'.format(tab['url_slug'])" />

2
lms/templates/courseware/syllabus.html
View File

@@ -6,7 +6,7 @@
<%static:css group='course'/>
</%block>
<%block name="title"><title>${_("{course.number} Course Info").format(course=course)}</title></%block>
<%block name="title"><title>${_("{course.display_number_with_default} Course Info").format(course=course)}</title></%block>
<%include file="/courseware/course_navigation.html" args="active_page='syllabus'" />
<%!

16
lms/templates/dashboard.html
View File

@@ -140,11 +140,19 @@
% if course.id in show_courseware_links_for:
<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}')}" />
</a>
% else:
<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.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.
</div>
% endif
@@ -162,9 +170,9 @@
<h2 class="university">${get_course_about_section(course, 'university')}</h2>
<h3>
% if course.id in show_courseware_links_for:
<a href="${course_target}">${course.number} ${course.display_name_with_default}</a>
<a href="${course_target}">${course.display_number_with_default} ${course.display_name_with_default}</a>
% else:
<span>${course.number} ${course.display_name_with_default}</span>
<span>${course.display_number_with_default} ${course.display_name_with_default}</span>
% endif
</h3>
</hgroup>
@@ -197,6 +205,7 @@
% endif
% if registration.is_rejected:
<div class="message message-status is-shown exam-schedule">
<<<<<<< HEAD
<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(
link_start='<a href="{url}" id="exam_register_link">'.format(url=testcenter_register_target),
@@ -206,6 +215,9 @@
link_end='</a>',
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.
</div>
% endif
% if not registration.is_accepted and not registration.is_rejected:

2
lms/templates/discussion/index.html
View File

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

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

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

2
lms/templates/discussion/user_profile.html
View File

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

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

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

2
lms/templates/navigation.html
View File

@@ -50,7 +50,7 @@ site_status_msg = get_site_status_msg(course_id)
</h1>
% if course:
<h2><span class="provider">${course.org}:</span> ${course.number} ${course.display_name_with_default}</h2>
<h2><span class="provider">${course.display_org_with_default}:</span> ${course.display_number_with_default} ${course.display_name_with_default}</h2>
% endif
% if user.is_authenticated():

2
lms/templates/open_ended_problems/combined_notifications.html
View File

@@ -7,7 +7,7 @@
<%static:css group='course'/>
</%block>
<%block name="title"><title>${_("{course_number} Combined Notifications").format(course_number=course.number)}</title></%block>
<%block name="title"><title>${_("{course_number} Combined Notifications").format(course_number=course.display_number_with_default)}</title></%block>
<%include file="/courseware/course_navigation.html" args="active_page='open_ended'" />

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

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

2
lms/templates/open_ended_problems/open_ended_problems.html
View File

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

3
lms/templates/static_htmlbook.html
View File

@@ -2,7 +2,8 @@
<%inherit file="main.html" />
<%namespace name='static' file='static_content.html'/>
<%block name="title"><title>${_('{course_number} Textbook').format(course_number=course.number)}</title>
<%block name="title"><title>${_('{course_number} Textbook').format(course_number=course.display_number_with_default)}</title>
</%block>
<%block name="headextra">

3
lms/templates/static_pdfbook.html
View File

@@ -5,7 +5,8 @@
<%block name="title">
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<title>${_('{course_number} Textbook').format(course_number=course.number)}</title>
<title>${_('{course_number} Textbook').format(course_number=course.display_number_with_default)}</title>
</%block>
<%block name="headextra">

2
lms/templates/staticbook.html
View File

@@ -2,7 +2,7 @@
<%inherit file="main.html" />
<%namespace name='static' file='static_content.html'/>
<%block name="title"><title>${_("{course_number} Textbook").format(course_number=course.number)}</title></%block>
<%block name="title"><title>${_("{course_number} Textbook").format(course_number=course.display_number_with_default)}</title></%block>
<%block name="headextra">
<%static:css group='course'/>

4
lms/templates/test_center_register.html
View File

@@ -95,7 +95,7 @@
<section class="introduction">
<header>
<hgroup>
<h2><a href="${reverse('dashboard')}">${get_course_about_section(course, 'university')} ${course.number} ${course.display_name_with_default}</a></h2>
<h2><a href="${reverse('dashboard')}">${get_course_about_section(course, 'university')} ${course.display_number_with_default} ${course.display_name_with_default}</a></h2>
% if registration:
<h1>${_('Your Pearson VUE Proctored Exam Registration')}</h1>
@@ -442,7 +442,7 @@
% endif
<div class="details details-course">
<h4>${_("About {university} {course_number}").format(university=get_course_about_section(course, 'university'), course_number=course.number)}</h4>
<h4>${_("About {university} {course_number}").format(university=get_course_about_section(course, 'university'), course_number=course.display_number_with_default)}</h4>
<p>
% if course.has_ended():
<span class="label">${_('Course Completed:')}</span> <span class="value">${course.end_date_text}</span>