Added more descriptive page titles.

common/djangoapps/external_auth/tests/test_shib.py

@@ -202,7 +202,7 @@ class ShibSPTest(ModuleStoreTestCase):
                 else:
                     self.assertEqual(response.status_code, 200)
                     self.assertContains(response,
-                                        ("<title>Preferences for {platform_name}</title>"
+                                        ("Preferences for {platform_name}"
                                          .format(platform_name=settings.PLATFORM_NAME)))
                     # no audit logging calls
                     self.assertEquals(len(audit_log_calls), 0)

common/djangoapps/microsite_configuration/__init__.py

@@ -0,0 +1 @@
+from .templatetags.microsite import page_title_breadcrumbs

common/djangoapps/microsite_configuration/templatetags/microsite.py

@@ -0,0 +1,40 @@
+"""
+Template tags and helper functions for displaying breadcrumbs in page titles
+based on the current micro site.
+"""
+from django import template
+from django.conf import settings
+from microsite_configuration.middleware import MicrositeConfiguration
+
+register = template.Library()
+
+
+def page_title_breadcrumbs(*crumbs, **kwargs):
+    """
+    This function creates a suitable page title in the form:
+    Specific | Less Specific | General | edX
+    It will output the correct platform name for the request.
+    Pass in a `separator` kwarg to override the default of " | "
+    """
+    separator = kwargs.get("separator", " | ")
+    if crumbs:
+        return '{}{}{}'.format(separator.join(crumbs), separator, platform_name())
+    else:
+        return platform_name()
+
+@register.simple_tag(name="page_title_breadcrumbs", takes_context=True)
+def page_title_breadcrumbs_tag(context, *crumbs):
+    """
+    Django template that creates breadcrumbs for page titles:
+    {% page_title_breadcrumbs "Specific" "Less Specific" General %}
+    """
+    return page_title_breadcrumbs(*crumbs)
+
+
+@register.simple_tag(name="platform_name")
+def platform_name():
+    """
+    Django template tag that outputs the current platform name:
+    {% platform_name %}
+    """
+    return MicrositeConfiguration.get_microsite_configuration_value('platform_name', settings.PLATFORM_NAME)

common/djangoapps/student/tests/test_login.py

@@ -255,7 +255,7 @@ class ExternalAuthShibTest(ModuleStoreTestCase):
         noshib_response = self.client.get(TARGET_URL, follow=True)
         self.assertEqual(noshib_response.redirect_chain[-1],
                          ('http://testserver/accounts/login?next={url}'.format(url=TARGET_URL), 302))
-        self.assertContains(noshib_response, ("<title>Log into your {platform_name} Account</title>"
+        self.assertContains(noshib_response, ("Log into your {platform_name} Account | {platform_name}"
                                               .format(platform_name=settings.PLATFORM_NAME)))
         self.assertEqual(noshib_response.status_code, 200)
 

common/djangoapps/terrain/steps.py

@@ -57,7 +57,7 @@ def i_visit_the_dashboard(step):
 @step('I should be on the dashboard page$')
 def i_should_be_on_the_dashboard(step):
     assert world.is_css_present('section.container.dashboard')
-    assert world.browser.title == 'Dashboard'
+    assert 'Dashboard' in world.browser.title
 
 
 @step(u'I (?:visit|access|open) the courses page$')

common/lib/xmodule/xmodule/js/src/sequence/display.coffee

@@ -5,6 +5,7 @@ class @Sequence
     @num_contents = @contents.length
     @id = @el.data('id')
     @ajaxUrl = @el.data('ajax-url')
+    @base_page_title = " | " + document.title
     @initProgress()
     @bind()
     @render parseInt(@el.data('position'))
@@ -18,7 +19,10 @@ class @Sequence
   initProgress: ->
     @progressTable = {}  # "#problem_#{id}" -> progress
 
-
+  updatePageTitle: ->
+    # update the page title to include the current section
+    document.title = @link_for(@position).data('title') + @base_page_title
+    
   hookUpProgressEvent: ->
     $('.problems-wrapper').bind 'progressChanged', @updateProgress
 
@@ -100,6 +104,7 @@ class @Sequence
       @position = new_position
       @toggleArrows()
       @hookUpProgressEvent()
+      @updatePageTitle()
 
       sequence_links = @$('#seq_content a.seqnav')
       sequence_links.click @goto

common/templates/course_modes/choose.html

@@ -1,16 +1,15 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%! from django.core.urlresolvers import reverse %>
+
 <%inherit file="../main.html" />
 
 <%block name="bodyclass">register verification-process step-select-track ${'is-upgrading' if upgrade else ''}</%block>
-<%block name="title">
-  <title>
+<%block name="pagetitle">
     %if upgrade:
       ${_("Upgrade Your Registration for {} | Choose Your Track").format(course_name)}
     %else:
       ${_("Register for {} | Choose Your Track").format(course_name)}
     %endif
-  </title>
 </%block>
 
 <%block name="js_extra">

common/test/test_microsites/test_microsite/templates/static_templates/tos.html

@@ -4,7 +4,7 @@
 
 <%namespace name='static' file='../static_content.html'/>
 
-<%block name="title"><title>Terms of Service</title></%block>
+<%block name="pagetitle">${_("Terms of Service")}</%block>
 
 <section class="static-container tos">
   <h1>edX Terms of Service</h1>

lms/djangoapps/courseware/features/high-level-tabs.feature

@@ -13,6 +13,6 @@ Scenario: I can navigate to all high - level tabs in a course
         | TabName       | PageTitle             |
         | Courseware    | 6.002x Courseware     |
         | Course Info   | 6.002x Course Info    |
-        | Custom Tab    | 6.002x Custom Tab     |
-        | Wiki          | edX Wiki              |
+        | Custom Tab    | Custom Tab | 6.002x   |
+        | Wiki          | Wiki | edX            |
         | Progress      | 6.002x Progress       |

lms/djangoapps/courseware/tests/test_microsites.py

@@ -72,7 +72,7 @@ class TestMicrosites(ModuleStoreTestCase, LoginEnrollmentTestCase):
         self.assertContains(resp, 'This is a Test Microsite Overlay')   # Overlay test message
         self.assertContains(resp, 'test_microsite/images/header-logo.png')  # logo swap
         self.assertContains(resp, 'test_microsite/css/test_microsite.css')  # css override
-        self.assertContains(resp, '<title>Test Microsite</title>')   # page title
+        self.assertContains(resp, 'Test Microsite')   # page title
 
         # assert that test course display name is visible
         self.assertContains(resp, 'Robot_Super_Course')

lms/djangoapps/courseware/views.py

@@ -328,7 +328,7 @@ def index(request, course_id, chapter=None, section=None,
             # Save where we are in the chapter
             save_child_position(chapter_module, section)
             context['fragment'] = section_module.render('student_view')
-
+            context['section_title'] = section_descriptor.display_name_with_default
         else:
             # section is none, so display a message
             prev_section = get_current_child(chapter_module)

lms/envs/common.py

@@ -1062,6 +1062,7 @@ INSTALLED_APPS = (
 
     # Dark-launching languages
     'dark_lang',
+    'microsite_configuration',
 )
 
 ######################### MARKETING SITE ###############################

lms/templates/course_groups/debug.html

@@ -3,7 +3,7 @@
 <html lang="${LANGUAGE_CODE}">
 <head>
   ## "edX" should not be translated
-  <%block name="title"><title>edX</title></%block>
+  <%block name="pagetitle"></%block>
 
   <script type="text/javascript" src="/static/js/vendor/jquery.min.js"></script>
   <script type="text/javascript" src="/static/js/course_groups/cohorts.js"></script>

lms/templates/courseware/course_about.html

@@ -113,7 +113,7 @@
   <script src="${static.url('js/course_info.js')}"></script>
 </%block>
 
-<%block name="title"><title>${_("About {course.display_number_with_default}").format(course=course) | h}</title></%block>
+<%block name="pagetitle">${_("About {course.display_number_with_default}").format(course=course) | h}</%block>
 
 <section class="course-info">
   <header class="course-profile">

lms/templates/courseware/courses.html

@@ -3,7 +3,7 @@
 
 <%namespace name='static' file='../static_content.html'/>
 
-<%block name="title"><title>${_("Courses")}</title></%block>
+<%block name="pagetitle">${_("Courses")}</%block>
 <%! from microsite_configuration.middleware import MicrositeConfiguration %>
 
 <section class="find-courses">

lms/templates/courseware/courseware-error.html

@@ -2,7 +2,7 @@
 <%inherit file="/main.html" />
 <%namespace name='static' file='../static_content.html'/>
 <%block name="bodyclass">courseware</%block>
-<%block name="title"><title>${_("Courseware")} - ${settings.PLATFORM_NAME}</title></%block>
+<%block name="pagetitle">${_("Courseware")}</%block>
 
 <%block name="headextra">
 <%static:css group='style-course-vendor'/>

lms/templates/courseware/courseware.html

@@ -1,8 +1,19 @@
 <%! from django.utils.translation import ugettext as _ %>
+<%! from microsite_configuration import page_title_breadcrumbs %>
 <%inherit file="/main.html" />
 <%namespace name='static' file='/static_content.html'/>
+<%def name="course_name()">
+ <% return _("{course_number} Courseware").format(course_number=course.display_number_with_default) %>
+</%def>
+
 <%block name="bodyclass">courseware ${course.css_class}</%block>
-<%block name="title"><title>${_("{course_number} Courseware").format(course_number=course.display_number_with_default) | h}</title></%block>
+<%block name="title"><title>
+    % if section_title: 
+${page_title_breadcrumbs(section_title, course_name())}
+    % else:
+${page_title_breadcrumbs(course_name())}
+    %endif 
+</title></%block>
 
 <%block name="headextra">
 <%static:css group='style-course-vendor'/>

lms/templates/courseware/info.html

@@ -1,18 +1,18 @@
 <%! from django.utils.translation import ugettext as _ %>
+<%! from courseware.courses import get_course_info_section %>
+
 <%inherit file="/main.html" />
-<%block name="bodyclass">${course.css_class}</%block>
 <%namespace name='static' file='/static_content.html'/>
 
+<%block name="pagetitle">${_("{course.display_number_with_default} Course Info").format(course=course) | h}</%block>
+
 <%block name="headextra">
 <%static:css group='style-course-vendor'/>
 <%static:css group='style-course'/>
 </%block>
 
-<%block name="title"><title>${_("{course.display_number_with_default} Course Info").format(course=course) | h}</title></%block>
+
 <%include file="/courseware/course_navigation.html" args="active_page='info'" />
-<%!
-  from courseware.courses import get_course_info_section
-%>
 
 <%block name="js_extra">
   <script type="text/javascript" src="${static.url('js/jquery.treeview.js')}"></script>
@@ -23,6 +23,7 @@ $(document).ready(function(){
   </script>
 </%block>
 
+<%block name="bodyclass">${course.css_class}</%block>
 <section class="container">
   <div class="info-wrapper">
     % if user.is_authenticated():

lms/templates/courseware/instructor_dashboard.html

@@ -1,8 +1,10 @@
 <%! from django.utils.translation import ugettext as _ %>
-<%inherit file="/main.html" />
 <%! from django.core.urlresolvers import reverse %>
+
+<%inherit file="../main.html" />
 <%namespace name='static' file='/static_content.html'/>
 
+<%block name="pagetitle">${_("Instructor Dashboard")}</%block>
 <%block name="headextra">
 <%static:css group='style-course-vendor'/>
 <%static:css group='style-course'/>

lms/templates/courseware/mktg_coming_soon.html

@@ -8,7 +8,7 @@
 
 <%inherit file="../mktg_iframe.html" />
 
-<%block name="title"><title>${_("About {course_id}").format(course_id=course_id)}</title></%block>
+<%block name="pagetitle">${_("About {course_id}").format(course_id=course_id)}</%block>
 
 <%block name="bodyclass">view-iframe-content view-partial-mktgregister</%block>
 

lms/templates/courseware/mktg_course_about.html

@@ -8,7 +8,7 @@
 
 <%inherit file="../mktg_iframe.html" />
 
-<%block name="title"><title>${_("About {course_number}").format(course_number=course.display_number_with_default) | h}</title></%block>
+<%block name="pagetitle">${_("About {course_number}").format(course_number=course.display_number_with_default) | h}</%block>
 
 <%block name="bodyclass">view-iframe-content view-partial-mktgregister</%block>
 

lms/templates/courseware/news.html

@@ -2,7 +2,7 @@
 <%inherit file="main.html" />
 <%namespace name='static' file='../static_content.html'/>
 <%block name="bodyclass">courseware news</%block>
-<%block name="title"><title>${_("News - MITx 6.002x")}</title></%block>
+<%block name="pagetitle">${_("News - MITx 6.002x")}</%block>
 
 <%block name="headextra">
 <%static:css group='style-course-vendor'/>

lms/templates/courseware/progress.html

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

lms/templates/courseware/static_tab.html

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

lms/templates/courseware/syllabus.html

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

lms/templates/dashboard.html

@@ -8,7 +8,7 @@
 
 <%namespace name='static' file='static_content.html'/>
 
-<%block name="title"><title>${_("Dashboard")}</title></%block>
+<%block name="pagetitle">${_("Dashboard")}</%block>
 <%block name="bodyclass">view-dashboard is-authenticated</%block>
 
 <%block name="js_extra">

lms/templates/discussion/index.html

@@ -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.display_number_with_default) | h}</title></%block>
+<%block name="pagetitle">${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h}</%block>
 
 <%block name="headextra">
 <%static:css group='style-course-vendor'/>

lms/templates/discussion/user_profile.html

@@ -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.display_number_with_default) | h}</title></%block>
+<%block name="pagetitle">${_("Discussion - {course_number}").format(course_number=course.display_number_with_default) | h}</%block>
 
 <%block name="headextra">
 <%static:css group='style-course-vendor'/>

lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html

@@ -1,6 +1,7 @@
 <%! from django.utils.translation import ugettext as _ %>
-<%inherit file="/main.html" />
 <%! from django.core.urlresolvers import reverse %>
+
+<%inherit file="/main.html" />
 <%namespace name='static' file='/static_content.html'/>
 
 ## ----- Tips on adding something to the new instructor dashboard -----
@@ -16,6 +17,8 @@
 ## 5. Implement your standard django/python in lms/djangoapps/instructor/views/api.py
 ## 6. And tests go in lms/djangoapps/instructor/tests/
 
+<%block name="pagetitle">${_("Instructor Dashboard")}</%block>
+
 <%block name="headextra">
   <%static:css group='style-course-vendor'/>
   <%static:css group='style-course'/>

lms/templates/instructor/staff_grading.html

@@ -9,7 +9,7 @@
 <script type="text/javascript" src="${static.url('js/vendor/underscore-min.js')}"></script>
 </%block>
 
-<%block name="title"><title>${_("{course_number} Staff Grading").format(course_number=course.display_number_with_default) | h}</title></%block>
+<%block name="pagetitle">${_("{course_number} Staff Grading").format(course_number=course.display_number_with_default) | h}</%block>
 
 <%include file="/courseware/course_navigation.html" args="active_page='staff_grading'" />
 

lms/templates/login.html

@@ -5,7 +5,7 @@
 <%! from django.core.urlresolvers import reverse %>
 <%! from django.utils.translation import ugettext as _ %>
 
-<%block name="title"><title>${_("Log into your {platform_name} Account").format(platform_name=platform_name)}</title></%block>
+<%block name="pagetitle">${_("Log into your {platform_name} Account").format(platform_name=platform_name)}</%block>
 
 <%block name="js_extra">
   <script type="text/javascript">

lms/templates/main.html

@@ -1,5 +1,6 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%! from microsite_configuration.middleware import MicrositeConfiguration %>
+<%! from microsite_configuration import page_title_breadcrumbs %>
 
 <%namespace name='static' file='static_content.html'/>
 <%! from django.utils import html %>
@@ -28,11 +29,14 @@
 <!--[if gt IE 9]><!--><html lang="${LANGUAGE_CODE}"><!--<![endif]-->
 <head>
   <%block name="title">
+      <title>
     % if stanford_theme_enabled():
-      <title>${_("Home")} | class.stanford.edu</title>
+      ${_("Home")} | class.stanford.edu
     % else:
-      ## "edX" should not be translated
-      <title>${MicrositeConfiguration.get_microsite_configuration_value('platform_name', settings.PLATFORM_NAME)}</title>
+       ${page_title_breadcrumbs(self.pagetitle())}
+      </title>
+      ## this needs to be here to prevent the title from mysteriously appearing in the body, in one case
+      <!--<%block name="pagetitle" />-->
 
       <meta http-equiv="X-UA-Compatible" content="IE=edge">
 

lms/templates/main_django.html

@@ -1,9 +1,8 @@
 <!DOCTYPE html>
-{% load compressed %}{% load sekizai_tags i18n %}{% load url from future %}{% load staticfiles %}
+{% load compressed %}{% load sekizai_tags i18n microsite %}{% load url from future %}{% load staticfiles %}
 <html lang="{{LANGUAGE_CODE}}">
 <head>
-  {# "edX" should *not* be translated #}
-  {% block title %}<title>edX</title>{% endblock %}
+  {% block title %}<title>{% platform_name %}</title>{% endblock %}
 
   <link rel="icon" type="image/x-icon" href="{% static "images/favicon.ico" %}" />
 

lms/templates/open_ended_problems/combined_notifications.html

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

lms/templates/open_ended_problems/open_ended_flagged_problems.html

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

lms/templates/open_ended_problems/open_ended_problems.html

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

lms/templates/register-shib.html

@@ -12,7 +12,7 @@
 <%! from datetime import date %>
 <%! import calendar %>
 
-<%block name="title"><title>${_("Preferences for {platform_name}").format(platform_name=settings.PLATFORM_NAME)}</title></%block>
+<%block name="pagetitle">${_("Preferences for {platform_name}").format(platform_name=settings.PLATFORM_NAME)}</%block>
 
 <%block name="js_extra">
   <script type="text/javascript">

lms/templates/register.html

@@ -14,7 +14,7 @@
 <%! from datetime import date %>
 <%! import calendar %>
 
-<%block name="title"><title>${_("Register for {platform_name}").format(platform_name=platform_name)}</title></%block>
+<%block name="pagetitle">${_("Register for {platform_name}").format(platform_name=platform_name)}</%block>
 
 <%block name="js_extra">
   <script type="text/javascript">

lms/templates/seq_module.html

@@ -17,6 +17,7 @@
         <a class="seq_${item['type']} inactive progress-${item['progress_status']}"
            data-id="${item['id']}"
            data-element="${idx+1}"
+           data-title="${item['title']}"
            href="javascript:void(0);">
             <p aria-hidden="false">${item['title']}<span class="sr">, ${item['type']}</span></p>
           </a>

lms/templates/shoppingcart/download_report.html

@@ -3,7 +3,7 @@
 <%! from django.conf import settings %>
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("Download CSV Reports")}</title></%block>
+<%block name="pagetitle">${_("Download CSV Reports")}</%block>
 
 
 <section class="container">

lms/templates/shoppingcart/error.html

@@ -3,7 +3,7 @@
 
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("Payment Error")}</title></%block>
+<%block name="pagetitle">${_("Payment Error")}</%block>
 
 
 <section class="container">

lms/templates/shoppingcart/list.html

@@ -4,7 +4,7 @@
 
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("Your Shopping Cart")}</title></%block>
+<%block name="pagetitle">${_("Your Shopping Cart")}</%block>
 
 <section class="container cart-list">
   <h2>${_("Your selected items:")}</h2>

