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

Remove extra prerequisites style and add classes

Browse Source
This commit is contained in:
Giulio Gratta
2014-11-04 13:03:36 -08:00
parent 212598e649
commit 54b7a578a2
2 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lms/static/sass/multicourse/_course_about.scss
View File

@@ -532,31 +532,21 @@
.important-dates {
list-style: none;
margin: 0px;
padding: 0 ($baseline/2);
padding: 0px;
li {
.important-dates-item {
@include clearfix;
border-bottom: 1px dotted $border-color-2;
margin-bottom: $baseline;
padding-bottom: ($baseline/2);
&.prerequisites {
border: 1px solid $border-color-2;
margin: 0 -($baseline/2) 0;
padding: ($baseline/2);
p {
margin-right: ($baseline/2);
}
}
&:hover, &:focus {
.icon {
opacity: 1.0;
}
}
p {
.important-dates-item-title {
color: $lighter-base-font-color;
float: left;
font-family: $sans-serif;
@@ -569,7 +559,7 @@
opacity: .6;
}
span {
.important-dates-item-text {
float: right;
font-weight: 700;
}

25
lms/templates/courseware/course_about.html
View File

@@ -285,33 +285,34 @@
</header>
<ol class="important-dates">
<li><i class="icon icon-info-sign"></i><p>${_("Course Number")}</p><span class="course-number">${course.display_number_with_default | h}</span></li>
<li class="important-dates-item"><i class="icon icon-info-sign"></i><p class="important-dates-item-title">${_("Course Number")}</p><span class="important-dates-item-text course-number">${course.display_number_with_default | h}</span></li>
% if not course.start_date_is_still_default:
<li><i class="icon icon-calendar"></i><p>${_("Classes Start")}</p><span class="start-date">${course.start_datetime_text()}</span></li>
<li class="important-dates-item"><i class="icon icon-calendar"></i><p class="important-dates-item-title">${_("Classes Start")}</p><span class="important-dates-item-text start-date">${course.start_datetime_text()}</span></li>
% endif
## We plan to ditch end_date (which is not stored in course metadata),
## but for backwards compatibility, show about/end_date blob if it exists.
% if get_course_about_section(course, "end_date") or course.end:
<li>
<li class="important-dates-item">
<i class="icon icon-calendar"></i>
<p>${_("Classes End")}</p><span class="final-date">
% if get_course_about_section(course, "end_date"):
${get_course_about_section(course, "end_date")}
% else:
${course.end_datetime_text()}
% endif
<p class="important-dates-item-title">${_("Classes End")}</p>
<span class="important-dates-item-text final-date">
% if get_course_about_section(course, "end_date"):
${get_course_about_section(course, "end_date")}
% else:
${course.end_datetime_text()}
% endif
</span>
</li>
% endif
% if get_course_about_section(course, "effort"):
<li><i class="icon icon-pencil"></i><p>${_("Estimated Effort")}</p><span class="start-date">${get_course_about_section(course, "effort")}</span></li>
<li class="important-dates-item"><i class="icon icon-pencil"></i><p class="important-dates-item-title">${_("Estimated Effort")}</p><span class="important-dates-item-text effort">${get_course_about_section(course, "effort")}</span></li>
% endif
##<li><i class="icon icon-time"></i><p>${_('Course Length')}</p><span class="course-length">${_('{number} weeks').format(number=15)}</span></li>
##<li class="important-dates-item"><i class="icon icon-time"></i><p class="important-dates-item-title">${_('Course Length')}</p><span class="important-dates-item-text course-length">${_('{number} weeks').format(number=15)}</span></li>
% if get_course_about_section(course, "prerequisites"):
<li class="prerequisites"><i class="icon icon-book"></i><p>${_("Prerequisites")}</p><span class="start-date">${get_course_about_section(course, "prerequisites")}</span></li>
<li class="important-dates-item"><i class="icon icon-book"></i><p class="important-dates-item-title">${_("Prerequisites")}</p><span class="important-dates-item-text prerequisites">${get_course_about_section(course, "prerequisites")}</span></li>
% endif
</ol>
</section>