diff --git a/common/test/acceptance/pages/lms/course_info.py b/common/test/acceptance/pages/lms/course_info.py index eb617bc4fe..abb773f439 100644 --- a/common/test/acceptance/pages/lms/course_info.py +++ b/common/test/acceptance/pages/lms/course_info.py @@ -20,7 +20,7 @@ class CourseInfoPage(CoursePage): """ Return the number of updates on the page. """ - return len(self.q(css='section.updates section article').results) + return len(self.q(css='.updates .updates-article').results) @property def handout_links(self): diff --git a/lms/djangoapps/courseware/tests/test_course_info.py b/lms/djangoapps/courseware/tests/test_course_info.py index bab762367e..a584ca6948 100644 --- a/lms/djangoapps/courseware/tests/test_course_info.py +++ b/lms/djangoapps/courseware/tests/test_course_info.py @@ -216,15 +216,15 @@ class CourseInfoTitleTestCase(LoginEnrollmentTestCase, ModuleStoreTestCase): ) self.assertIn( expected_title, - content('h1.page-title').contents() + content('.page-title').contents()[0] ) self.assertIn( expected_display_title, - display_content('h1.page-title').contents() + display_content('.page-title').contents()[0] ) self.assertIn( display_course.display_name_with_default, - display_content('h2.page-subtitle').contents() + display_content('.page-subtitle').contents() ) diff --git a/lms/djangoapps/courseware/tests/test_date_summary.py b/lms/djangoapps/courseware/tests/test_date_summary.py index ec123683b4..edffea818d 100644 --- a/lms/djangoapps/courseware/tests/test_date_summary.py +++ b/lms/djangoapps/courseware/tests/test_date_summary.py @@ -180,7 +180,7 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase): self.client.login(username='mrrobot', password='test') html_elements = [ - '

Important Course Dates

', + '

Important Course Dates

', '
', '
', '

Important Course Dates

', + '

Important Course Dates

', '
', '
', '

ol,section { + > ol,section,div { list-style: none; margin-bottom: lh(); padding-left: 0; @@ -104,7 +104,7 @@ div.info-wrapper { } } - h2.date { + .date { @extend %t-title9; margin-bottom: ($baseline/4); text-transform: none; @@ -112,6 +112,7 @@ div.info-wrapper { @include padding-left($baseline); @include float(left); } + .toggle-visibility-button { @extend %t-title9; diff --git a/lms/templates/courseware/course_updates.html b/lms/templates/courseware/course_updates.html index 54767db943..28dde7f258 100644 --- a/lms/templates/courseware/course_updates.html +++ b/lms/templates/courseware/course_updates.html @@ -1,11 +1,9 @@ <%! from django.utils.translation import ugettext as _ %> -
-

${_('All course updates')}

% for index, update in enumerate(visible_updates):
% if not update.get("is_error"): -

${update.get("date")}

+
${update.get("date")}
% endif
- ${update.get("content")} + ${update.get("content")}
% endfor @@ -35,7 +33,7 @@ -
diff --git a/lms/templates/courseware/info.html b/lms/templates/courseware/info.html index 8bf2ae859f..7e9b874341 100644 --- a/lms/templates/courseware/info.html +++ b/lms/templates/courseware/info.html @@ -60,8 +60,9 @@ from openedx.core.djangolib.markup import HTML, Text
-

${_("Welcome to {org}'s {course_name}!").format(org=course.display_org_with_default, course_name=course.display_number_with_default)}

-

${course.display_name_with_default}

+

${_("Welcome to {org}'s {course_name}!").format(org=course.display_org_with_default, course_name=course.display_number_with_default)} +
${course.display_name_with_default}
+

% if last_accessed_courseware_url:
@@ -70,71 +71,71 @@ from openedx.core.djangolib.markup import HTML, Text % endif
- % if user.is_authenticated(): + % if user.is_authenticated():
% if studio_url is not None and masquerade and masquerade.role == 'staff': - + % endif -

${_("Course Updates and News")}

+

${_("Course Updates and News")}

${HTML(get_course_info_section(request, masquerade_user, course, 'updates'))} ## CourseTalk widget % if show_coursetalk_widget: -
-
-
+
+
+
% endif
+
- % if SelfPacedConfiguration.current().enable_course_home_improvements: -

${_("Important Course Dates")}

- ## Should be organized by date, last date appearing at the bottom + % if SelfPacedConfiguration.current().enable_course_home_improvements: +

${_("Important Course Dates")}

+ ## Should be organized by date, last date appearing at the bottom - % for course_date in get_course_date_blocks(course, user): -
-
- % if course_date.title: - % if course_date.title == 'current_datetime': -

- % else: -

${course_date.title}

+ % for course_date in get_course_date_blocks(course, user): +
+
+ % if course_date.title: + % if course_date.title == 'current_datetime': +

+ % else: +

${course_date.title}

+ % endif % endif - % endif - % if course_date.date and course_date.title != 'current_datetime': -

- % endif - % if course_date.description: -

${course_date.description}

- % endif - % if course_date.link and course_date.link_text: - - ${course_date.link_text} - - % endif + % if course_date.date and course_date.title != 'current_datetime': +

+ % endif + % if course_date.description: +

${course_date.description}

+ % endif + % if course_date.link and course_date.link_text: + + ${course_date.link_text} + + % endif +
-
- % endfor - % endif -

${_(course.info_sidebar_name)}

- ${HTML(get_course_info_section(request, masquerade_user, course, 'handouts'))} + % endfor + % endif +

${_(course.info_sidebar_name)}

+ ${HTML(get_course_info_section(request, masquerade_user, course, 'handouts'))}
- % else: + % else:
-

${_("Course Updates and News")}

+

${_("Course Updates and News")}

${HTML(get_course_info_section(request, masquerade_user, course, 'guest_updates'))}
-

${_("Course Handouts")}

+

${_("Course Handouts")}

${HTML(get_course_info_section(request, masquerade_user, course, 'guest_handouts'))}
- - % endif + % endif