lms/templates/shoppingcart/receipt.html

@@ -5,7 +5,7 @@
 <%inherit file="../main.html" />
 <%block name="bodyclass">purchase-receipt</%block>
 
-<%block name="title"><title>${_("Register for [Course Name] | Receipt (Order")} ${order.id})</title></%block>
+<%block name="pagetitle">${_("Register for [Course Name] | Receipt (Order")} ${order.id})</%block>
 
 <%block name="content">
 

lms/templates/shoppingcart/verified_cert_receipt.html

@@ -5,7 +5,7 @@
 <%inherit file="../main.html" />
 <%block name="bodyclass">register verification-process step-confirmation</%block>
 
-<%block name="title"><title>${_("Receipt (Order")} ${order.id})</title></%block>
+<%block name="pagetitle">${_("Receipt (Order")} ${order.id})</%block>
 
 <%block name="content">
 % if notification is not UNDEFINED:

lms/templates/static_htmlbook.html

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

lms/templates/static_pdfbook.html

@@ -2,13 +2,11 @@
 
 <%inherit file="main.html" />
 <%namespace name='static' file='static_content.html'/>
-<%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.display_number_with_default) | h}</title>
-</%block>
+<%block name="pagetitle">${_('{course_number} Textbook').format(course_number=course.display_number_with_default) | h}</%block>
 
 <%block name="headextra">
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 <%static:css group='style-course-vendor'/>
 <%static:css group='style-course'/>
 <%static:js group='courseware'/>

