Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AA-3 course dates cleanup

Browse Source 
-change Important Course Dates to Upcoming Dates
-remove today's date
-left align date, right aling rest of info
This commit is contained in:
Nicholas D'Alfonso
2019-12-20 14:08:42 -05:00
parent b4eb64a425
commit 3ad963b8a7
8 changed files with 62 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lms/djangoapps/courseware/tests/test_date_summary.py
View File

@@ -176,12 +176,9 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
self.client.login(username=user.username, password=TEST_PASSWORD)
html_elements = [
'<h3 class="hd hd-6 handouts-header">Important Course Dates</h3>',
'<h3 class="hd hd-6 handouts-header">Upcoming Dates</h3>',
'<div class="date-summary-container">',
'<div class="date-summary date-summary-todays-date">',
'<span class="hd hd-6 heading localized-datetime"',
'data-datetime="2015-01-02 00:00:00+00:00"',
u'data-string="Today is {date}"',
'<p class="hd hd-6 date localized-datetime"',
'data-timezone="None"'
]
url = reverse(url_name, args=(course.id,))
@@ -204,12 +201,9 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
response = self.client.get(url, follow=True)
html_elements = [
'<h3 class="hd hd-6 handouts-header">Important Course Dates</h3>',
'<h3 class="hd hd-6 handouts-header">Upcoming Dates</h3>',
'<div class="date-summary-container">',
'<div class="date-summary date-summary-todays-date">',
'<span class="hd hd-6 heading localized-datetime"',
'data-datetime="2015-01-02 00:00:00+00:00"',
u'data-string="Today is {date}"',
'<p class="hd hd-6 date localized-datetime"',
'data-timezone="America/Los_Angeles"'
]
for html in html_elements:
@@ -235,7 +229,6 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
url = reverse(url_name, args=(course.id,))
response = self.client.get(url, follow=True)
html_elements = [
u'data-string="in 1 day - {date}"',
'data-datetime="2015-01-03 00:00:00+00:00"'
]
for html in html_elements:
@@ -255,7 +248,6 @@ class CourseDateSummaryTest(SharedModuleStoreTestCase):
url = reverse(url_name, args=(course.id,))
response = self.client.get(url, follow=True)
html_elements = [
u'data-string="in 1 day - {date}"',
'data-datetime="2015-01-03 00:00:00+00:00"',
'data-timezone="America/Los_Angeles"'
]

1
lms/static/images/calendar-alt-regular.svg Normal file
View File

@@ -0,0 +1 @@
<svg aria-hidden="true" focusable="false" data-prefix="far" data-icon="calendar-alt" class="svg-inline--fa fa-calendar-alt fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M148 288h-40c-6.6 0-12-5.4-12-12v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12zm108-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 96v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm-96 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm192 0v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm96-260v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V112c0-26.5 21.5-48 48-48h48V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h128V12c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v52h48c26.5 0 48 21.5 48 48zm-48 346V160H48v298c0 3.3 2.7 6 6 6h340c3.3 0 6-2.7 6-6z"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

43
lms/static/sass/features/_course-experience.scss
View File

@@ -457,9 +457,10 @@ button.accordion-trigger, button.prerequisite-button {
.date-summary-container {
.date-summary {
@include clearfix;
@include border-left(3px solid $gray-300);
padding: $baseline/2;
display: flex;
justify-content: space-between;
padding: $baseline/2 $baseline/2 $baseline/2 0;
.heading {
font-size: 0.9rem;
@@ -469,18 +470,38 @@ button.accordion-trigger, button.prerequisite-button {
color: theme-color("dark");
}
.description {
margin-top: $baseline/2;
margin-bottom: $baseline/2;
display: inline-block;
.left-column {
flex: 5%;
.calendar-icon {
margin-top: 3px;
height: 1em;
width: auto;
background: url('#{$static-path}/images/calendar-alt-regular.svg');
background-repeat: no-repeat;
}
}
.date-summary-link {
font-weight: $font-semibold;
.right-column {
flex: 85%;
a {
color: $link-color;
font-weight: $font-regular;
.localized-datetime {
font-weight: $font-weight-bold;
margin-bottom: 8px;
}
.description {
margin-bottom: $baseline/2;
display: inline-block;
}
.date-summary-link {
font-weight: $font-semibold;
a {
color: $link-color;
font-weight: $font-regular;
}
}
}