From e8c90847cea970511e2faaa4205c835d27b8dcb0 Mon Sep 17 00:00:00 2001 From: Matthew Piatetsky Date: Wed, 3 May 2017 16:01:56 -0400 Subject: [PATCH] Add view course button This reverts commit 55268dec72108d8bd0d40a0f934539abfcff35f2. --- .../course_enroll_view_spec_2017.js | 2 +- lms/static/sass/views/_program-details.scss | 26 +++++++++++++++++++ .../course_enroll_2017.underscore | 10 ++++++- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/lms/static/js/spec/learner_dashboard/course_enroll_view_spec_2017.js b/lms/static/js/spec/learner_dashboard/course_enroll_view_spec_2017.js index b9819b658a..a6e8cc0bd2 100644 --- a/lms/static/js/spec/learner_dashboard/course_enroll_view_spec_2017.js +++ b/lms/static/js/spec/learner_dashboard/course_enroll_view_spec_2017.js @@ -143,7 +143,7 @@ define([ singleCourseRunList[0].is_enrolled = true; setupView(singleCourseRunList); - expect(view.$el.html().trim()).toEqual(''); + expect(view.$('.view-course-button').text().trim()).toEqual('View Course'); expect(view.$('.run-select').length).toBe(0); }); diff --git a/lms/static/sass/views/_program-details.scss b/lms/static/sass/views/_program-details.scss index dbde258c42..7ae8264982 100644 --- a/lms/static/sass/views/_program-details.scss +++ b/lms/static/sass/views/_program-details.scss @@ -303,6 +303,28 @@ } .course-enroll-view { + + .view-course-button { + background: palette(primary, dark); + border-color: palette(primary, dark); + height: 37px; + padding: 7px 18.5px 0 18.5px; + width: auto; + border-radius: 0; + text-align: center; + font-size: 0.9375em; + margin-top: 5px; + + /* IE11 CSS styles */ + @media(min-width: $bp-screen-md) and (-ms-high-contrast: none), (-ms-high-contrast: active) { + @include float(right); + } + + @media(min-width: $bp-screen-lg) { + margin-top: 0px; + } + } + .enroll-button { width: 100%; @@ -385,6 +407,10 @@ } + .section:not(:first-child) { + margin-top: 0; + } + .course-details { float: none; diff --git a/lms/templates/learner_dashboard/course_enroll_2017.underscore b/lms/templates/learner_dashboard/course_enroll_2017.underscore index 4f3d3eddec..b6769ce007 100644 --- a/lms/templates/learner_dashboard/course_enroll_2017.underscore +++ b/lms/templates/learner_dashboard/course_enroll_2017.underscore @@ -1,4 +1,12 @@ -<% if (!is_enrolled) { %> +<% if (is_enrolled && (typeof expired === 'undefined' || expired === false)) { %> + + <% if (is_course_ended) { %> + <%- gettext('View Archived Course') %> + <% } else { %> + <%- gettext('View Course') %> + <% } %> + +<% } else { %> <% if (enrollable_course_runs.length > 0) { %> <% if (enrollable_course_runs.length > 1) { %>