lms/templates/static_templates/404.html

@@ -1,7 +1,7 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%inherit file="../main.html" />
 
-<%block name="title"><title>404</title></%block>
+<%block name="pagetitle">${_("Page Not Found")}</%block>
 
 <section class="outside-app">
 <h1>${_("Page not found")}</h1>

lms/templates/static_templates/about.html

@@ -1,7 +1,7 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("Vision")}</title></%block>
+<%block name="pagetitle">${_("Vision")}</%block>
 
 <section class="container about">
 <h1>${_("Vision")}</h1>

lms/templates/static_templates/contact.html

@@ -1,7 +1,7 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("Contact")}</title></%block>
+<%block name="pagetitle">${_("Contact")}</%block>
 
 <section class="container about">
 <h1>${_("Contact")}</h1>

lms/templates/static_templates/copyright.html

@@ -1,7 +1,7 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("Copyright")}</title></%block>
+<%block name="pagetitle">${_("Copyright")}</%block>
 
 <section class="container about">
 <h1>${_("Copyright")}</h1>

lms/templates/static_templates/faq.html

@@ -1,7 +1,7 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("FAQ")}</title></%block>
+<%block name="pagetitle">${_("FAQ")}</%block>
 
 <section class="container about">
 <h1>${_("FAQ")}</h1>

