Add unique title to course pages

issue #5158

cypress/e2e/3.assignments/assignment.creation_instructor.cy.js

@@ -23,7 +23,7 @@ describe('Assignment Feature: Instructor Creation', () => {
             .contains('Add Assignment').click();
 
         cy.log('Go through the wizard');
-        cy.title().should('eq', 'Mediathread Create Assignment');
+        cy.title().should('eq', 'Create Assignment | Mediathread');
         cy.wait(500);
         cy.get('a.nav-link.active').contains('Assignments');
         cy.get('.breadcrumb-item').contains('Back to all assignments');
@@ -59,7 +59,7 @@ describe('Assignment Feature: Instructor Creation', () => {
         cy.get('#id_publish_1').click();
         cy.get('#save-assignment').click();
 
-        cy.title().should('eq', 'Mediathread Assignment: Scenario 1');
+        cy.title().should('eq', 'Assignment: Scenario 1 | Mediathread');
         cy.get('.btn-edit-assignment').should('exist');
         cy.get('#student-response-dropdown')
             .contains('0 of 3 Students Responded').should('be.visible');

cypress/e2e/3.assignments/assignment.response_student.cy.js

@@ -8,7 +8,7 @@ describe('Assignment Feature: Student Response', () => {
     it('creates a response as a Student', () => {
         cy.log('respond as a student');
         cy.get('#cu-privacy-notice-button').click();
-        cy.title().should('eq', 'Mediathread Sample Assignment');
+        cy.title().should('eq', 'Sample Assignment | Mediathread');
         cy.get('.page-title').should('contain', 'Sample Assignment');
         cy.get('[data-cy="assignment-visibility"]').should('not.exist');
         cy.get('.project-revisionbutton').should('not.exist');

cypress/e2e/6.discussions/discussion.feat.cy.js

@@ -16,7 +16,7 @@ describe('Discussion View: Create Discussion', () => {
             .contains('Add Assignment').click();
 
         cy.log('create discussion wizard');
-        cy.title().should('eq', 'Mediathread Create Assignment');
+        cy.title().should('eq', 'Create Assignment | Mediathread');
         cy.wait(500);
         cy.get('a.nav-link.active').contains('Assignments');
         cy.get('.breadcrumb-item').contains('Back to all assignments');
@@ -51,7 +51,7 @@ describe('Discussion View: Create Discussion', () => {
         cy.get('#save-assignment').click();
 
         cy.log('View discussion as an instructor');
-        cy.title().should('eq', 'Mediathread Discussion: Scenario 1');
+        cy.title().should('eq', 'Discussion: Scenario 1 | Mediathread');
         cy.get('.btn-edit-assignment').should('exist');
         cy.get('.project-visibility-description')
             .contains('Shared with Class');
@@ -91,7 +91,7 @@ describe('Discussion View: Create Discussion', () => {
         cy.get('a').contains('Add Comments').click();
 
         cy.log('View discussion as a student');
-        cy.title().should('eq', 'Mediathread Discussion: Scenario 1');
+        cy.title().should('eq', 'Discussion: Scenario 1 | Mediathread');
         cy.get('.btn-edit-assignment').should('not.exist');
         cy.get('.project-visibility-description').should('not.exist');
         cy.contains('Due').should('be.visible');

cypress/e2e/7.selectionassignments/selectionassign.feat.1.cy.js

@@ -11,7 +11,7 @@ describe('Selection Assignment Feat: Instructor Creation', () => {
         cy.visit('/course/1/project/create/sa/');
         cy.get('#cu-privacy-notice-button').click();
         //TODO: test selection creation from homepage
-        cy.title().should('eq', 'Mediathread Create Assignment');
+        cy.title().should('eq', 'Create Assignment | Mediathread');
         cy.contains('Next').click();
         cy.contains('Choose an item from the course collection')
             .should('exist');

cypress/e2e/98.sequenceassignments/sequenceassign.feat.1.cy.js

@@ -13,7 +13,7 @@ describe('Sequence Assignment Feat: Instructor Creation', () => {
         cy.contains('Add an assignment').click({force: true});
         cy.get('#addSequenceAssignment').click({force: true});
         cy.contains('Next').click();
-        cy.title().should('eq', 'Mediathread Create Sequence Assignment');
+        cy.title().should('eq', 'Create Sequence Assignment | Mediathread');
         cy.contains('Next').click({force: true});
         cy.contains('Write title & instructions').should('exist');
         cy.contains('Next').click({force: true});

cypress/e2e/99.sequenceproject/sequence.feat.1.cy.js

@@ -16,7 +16,7 @@ describe('Sequence Project Feat: Student Creation', () => {
         cy.get('#cu-privacy-notice-button').click();
         cy.get('#projects-list').click();
         cy.get('#add-sequence-button').click({force: true});
-        cy.title().should('contain', 'Mediathread — Untitled');
+        cy.title().should('contain', 'Untitled | Mediathread');
         cy.get('.btn-edit-assignment').should('not.exist');
         cy.get('button.btn-show-submit').should('not.exist');
         cy.contains('Place secondary elements').should('be.visible');

media/js/src/CollectionTab.jsx

@@ -136,13 +136,18 @@ export default class CollectionTab extends React.Component {
     enterAssetDetailView(e, asset) {
         followLink(e);
 
+        if (asset && asset.title) {
+            jQuery('title').text(asset.title + ' | Mediathread');
+        }
+
         jQuery('.collection-header')
             .removeClass('d-flex')
             .addClass('d-none');
 
         jQuery('.collectionAdd')
             .removeClass('show');
 
+
         // Need to fetch the asset to get all the selections. The
         // collection view's selections are filtered by AssetFilter.
         const me = this;
@@ -167,6 +172,11 @@ export default class CollectionTab extends React.Component {
 
         followLink(e);
 
+        if (window.MediaThread && window.MediaThread.current_course_title) {
+            jQuery('title').text(
+                window.MediaThread.current_course_title + ' | Mediathread');
+        }
+
         // If the collection's assets haven't been fetched yet (if the
         // user navigated directly to the item detail page), we need
         // to make sure to fetch the assets.

mediathread/templates/500.html

@@ -4,7 +4,7 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>Mediathread &mdash; 500 Server Error</title>
+    <title>500 Server Error | Mediathread</title>
     <link rel="stylesheet" href="{% static 'css/mediathread.css' %}" media="screen" />
 </head>
 

mediathread/templates/base_new.html

@@ -9,7 +9,7 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-        <title>Mediathread {% block title %}{% endblock %}</title>
+        <title>{% block title %}{% endblock %} Mediathread</title>
 
         <meta id="csrf-token" name="csrf-token" content="{{csrf_token}}">
 
@@ -178,6 +178,7 @@ <h6 id="course-title" class="course-title">
 
                 {% if request.course %}
                 this.current_course = {{ request.course.pk }};
+                this.current_course_title = '{{ request.course.title }}';
                 this.current_course_has_vocab = {% if request.course.vocabulary_set.count > 0 %}true{% else %}false{% endif %};
                 this.allow_item_download = {% if allow_item_download %}true{% else %}false{% endif %};
                 {% endif %}

mediathread/templates/courseaffils/course_detail.html

@@ -3,7 +3,9 @@
 {% load static %}
 
 {% block title %}
-    Home
+    {% if object %}
+        {{ object.title }} |
+    {% endif %}
 {% endblock %}
 
 {% block masthead %}

mediathread/templates/courseaffils/course_list.html

@@ -2,7 +2,7 @@
 {% load coursetags %}
 {% load static %}
 
-{% block title %}— My Courses{% endblock %}
+{% block title %}My Courses |{% endblock %}
 
 {% block coursetitle %}
     My Courses

mediathread/templates/courseaffils/course_update_form.html

@@ -1,8 +1,6 @@
 {% extends 'dashboard/base_course_dashboard.html' %}
 {% load bootstrap4 %}
 
-{% block title %}{{block.super}}— Manage Course{% endblock %}
-
 {% block dashboard_content %}
     {{ form.media }}
     <form action="" method="post">{% csrf_token %}

mediathread/templates/dashboard/base_course_dashboard.html

@@ -1,6 +1,6 @@
 {% extends 'base_new.html' %}
 
-{% block title %}— Manage Course {% endblock %}
+{% block title %}Manage Course |{% endblock %}
 
 {% block messages %}
     {% if messages %}

mediathread/templates/dashboard/class_manage_sources.html

@@ -1,6 +1,6 @@
 {% extends 'dashboard/base_course_dashboard.html' %}
 {% load assetlinks %}
-{% block title %}{{block.super}}— Manage Sources{% endblock %}
+{% block title %}{{block.super}} | Manage Sources |{% endblock %}
 
 {% block dashboard_content %}
 

mediathread/templates/dashboard/class_migrate.html

@@ -1,7 +1,7 @@
 {% extends 'dashboard/base_course_dashboard.html' %}
 {% load coursetags %}
 
-{% block title %}{{block.super}}— Migrate Course Materials{% endblock %}
+{% block title %}{{block.super}} | Migrate Course Materials |{% endblock %}
 
 {% block uncompressable_css %}
     <script type="text/javascript" src="{{STATIC_URL}}js/underscore/underscore-min.js"></script>

mediathread/templates/dashboard/class_panopto_ingest_log.html

@@ -1,6 +1,6 @@
 {% extends 'dashboard/base_course_dashboard.html' %}
 
-{% block title %}{{block.super}}— Panopto Ingest Log{% endblock %}
+{% block title %}{{block.super}} | Panopto Ingest Log{% endblock %}
 
 {% block dashboard_content %}
     <div class="col-12 col-md">

mediathread/templates/dashboard/class_panopto_source.html

@@ -1,6 +1,6 @@
 {% extends 'dashboard/base_course_dashboard.html' %}
 {% load assetlinks %}
-{% block title %}Panopto Source Folder{% endblock %}
+{% block title %}Panopto Source Folder |{% endblock %}
 
 {% block switchcourse %}{% endblock %}
 

mediathread/templates/dashboard/class_roster.html

@@ -1,7 +1,7 @@
 {% extends 'dashboard/base_course_dashboard.html' %}
 {% load coursetags %}
 {% load static %}
-{% block title %}{{block.super}}— Course Roster{% endblock %}
+{% block title %}{{block.super}} | Course Roster |{% endblock %}
 
 {% block css %}
     <link rel="stylesheet" href="{% static 'js/lib/tablesorter/theme.default.min.css' %}">

mediathread/templates/discussions/discussion.html

@@ -1,7 +1,7 @@
 {% extends "base_new.html" %}
 
 {% block title %}
-    {% if discussion.title %}{{discussion.title}}{% else %}New Discussion{% endif %}
+    {% if discussion.title %}{{discussion.title}} |{% else %}New Discussion |{% endif %}
 {% endblock %}
 
 {% block css %}

mediathread/templates/main/course_activate.html

@@ -3,7 +3,7 @@
 {% load bootstrap3 %}
 {% load methtags %}
 
-{% block title %}— Activate Course{% endblock %}
+{% block title %}Activate Course |{% endblock %}
 
 {% block css %}
     <link rel="stylesheet" href="{% static 'css/bootstrap-datepicker3.min.css' %}" />

mediathread/templates/main/deprecated_homepage.html

@@ -2,7 +2,7 @@
 {% load tagging_tags user_projects helpful_tags coursetags comments static %}
 
 {% block title %}
-    Home
+    Home |
 {% endblock %}
 
 {% block uncompressable_js %}

mediathread/templates/main/splash.html

@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block title %}
-Splash Page
+Splash Page |
 {% endblock %}
 
 {% block extra_body_class %}

mediathread/templates/projects/assignment_list.html

@@ -2,7 +2,7 @@
 {% load coursetags static comments %}
 
 {% block title %}
-Assignments
+Assignments |
 {% endblock %}
 
 {% block css %}

mediathread/templates/projects/composition.html

@@ -2,7 +2,7 @@
 {% load static %}
 
 {% block title %}
-    {% if project.title %}{{project.title}}{% else %}New Composition{% endif %}
+    {% if project.title %}{{project.title}}{% else %}New Composition{% endif %} |
 {% endblock %}
 
 {% block css %}

mediathread/templates/projects/composition_assignment.html

@@ -2,7 +2,7 @@
 {% load user_projects coursetags static %}
 
 {% block title %}
-    {% if the_response %}{{the_response.title}}{% else %}{{assignment.title}}{% endif %}
+    {% if the_response %}{{the_response.title}}{% else %}{{assignment.title}}{% endif %} |
 {% endblock %}
 
 {% block css %}

mediathread/templates/projects/composition_assignment_edit.html

@@ -1,7 +1,7 @@
 {% extends "base_new.html" %}
 
 {% block title %}
-    {% if form.instance %}{{form.instance.title}}{% else %}Create Assignment{% endif %}
+    {% if form.instance %}{{form.instance.title}}{% else %}Create Assignment{% endif %} |
 {% endblock %}
 
 {% block css %}

mediathread/templates/projects/composition_readonly.html

@@ -1,7 +1,7 @@
 {% extends "base_new.html" %}
 
 {% block title %}
-    {{project.title}}
+    {{project.title}} |
 {% endblock %}
 
 {% block css %}

mediathread/templates/projects/discussion_assignment.html

@@ -2,7 +2,7 @@
 {% load user_projects coursetags static %}
 
 {% block title %}
-    {{assignment.title}}
+    {{assignment.title}} |
 {% endblock %}
 
 {% block css %}

mediathread/templates/projects/discussion_assignment_edit.html

@@ -1,7 +1,7 @@
 {% extends "base_new.html" %}
 
 {% block title %}
-    {% if form.instance %}{{form.instance.title}}{% else %}Create Assignment{% endif %}
+    {% if form.instance %}{{form.instance.title}}{% else %}Create Assignment{% endif %} |
 {% endblock %}
 
 {% block css %}

mediathread/templates/projects/print.html

@@ -2,7 +2,7 @@
 {% load coursetags %}
 
 {% block title %}
-    {% if project.title %}{{project.title}}{% else %}Print View{% endif %}
+    {% if project.title %}{{project.title}}{% else %}Print View{% endif %} |
 {% endblock %}
 
 {% block css %}

mediathread/templates/projects/project_list.html

@@ -2,7 +2,7 @@
 {% load static %}
 
 {% block title %}
-Projects
+Projects |
 {% endblock %}
 
 {% block css %}

mediathread/templates/projects/selection_assignment_edit.html

@@ -1,7 +1,7 @@
 {% extends "base_new.html" %}
 
 {% block title %}
-    {% if form.instance %}{{form.instance.title}}{% else %}Create Assignment{% endif %}
+    {% if form.instance %}{{form.instance.title}}{% else %}Create Assignment{% endif %} |
 {% endblock %}
 
 {% block uncompressable_css %}

mediathread/templates/projects/selection_assignment_view.html

@@ -2,7 +2,7 @@
 {% load user_projects coursetags static %}
 
 {% block title %}
-    {% if assignment.title %}{{assignment.title}}{% else %}New Assignment{% endif %}
+    {% if assignment.title %}{{assignment.title}}{% else %}New Assignment{% endif %} |
 {% endblock %}
 
 {% block css %}

mediathread/templates/projects/sequence.html

@@ -3,7 +3,7 @@
 {% load static %}
 
 {% block title %}
-    {% if project.title %}— {{project.title}}{% else %}— Sequence{% endif %}
+    {% if project.title %}{{project.title}}{% else %}Sequence{% endif %} |
 {% endblock %}
 
 {% block css %}

mediathread/templates/projects/sequence_assignment_edit.html

@@ -1,7 +1,7 @@
 {% extends "base_new.html" %}
 
 {% block title %}
-    {% if form.instance %}{{form.instance.title}}{% else %}Create Sequence Assignment{% endif %}
+    {% if form.instance %}{{form.instance.title}}{% else %}Create Sequence Assignment{% endif %} |
 {% endblock %}
 
 {% block css %}

mediathread/templates/projects/sequence_assignment_view.html

@@ -3,7 +3,7 @@
 {% load static %}
 
 {% block title %}
-    {% if assignment.title %}{{assignment.title}}{% else %}New Assignment{% endif %}
+    {% if assignment.title %}{{assignment.title}}{% else %}New Assignment{% endif %} |
 {% endblock %}
 
 {% block css %}

mediathread/templates/projects/version_list.html

@@ -2,7 +2,7 @@
 {% load static %}
 
 {% block title %}
-Projects
+Projects |
 {% endblock %}
 
 {% block css %}

mediathread/templates/registration/activate.html

@@ -1,6 +1,6 @@
 {% extends "base_new.html" %}
 {% load i18n %}
-{% block title %}— {% if account %}Activation complete{% else %}Activation problem{% endif %}{% endblock %}
+{% block title %}{% if account %}Activation complete{% else %}Activation problem{% endif %} |{% endblock %}
 
 {% block registration_content %}
 <h2 class="pagetitle signuptitle">Account Activation</h2>