Merge pull request #14967 from edx/andya/empty-course-message

Add an empty course message to the course home page

lms/static/sass/_build-lms-v2.scss

@@ -25,4 +25,4 @@
 
 // Features
 @import 'features/bookmarks';
-@import 'features/course-outline';
+@import 'features/course-experience';

lms/static/sass/features/_course-outline.scss → lms/static/sass/features/_course-experience.scss

+// Course sidebar
+.course-sidebar {
+  @include margin-left(0);
+  @include padding-left($baseline);
+}
+
+// Course outline
 .course-outline {
   color: $lms-gray;
 

openedx/features/course_experience/templates/course_experience/course-home-fragment.html

@@ -64,7 +64,7 @@ from openedx.features.course_experience import UNIFIED_COURSE_EXPERIENCE_FLAG
                 <main class="layout-col layout-col-b">
                     ${HTML(outline_fragment.body_html())}
                 </main>
-                <aside class="layout-col layout-col-a">
+                <aside class="course-sidebar layout-col layout-col-a">
                     <div class="section section-tools">
                         <h3 class="hd-6">${_("Course Tools")}</h3>
                         <ul class="list-unstyled">

openedx/features/course_experience/templates/course_experience/course-outline-fragment.html

@@ -5,7 +5,11 @@
 <%namespace name='static' file='../static_content.html'/>
 
 <%!
+from datetime import date
+
 from django.utils.translation import ugettext as _
+
+from openedx.core.djangolib.markup import HTML, Text
 %>
 
 <%static:require_module_async module_name="course_experience/js/course_outline_factory" class_name="CourseOutlineFactory">
@@ -13,8 +17,9 @@ from django.utils.translation import ugettext as _
 </%static:require_module_async>
 
 <main role="main" class="course-outline" id="main" tabindex="-1">
+    % if blocks.get('children'):
         <ol class="block-tree" role="tree">
-        % for section in blocks.get('children') or []:
+            % for section in blocks.get('children'):
                 <li
                     aria-expanded="true"
                     class="outline-item focusable section"
@@ -120,6 +125,39 @@ from django.utils.translation import ugettext as _
                 </li>
             % endfor
         </ol>
+    % else:
+        <div class="well depth-0 message-area">
+            <div class="copy-large">
+                <span class="icon fa fa-calendar-o" aria-hidden="true"></span>
+                <%
+                course_started = course.start.date() <= date.today()
+                %>
+
+                % if course.start_date_is_still_default:
+                    ${_("This course has not started yet.")}
+                % elif course_started:
+                    ${_("We're still working on course content.")}
+                % else:
+                    ${Text(_("This course has not started yet, and will launch on {launch_date_html}.")).format(
+                        launch_date_html=HTML(
+                            '<span'
+                            '    class="localized-datetime start-date"'
+                            '    data-datetime="{start_date}"'
+                            '    data-format="shortDate"'
+                            '    data-timezone="{user_timezone}"'
+                            '    data-language="{user_language}"'
+                            '></span>'
+                        ).format(
+                            start_date=course.start,
+                            user_timezone=user_timezone,
+                            user_language=user_language,
+                        ),
+                    )}
+                % endif
+            </div>
+
+        </div>
+    % endif
 </main>
 
 <%static:require_module_async module_name="js/dateutil_factory" class_name="DateUtilFactory">

openedx/features/course_experience/tests/views/test_course_outline.py

@@ -2,6 +2,7 @@
 Tests for the Course Outline view and supporting views.
 """
 import datetime
+import ddt
 from mock import patch
 import json
 
@@ -12,10 +13,13 @@ from student.models import CourseEnrollment
 from student.tests.factories import UserFactory
 from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
+from xmodule.course_module import DEFAULT_START_DATE
 
 from .test_course_home import course_home_url
 
 TEST_PASSWORD = 'test'
+FUTURE_DAY = datetime.datetime.now() + datetime.timedelta(days=30)
+PAST_DAY = datetime.datetime.now() - datetime.timedelta(days=30)
 
 
 class TestCourseOutlinePage(SharedModuleStoreTestCase):
@@ -160,3 +164,25 @@ class TestCourseOutlinePreview(SharedModuleStoreTestCase):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         self.assertNotContains(response, 'Future Chapter')
+
+
+@ddt.ddt
+class TestEmptyCourseOutlinePage(SharedModuleStoreTestCase):
+    """
+    Test the new course outline view.
+    """
+    @ddt.data(
+        (FUTURE_DAY, 'This course has not started yet, and will launch on'),
+        (PAST_DAY, "We're still working on course content."),
+        (DEFAULT_START_DATE, 'This course has not started yet.'),
+    )
+    @ddt.unpack
+    def test_empty_course_rendering(self, start_date, expected_text):
+        course = CourseFactory.create(start=start_date)
+        test_user = UserFactory(password=TEST_PASSWORD)
+        CourseEnrollment.enroll(test_user, course.id)
+        self.client.login(username=test_user.username, password=TEST_PASSWORD)
+        url = course_home_url(course)
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, expected_text)