lms/templates/static_templates/help.html

@@ -1,7 +1,7 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("Help")}</title></%block>
+<%block name="pagetitle">${_("Help")}</%block>
 
 <section class="container about">
 <h1>${_("Help")}</h1>

lms/templates/static_templates/honor.html

@@ -1,7 +1,7 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("Honor Code")}</title></%block>
+<%block name="pagetitle">${_("Honor Code")}</%block>
 
 <section class="container about">
 <h1>${_("Honor Code")}</h1>

lms/templates/static_templates/jobs.html

@@ -1,7 +1,7 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("Jobs")}</title></%block>
+<%block name="pagetitle">${_("Jobs")}</%block>
 
 <section class="container about">
 <h1>${_("Jobs")}</h1>

lms/templates/static_templates/media-kit.html

@@ -1,7 +1,7 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("Media Kit")}</title></%block>
+<%block name="pagetitle">${_("Media Kit")}</%block>
 
 <section class="container about">
 <h1>${_("Media Kit")}</h1>

lms/templates/static_templates/press.html

@@ -1,7 +1,8 @@
 <%! from django.utils.translation import ugettext as _ %>
+
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("In the Press")}</title></%block>
+<%block name="pagetitle">${_("In the Press")}</%block>
 
 <section class="container about">
 <h1>${_("In the Press")}</h1>

