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

Merge pull request #23990 from edx/ciduarte/AA-156-dates-intro

Browse Source 
Dates Intro Messaging
This commit is contained in:
Carla Duarte
2020-05-13 14:56:21 -04:00
committed by GitHub
parent d1bd39c71b 069aea8f40
commit 881c1a2a41
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lms/static/sass/course/_dates.scss
View File

@@ -9,7 +9,7 @@
border-bottom: 0;
}
.upgrade-banner {
.dates-banner {
border-radius: 4px;
border: solid 1px #9cd2e6;
background-color: #eff8fa;
@@ -21,14 +21,17 @@
justify-content: space-between;
max-width: $text-width-readability-max;
.upgrade-banner-text {
.dates-banner-text {
font-size: 16px;
line-height: 24px;
color: #414141;
flex: 1 1 20em;
max-width: 70%;
}
.banner-has-button {
flex: 1 1 20em;
max-width: 70%;
}
.upgrade-button {
align-self: start;
flex: none;

2
lms/static/sass/course/_info.scss
View File

@@ -58,7 +58,7 @@ div.info-wrapper {
width: 100%;
display: block;
div.upgrade-banner {
div.dates-banner {
// This banner uses the Pattern Library's defined variables
@include border-left(0);

17
lms/templates/courseware/dates.html
View File

@@ -26,10 +26,19 @@ from openedx.core.djangolib.markup import HTML, Text
<h2 class="hd hd-2 date-title">
${_("Important Dates")}
</h2>
% if not display_reset_dates_text:
<div class="dates-banner">
<div class="dates-banner-text">
<strong>${_("We've built a suggested schedule to help you stay on track.")}</strong>
${_("But don't worry—it's flexible so you can learn at your own pace.")}
${_("If you happen to fall behind on our suggested dates, you'll be able to adjust them to keep yourself on track.")}
</div>
</div>
% endif
<% has_locked_assignments = any(hasattr(block, 'contains_gated_content') and block.contains_gated_content for block in course_date_blocks if isinstance(block, CourseAssignmentDate)) %>
% if has_locked_assignments and verified_upgrade_link:
<div class="upgrade-banner">
<div class="upgrade-banner-text">
<div class="dates-banner">
<div class="dates-banner-text banner-has-button">
<strong>${_('You are auditing this course,')}</strong>
${_(' which means that you are unable to participate in graded assignments.')}
% if display_reset_dates_text:
@@ -52,8 +61,8 @@ from openedx.core.djangolib.markup import HTML, Text
</div>
% endif
% if display_reset_dates_text and learner_is_verified:
<div class="upgrade-banner">
<div class="upgrade-banner-text">
<div class="dates-banner">
<div class="dates-banner-text banner-has-button">
<strong>${_('It looks like you missed some important deadlines based on our suggested schedule.')}</strong>
${_('To keep yourself on track, you can update this schedule and shift the past due assignments into the future. Don’t worry—you won’t lose any of the progress you’ve made when you shift your due dates. ')}
</div>