diff --git a/common/djangoapps/student/tests/tests.py b/common/djangoapps/student/tests/tests.py index edbe5b0d39..d93bb56a4e 100644 --- a/common/djangoapps/student/tests/tests.py +++ b/common/djangoapps/student/tests/tests.py @@ -499,11 +499,11 @@ class DashboardTest(ModuleStoreTestCase): self.client.login(username="jack", password="test") response = self.client.get(reverse("dashboard")) - # "Explore courses" is shown in the side panel - self.assertContains(response, "Explore courses") + # "Find courses" is shown in the side panel + self.assertContains(response, "Find courses") # But other links are hidden in the navigation - self.assertNotContains(response, "How it works") + self.assertNotContains(response, "How it Works") self.assertNotContains(response, "Schools & Partners") def test_course_mode_info_with_honor_enrollment(self): diff --git a/lms/static/sass/multicourse/_dashboard.scss b/lms/static/sass/multicourse/_dashboard.scss index 114f50b8a5..d181151b44 100644 --- a/lms/static/sass/multicourse/_dashboard.scss +++ b/lms/static/sass/multicourse/_dashboard.scss @@ -212,79 +212,9 @@ } } -.xseries-epmty-section{ - @include float(left); - @include outer-container; - @include span-columns(9); -} -// CASE: empty dashboard - .empty-dashboard-message { - border: 3px solid $gray-l4; - background: $gray-l6; - padding: ($baseline*2) 0; - text-align: center; - - p { - @include font-size(24); - color: $lighter-base-font-color; - margin-bottom: $baseline; - text-shadow: 0 1px rgba(255,255,255, 0.6); - } - - a { - background-color: $blue; - border: 1px solid $blue; - box-shadow: 0 1px 8px 0 $shadow-l1; - @include box-sizing(border-box); - color: $white; - font-family: $sans-serif; - display: inline-block; - letter-spacing: 1px; - margin-top: ($baseline/4); - margin-left: ($baseline/4); - padding: 15px 20px; - - &:hover, &:focus { - background: $blue-l2; - text-decoration: none; - } - } - - .find-xseries-programs { - @extend %btn-pl-black-base; - .action-xseries-icon { - @include float(left); - display: inline; - - @include margin-right($baseline*0.4); - background: url('#{$static-path}/images/icon-sm-xseries-white.png') no-repeat; - background-color: transparent; - - width: ($baseline*1.1); - height: ($baseline*1.1); - } - &:hover, - &:focus { - - .action-xseries-icon { - @include float(left); - display: inline; - - @include margin-right($baseline*0.4); - background: url('#{$static-path}/images/icon-sm-xseries-black.png') no-repeat; - background-color: transparent; - - width: ($baseline*1.1); - height: ($baseline*1.1); - } - } - } - } - // +Dashboard - Course Listing // ==================== .dashboard { - .my-courses { @include float(left); margin: 0; @@ -301,6 +231,43 @@ } } + // CASE: empty dashboard + .empty-dashboard-message { + padding: ($baseline*2) 0; + text-align: center; + + p { + color: $lighter-base-font-color; + font-style: italic; + margin-bottom: $baseline; + text-shadow: 0 1px rgba(255,255,255, 0.6); + } + + a { + background: rgb(240,240,240); + @include background-image($button-bg-image); + background-color: $button-bg-color; + border: 1px solid $border-color-2; + border-radius: 4px; + box-shadow: 0 1px 8px 0 $shadow-l1; + @include box-sizing(border-box); + color: $base-font-color; + font-family: $sans-serif; + display: inline-block; + letter-spacing: 1px; + @include margin-left($baseline/4); + padding: 5px 10px; + text-shadow: 0 1px rgba(255,255,255, 0.6); + + &:hover, &:focus { + color: $link-color; + text-decoration: none; + } + } + } + + // ==================== + // UI: course list .listing-courses { @extend %ui-no-list; diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 87a36932b3..0550c5c0d5 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -103,13 +103,12 @@ from openedx.core.djangolib.js_utils import dump_js_escaped_json, js_escaped_str % else:
-

${_("You are not enrolled in any courses yet.")}

+

${_("Looks like you haven't enrolled in any courses yet.")}

% if settings.FEATURES.get('COURSES_ARE_BROWSABLE'): - ${_("Explore courses")} + ${_("Find courses now!")} - %endif
% endif diff --git a/lms/templates/learner_dashboard/programs.html b/lms/templates/learner_dashboard/programs.html index 7452530a1c..d563522aa2 100644 --- a/lms/templates/learner_dashboard/programs.html +++ b/lms/templates/learner_dashboard/programs.html @@ -20,17 +20,6 @@ ProgramListFactory({ <%block name="pagetitle">${_("Programs")}
- % if not len(programs): -
-
-

${_("You are not enrolled in any XSeries Programs yet.")}

- - ${_("Explore XSeries Programs")} - -
-
- % else: -
- % endif +