lms/templates/static_templates/privacy.html

@@ -1,7 +1,8 @@
 <%! from django.utils.translation import ugettext as _ %>
+
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("Privacy Policy")}</title></%block>
+<%block name="pagetitle">${_("Privacy Policy")}</%block>
 
 <section class="container about">
 <h1>${_("Privacy Policy")}</h1>

lms/templates/static_templates/tos.html

@@ -1,7 +1,7 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%inherit file="../main.html" />
 
-<%block name="title"><title>${_("Terms of Service")}</title></%block>
+<%block name="pagetitle">${_("Terms of Service")}</%block>
 
 <section class="container about">
 <h1>${_("Terms of Service")}</h1>

lms/templates/staticbook.html

@@ -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.display_number_with_default) | h}</title></%block>
+<%block name="pagetitle">${_("{course_number} Textbook").format(course_number=course.display_number_with_default) | h}</%block>
 
 <%block name="headextra">
 <%static:css group='style-course-vendor'/>

lms/templates/university_profile/edge.html

@@ -4,7 +4,7 @@
 
 <%! from django.core.urlresolvers import reverse %>
 
-<%block name="title"><title>${_("edX edge")}</title></%block>
+<%block name="pagetitle">${_("edX edge")}</%block>
 <%block name="bodyclass">no-header edge-landing</%block>
 
 <%block name="content">

