course id/org/name -> display_stuff_with_default

lms/templates/courseware/info.html

@@ -1,10 +1,10 @@
 <%inherit file="../main.html" />
 <%namespace name='static' file='../static_content.html'/>
 <%!
-from django.utils.translation import ugettext as _
 from courseware.courses import get_course_info_section, get_course_date_summary
 
 from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration
+from openedx.core.djangolib.markup import HTML, ugettext as _
 %>
 
 <%block name="pagetitle">${_("{course_number} Course Info").format(course_number=course.display_number_with_default)}</%block>
@@ -21,9 +21,9 @@ from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration
       <h2 class="title">${_("You are not enrolled yet")}</h2>
       <div class="copy">
         <p class='enroll-message'>
-          ${_(u"You are not currently enrolled in this course. {link_start}Sign up now!{link_end}").format(
-          link_start=u"<a href={}>".format(url_to_enroll),
-          link_end=u"</a>"
+          ${_("You are not currently enrolled in this course. {link_start}Sign up now!{link_end}").format(
+                link_start=HTML("<a href={}>").format(url_to_enroll),
+                link_end=HTML("</a>")
           )}
         </p>
       </div>
@@ -54,8 +54,8 @@ from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration
 <section class="container">
   <div class="home">
     <div class="page-header-main">
-        <h1 class="page-title">${_("Welcome to {org}'s {course_name}!").format(org=course.id.org, course_name=course.id.course) | h}</h1>
-        <h2 class="page-subtitle">${course.display_name | h}</h2>
+        <h1 class="page-title">${_("Welcome to {org}'s {course_name}!").format(org=course.display_org_with_default, course_name=course.display_number_with_default) | h}</h1>
+        <h2 class="page-subtitle">${course.display_name_with_default | h}</h2>
     </div>
     % if last_accessed_courseware_url:
       <div class="page-header-secondary">