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

improve alignment between studio-frontend outlines status blocks and course highlights block and bump studio-frontend version to 1.16.0

Browse Source
This commit is contained in:
Michael Roytman
2018-07-20 14:49:52 -04:00
parent ed0b130046
commit d502a75efb
6 changed files with 34 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
cms/templates/course_outline.html
View File

@@ -7,8 +7,8 @@ from cms.djangoapps.contentstore.config.waffle_utils import should_show_checklis
from util.date_utils import get_default_time_display
from django.utils.translation import ugettext as _
from openedx.core.djangolib.js_utils import js_escaped_string, dump_js_escaped_json
from contentstore.utils import reverse_usage_url
from openedx.core.djangolib.markup import HTML, Text
from django.core.urlresolvers import reverse
%>
<%block name="title">${_("Course Outline")}</%block>
<%block name="bodyclass">is-signedin course view-outline</%block>
@@ -157,32 +157,17 @@ from openedx.core.djangolib.markup import HTML, Text
<section class="content">
<article class="content-primary" role="main">
<div class="course-status">
<div class="status-release">
<h2 class="status-release-label">${_("Course Start Date")}</h2>
<br>
<p class="status-release-value">${course_release_date}</p>
<ul class="status-actions">
<li class="action-item action-edit">
<a href="${settings_url}" class="edit-button action-button" data-tooltip="${_("Edit Start Date")}">
<span class="icon fa fa-pencil" aria-hidden="true"></span>
<span class="action-button-text sr">${_("Edit Start Date")}</span>
</a>
</li>
</ul>
</div>
<div class="status-pacing">
<h2 class=status-pacing-label>${_("Course Pacing")}</h2>
<br>
% if context_course.self_paced:
<p class="status-pacing-value">${_("Self-Paced")}</p>
% else:
<p class="status-pacing-value">${_("Instructor-Paced")}</p>
% endif
</div>
<div class="status-highlights-enabled"></div>
% if should_show_checklists_page():
<div class="status-checklist">
## set width dynamically depending upon whether course has a start date to ensure spacing looks good
% if course_release_date == 'Set Date':
<div style="width: 40%" class="status-studio-frontend">
% else:
<div style="width: 50%" class="status-studio-frontend">
% endif
<%static:studiofrontend entry="courseOutlineHealthCheck">
<%
course_key = context_course.id
%>
{
"lang": "${language_code | n, js_escaped_string}",
"course": {
@@ -199,11 +184,14 @@ from openedx.core.djangolib.markup import HTML, Text
"help_tokens": {
"files": "${get_online_help_info(online_help_token())['doc_url'] | n, js_escaped_string}"
},
"enable_quality": ${should_show_checklists_quality(request.user, context_course.id) | n, dump_js_escaped_json}
"enable_quality": ${should_show_checklists_quality(request.user, context_course.id) | n, dump_js_escaped_json},
"links": {
"settings": ${reverse('settings_handler', kwargs={'course_key_string': unicode(course_key)})| n, dump_js_escaped_json}
}
}
</%static:studiofrontend>
</%static:studiofrontend>
</div>
<div class="status-highlights-enabled"></div>
% endif
</div>
<div class="wrapper-dnd"