diff --git a/common/djangoapps/student/views/dashboard.py b/common/djangoapps/student/views/dashboard.py index 9a8d844e0a..e63fa336eb 100644 --- a/common/djangoapps/student/views/dashboard.py +++ b/common/djangoapps/student/views/dashboard.py @@ -45,7 +45,6 @@ from openedx.core.djangoapps.util.maintenance_banner import add_maintenance_bann from openedx.core.djangoapps.waffle_utils import WaffleFlag, WaffleFlagNamespace from openedx.core.djangolib.markup import HTML, Text from openedx.features.enterprise_support.api import get_dashboard_consent_notification -from openedx.features.journals.api import journals_enabled from shoppingcart.api import order_history from shoppingcart.models import CourseRegistrationCode, DonationConfiguration from student.helpers import cert_info, check_verify_status_by_course, get_resume_urls_for_enrollments @@ -873,7 +872,6 @@ def student_dashboard(request): 'nav_hidden': True, 'inverted_programs': inverted_programs, 'show_program_listing': ProgramsApiConfig.is_enabled(), - 'show_journal_listing': journals_enabled(), # TODO: Dashboard Plugin required 'show_dashboard_tabs': True, 'disable_courseware_js': True, 'display_course_modes_on_dashboard': enable_verified_certificates and display_course_modes_on_dashboard, diff --git a/common/djangoapps/student/views/management.py b/common/djangoapps/student/views/management.py index 8d1dab05ee..3bfc0c0391 100644 --- a/common/djangoapps/student/views/management.py +++ b/common/djangoapps/student/views/management.py @@ -64,7 +64,6 @@ from openedx.core.djangoapps.user_api.errors import UserAPIInternalError, UserNo from openedx.core.djangoapps.user_api.models import UserRetirementRequest from openedx.core.djangoapps.user_api.preferences import api as preferences_api from openedx.core.djangolib.markup import HTML, Text -from openedx.features.journals.api import get_journals_context from student.forms import AccountCreationForm, PasswordResetFormNoActive, get_registration_extension_form from student.helpers import DISABLE_UNENROLL_CERT_STATES, cert_info, generate_activation_email_context from student.message_types import EmailChange, EmailChangeConfirmation, PasswordReset, RecoveryEmailCreate @@ -176,9 +175,6 @@ def index(request, extra_context=None, user=AnonymousUser()): # Add marketable programs to the context. context['programs_list'] = get_programs_with_type(request.site, include_hidden=False) - # TODO: Course Listing Plugin required - context['journal_info'] = get_journals_context(request) - return render_to_response('index.html', context) diff --git a/lms/djangoapps/courseware/views/views.py b/lms/djangoapps/courseware/views/views.py index 8906b253f0..a5a490176e 100644 --- a/lms/djangoapps/courseware/views/views.py +++ b/lms/djangoapps/courseware/views/views.py @@ -99,7 +99,6 @@ from openedx.features.course_experience.views.course_dates import CourseDatesFra from openedx.features.course_experience.waffle import ENABLE_COURSE_ABOUT_SIDEBAR_HTML from openedx.features.course_experience.waffle import waffle as course_experience_waffle from openedx.features.enterprise_support.api import data_sharing_consent_required -from openedx.features.journals.api import get_journals_context from shoppingcart.utils import is_shopping_cart_enabled from student.models import CourseEnrollment, UserTestGroup from track import segment @@ -247,7 +246,6 @@ def courses(request): 'courses': courses_list, 'course_discovery_meanings': course_discovery_meanings, 'programs_list': programs_list, - 'journal_info': get_journals_context(request), # TODO: Course Listing Plugin required } ) diff --git a/lms/djangoapps/learner_dashboard/views.py b/lms/djangoapps/learner_dashboard/views.py index 847e868d90..1101c3a122 100644 --- a/lms/djangoapps/learner_dashboard/views.py +++ b/lms/djangoapps/learner_dashboard/views.py @@ -7,7 +7,6 @@ from django.views.decorators.http import require_GET from edxmako.shortcuts import render_to_response from lms.djangoapps.learner_dashboard.programs import ProgramDetailsFragmentView, ProgramsFragmentView from openedx.core.djangoapps.programs.models import ProgramsApiConfig -from openedx.features.journals.api import journals_enabled @login_required @@ -23,7 +22,6 @@ def program_listing(request): 'nav_hidden': True, 'show_dashboard_tabs': True, 'show_program_listing': programs_config.enabled, - 'show_journal_listing': journals_enabled(), # TODO: Dashboard Plugin required 'uses_pattern_library': True, } diff --git a/lms/static/sass/_build-lms-v1.scss b/lms/static/sass/_build-lms-v1.scss index 933a5fcfe1..53143f9266 100644 --- a/lms/static/sass/_build-lms-v1.scss +++ b/lms/static/sass/_build-lms-v1.scss @@ -70,7 +70,6 @@ @import 'features/bookmarks-v1'; @import "features/announcements"; @import 'features/learner-profile'; -@import 'features/journals'; @import 'features/_unsupported-browser-alert'; @import 'features/content-type-gating'; @import 'features/course-duration-limits'; diff --git a/lms/static/sass/_build-lms-v2.scss b/lms/static/sass/_build-lms-v2.scss index 3ed3e85a6e..124f3a8544 100644 --- a/lms/static/sass/_build-lms-v2.scss +++ b/lms/static/sass/_build-lms-v2.scss @@ -32,7 +32,6 @@ @import 'features/course-search'; @import 'features/course-sock'; @import 'features/course-upgrade-message'; -@import 'features/journals'; @import 'features/content-type-gating'; diff --git a/lms/static/sass/features/_journals.scss b/lms/static/sass/features/_journals.scss deleted file mode 100644 index 784248d7e9..0000000000 --- a/lms/static/sass/features/_journals.scss +++ /dev/null @@ -1,173 +0,0 @@ -// journal catalog listing -.journals-listing-item { - box-sizing: border-box; - box-shadow: 1px 2px 5px #ccc; - position: relative; - height: 360px; - overflow: visible; - min-height: 0; - border: none; - display: block; - margin: 0 auto 40px; - background: white; - border-radius: 0; - - .journal-image { - height: 142px; - position: relative; - overflow: hidden; - - .cover-image { - height: 142px; - - img { - width: 100%; - height: auto; - min-height: 100%; - } - - &::before { - content: ''; - position: absolute; - left: 0; - right: 0; - top: 0; - bottom: 0; - margin: auto; - background: black; - opacity: 0; - transition: all 0.2s ease-out; - } - - .learn-more { - left: calc(50% - 100px); - box-sizing: border-box; - position: absolute; - z-index: 100; - top: 62px; - padding: 0 20px; - width: 200px; - height: 50px; - border-color: #0074b4; - border-radius: 3px; - background: #0074b4; - color: #fff; - line-height: 50px; - text-align: center; - opacity: 0; - text-transform: none; - transition: all 0.25s ease; - } - } - } - - .banner { - background: #065784; - color: white; - - @include padding-right(15px); - - line-height: 18px; - font-weight: bold; - font-size: 0.7em; - text-align: right; - text-transform: uppercase; - } - - .journal-info { - padding: 12px 15px 5px; - - .journal-org { - font-weight: normal; - font-size: 0.9em; - color: #3d3e3f; - margin: 0; - line-height: 16px; - } - - .journal-title { - max-height: 55px; - overflow: hidden; - color: #222; - font-size: 1.25em; - line-height: 1.333; - margin-bottom: 5px; - } - - .journal-subtitle { - font-size: 1em; - margin-bottom: 33px; - line-height: 1.25em; - height: 40px; - color: #646464; - overflow: hidden; - } - } - - .journal-footer { - display: table; - width: 100%; - padding: 0 15px 15px; - position: absolute; - bottom: 0; - - .availability, - .journal-logo { - display: table-cell; - vertical-align: middle; - } - - .availability { - text-align: left; - font-size: 0.9em; - line-height: 20px; - color: #3d3e3f; - } - - .journal-logo { - text-align: right; - width: 75px; - } - } - - &::before, - &::after { - box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.2); - content: ''; - position: absolute; - width: 100%; - height: 100%; - background: #d5d5d5; - border: 1px solid #b5b5b5; - } - - &::before { - @include left(-5px); - - top: -5px; - z-index: -1; - } - - &::after { - @include left(-10px); - - top: -10px; - z-index: -2; - } - - &:hover { - opacity: 1; - - .journal-image { - .cover-image { - .learn-more { - opacity: 1; - } - - &::before { - opacity: 0.6; - } - } - } - } -} diff --git a/lms/templates/courses_list.html b/lms/templates/courses_list.html index 5eeaeca2bb..18b8851b7c 100644 --- a/lms/templates/courses_list.html +++ b/lms/templates/courses_list.html @@ -7,20 +7,6 @@ % if settings.FEATURES.get('COURSES_ARE_BROWSABLE'):
- -