lms/templates/verify_student/photo_reverification.html

@@ -1,10 +1,11 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%! from django.core.urlresolvers import reverse %>
+
 <%inherit file="../main.html" />
 <%namespace name='static' file='/static_content.html'/>
 
 <%block name="bodyclass">register verification-process is-not-verified step-photos</%block>
-<%block name="title"><title>${_("Re-Verification")}</title></%block>
+<%block name="pagetitle">${_("Re-Verification")}</%block>
 
 <%block name="js_extra">
 <script src="${static.url('js/vendor/responsive-carousel/responsive-carousel.js')}"></script>

lms/templates/verify_student/photo_verification.html

@@ -1,17 +1,16 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%! from django.core.urlresolvers import reverse %>
+
 <%inherit file="../main.html" />
 <%namespace name='static' file='/static_content.html'/>
 
 <%block name="bodyclass">register verification-process step-photos ${'is-upgrading' if upgrade else ''}</%block>
-<%block name="title">
-  <title>
+<%block name="pagetitle">
     %if upgrade:
       ${_("Upgrade Your Registration for {} | Verification").format(course_name)}
     %else:
       ${_("Register for {} | Verification").format(course_name)}
     %endif
-  </title>
 </%block>
 
 <%block name="js_extra">

lms/templates/verify_student/reverification_confirmation.html

@@ -1,11 +1,11 @@
-
 <%! from django.utils.translation import ugettext as _ %>
 <%! from django.core.urlresolvers import reverse %>
+
 <%inherit file="../main.html" />
 <%namespace name='static' file='/static_content.html'/>
 
 <%block name="bodyclass">register verification-process is-not-verified step-confirmation</%block>
-<%block name="title"><title>${_("Re-Verification Submission Confirmation")}</title></%block>
+<%block name="pagetitle">${_("Re-Verification Submission Confirmation")}</%block>
 
 <%block name="js_extra">
 <script src="${static.url('js/vendor/responsive-carousel/responsive-carousel.js')}"></script>

lms/templates/verify_student/show_requirements.html

@@ -1,15 +1,14 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%! from django.core.urlresolvers import reverse %>
+
 <%inherit file="../main.html" />
 <%block name="bodyclass">register verification-process step-requirements ${'is-upgrading' if upgrade else ''}</%block>
-<%block name="title">
-  <title>
+<%block name="pagetitle">
     %if upgrade:
       ${_("Upgrade Your Registration for {}").format(course_name)}
     %else:
       ${_("Register for {}").format(course_name)}
     %endif
-  </title>
 </%block>
 
 <%block name="content">

lms/templates/verify_student/verified.html

@@ -1,10 +1,11 @@
 <%! from django.utils.translation import ugettext as _ %>
 <%! from django.core.urlresolvers import reverse %>
+
 <%inherit file="../main.html" />
 <%namespace name='static' file='/static_content.html'/>
 
 <%block name="bodyclass">register verification-process is-verified</%block>
-<%block name="title"><title>${_("Register for {} | Verification").format(course_name)}</title></%block>
+<%block name="pagetitle">${_("Register for {} | Verification").format(course_name)}</%block>
 
 <%block name="js_extra">
 <script type="text/javascript">

lms/templates/wiki/base.html

@@ -1,7 +1,7 @@
 {% extends "main_django.html" %}
-{% load compressed %}{% load sekizai_tags i18n %}{% load url from future %}{% load staticfiles %}
+{% load compressed %}{% load sekizai_tags i18n microsite %}{% load url from future %}{% load staticfiles %}
 
-{% block title %}<title>{% block pagetitle %}{% endblock %} | edX Wiki</title>{% endblock %}
+{% block title %}<title>{% block pagetitle %}{% endblock %} | Wiki | {% platform_name %}</title>{% endblock %}
 
 {% block headextra %}
   {% compressed_css 'course' %}