diff --git a/lms/static/sass/features/_course-experience.scss b/lms/static/sass/features/_course-experience.scss index 5205cdc282..623820d4a1 100644 --- a/lms/static/sass/features/_course-experience.scss +++ b/lms/static/sass/features/_course-experience.scss @@ -501,7 +501,7 @@ border-bottom: 1px solid $border-color; .date { - font-size: font-size(small); + font-size: 0.875rem; font-weight: $font-light; float: none; padding-bottom: ($baseline/4); @@ -516,6 +516,26 @@ max-width: 100%; } } + + .well { + box-shadow: inset 0 1px 2px 1px $shadow; + padding: 1.25rem; + background: $gray-100; + } + } + + .breadcrumbs { + font-size: 0.875rem; + + .nav-item { + @include margin-left($baseline/4); + } + + .fa-angle-right { + transform: rotateY(0deg) #{"/*rtl: rotateY(180deg)*/"}; + + @include margin-left($baseline/4); + } } } diff --git a/openedx/core/djangoapps/courseware_api/serializers.py b/openedx/core/djangoapps/courseware_api/serializers.py index 5b66b25aa5..7f47c763b2 100644 --- a/openedx/core/djangoapps/courseware_api/serializers.py +++ b/openedx/core/djangoapps/courseware_api/serializers.py @@ -86,6 +86,7 @@ class CourseInfoSerializer(serializers.Serializer): # pylint: disable=abstract- is_staff = serializers.BooleanField() can_load_courseware = serializers.DictField() notes = serializers.DictField() + marketing_url = serializers.CharField() def __init__(self, *args, **kwargs): """ diff --git a/openedx/features/course_experience/views/course_updates.py b/openedx/features/course_experience/views/course_updates.py index 7ce5779ddd..f7c71ce797 100644 --- a/openedx/features/course_experience/views/course_updates.py +++ b/openedx/features/course_experience/views/course_updates.py @@ -82,6 +82,8 @@ class CourseUpdatesFragmentView(EdxFragmentView): """ A fragment to render the updates page for a course. """ + _uses_pattern_library = False + def render_to_fragment(self, request, course_id=None, **kwargs): """ Renders the course's home page as a fragment. diff --git a/requirements/edx/base.in b/requirements/edx/base.in index df3eae6a75..59cdb5752a 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -39,6 +39,7 @@ chem # A helper library for chemistry calculation contextlib2 # We need contextlib2.ExitStack so we can stop using contextlib.nested which doesn't exist in python 3 defusedxml Django # Web application framework +django-appconf django-celery # Only used for the CacheBackend for celery results django-cookies-samesite # Middleware which allows SameSite=None flag for session and csrf cookies in Django<3.0.5 django-config-models>=1.0.0 # Configuration models for Django allowing config management with auditing diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 6045ec16cc..3cac0afabc 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -50,7 +50,7 @@ cssutils==1.0.2 # via pynliner ddt==1.3.1 # via -c requirements/edx/../constraints.txt, xblock-drag-and-drop-v2, xblock-poll decorator==4.4.2 # via pycontracts defusedxml==0.6.0 # via -r requirements/edx/base.in, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core -git+https://github.com/django-compressor/django-appconf@1526a842ee084b791aa66c931b3822091a442853#egg=django-appconf # via -r requirements/edx/github.in, django-statici18n +django-appconf==1.0.4 # via -r requirements/edx/base.in, django-statici18n git+https://github.com/edx/django-babel-underscore.git@37705f7377a4d0a4e673f1431895ce28a8860cd7#egg=django-babel-underscore==0.6.0 # via -r requirements/edx/github.in git+https://github.com/Zegocover/enmerkar.git@dbc113798aa4beabdfa2d00e6fef48248eb0f185#egg=django-babel==0.6.3.dev0 # via -r requirements/edx/github.in django-celery==3.3.1 # via -r requirements/edx/base.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 6967538aa8..5788ae2f98 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -51,7 +51,6 @@ contextlib2==0.6.0.post1 # via -r requirements/edx/testing.txt coreapi==2.3.3 # via -r requirements/edx/testing.txt, drf-yasg coreschema==0.0.4 # via -r requirements/edx/testing.txt, coreapi, drf-yasg coverage==5.1 # via -r requirements/edx/testing.txt, pytest-cov -git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0 # via -r requirements/edx/testing.txt git+https://github.com/edx/crowdsourcehinter.git@2178ac72891392106ffef389651aef374177d294#egg=crowdsourcehinter-xblock==0.4 # via -r requirements/edx/testing.txt cryptography==2.9.2 # via -r requirements/edx/testing.txt, django-fernet-fields, edx-enterprise, social-auth-core cssselect==1.1.0 # via -r requirements/edx/testing.txt, pyquery @@ -61,7 +60,7 @@ decorator==4.4.2 # via -r requirements/edx/testing.txt, pycontracts defusedxml==0.6.0 # via -r requirements/edx/testing.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core diff-cover==3.0.1 # via -r requirements/edx/testing.txt distlib==0.3.0 # via -r requirements/edx/testing.txt, virtualenv -git+https://github.com/django-compressor/django-appconf@1526a842ee084b791aa66c931b3822091a442853#egg=django-appconf # via -r requirements/edx/testing.txt, django-statici18n +django-appconf==1.0.4 # via -r requirements/edx/testing.txt, django-statici18n git+https://github.com/edx/django-babel-underscore.git@37705f7377a4d0a4e673f1431895ce28a8860cd7#egg=django-babel-underscore==0.6.0 # via -r requirements/edx/testing.txt git+https://github.com/Zegocover/enmerkar.git@dbc113798aa4beabdfa2d00e6fef48248eb0f185#egg=django-babel==0.6.3.dev0 # via -r requirements/edx/testing.txt django-celery==3.3.1 # via -r requirements/edx/testing.txt @@ -307,7 +306,8 @@ tqdm==4.46.1 # via -r requirements/edx/testing.txt, nltk transifex-client==0.13.4 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt typed-ast==1.4.1 # via -r requirements/edx/testing.txt, astroid unicodecsv==0.14.1 # via -r requirements/edx/testing.txt, edx-enterprise -unidiff==0.6.0 # via -r requirements/edx/testing.txt, coverage-pytest-plugin +unidiff==0.6.0 # via -r requirements/edx/testing.txt +git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0 # via -r requirements/edx/testing.txt uritemplate==3.0.1 # via -r requirements/edx/testing.txt, coreapi, drf-yasg urllib3==1.25.9 # via -r requirements/edx/testing.txt, elasticsearch, geoip2, requests, selenium, transifex-client user-util==0.2 # via -r requirements/edx/testing.txt diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 07d7f8f160..9bf1959c47 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -88,4 +88,3 @@ git+https://github.com/edx/xblock-lti-consumer.git@v1.3.1#egg=lti_consumer-xbloc git+https://github.com/open-craft/xblock-poll@da2d8fd21791a7af128595cf82bee83ee579e00f#egg=xblock-poll==1.9.6 git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.2.10#egg=xblock-drag-and-drop-v2==2.2.10 -git+https://github.com/django-compressor/django-appconf@1526a842ee084b791aa66c931b3822091a442853#egg=django-appconf diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 93f0a0417d..470a00ba1c 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -50,7 +50,6 @@ contextlib2==0.6.0.post1 # via -r requirements/edx/base.txt coreapi==2.3.3 # via -r requirements/edx/base.txt, drf-yasg coreschema==0.0.4 # via -r requirements/edx/base.txt, coreapi, drf-yasg coverage==5.1 # via -r requirements/edx/coverage.txt, pytest-cov -git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0 # via -r requirements/edx/testing.in git+https://github.com/edx/crowdsourcehinter.git@2178ac72891392106ffef389651aef374177d294#egg=crowdsourcehinter-xblock==0.4 # via -r requirements/edx/base.txt cryptography==2.9.2 # via -r requirements/edx/base.txt, django-fernet-fields, edx-enterprise, social-auth-core cssselect==1.1.0 # via -r requirements/edx/testing.in, pyquery @@ -60,7 +59,7 @@ decorator==4.4.2 # via -r requirements/edx/base.txt, pycontracts defusedxml==0.6.0 # via -r requirements/edx/base.txt, djangorestframework-xml, ora2, python3-openid, python3-saml, safe-lxml, social-auth-core diff-cover==3.0.1 # via -r requirements/edx/coverage.txt distlib==0.3.0 # via virtualenv -git+https://github.com/django-compressor/django-appconf@1526a842ee084b791aa66c931b3822091a442853#egg=django-appconf # via -r requirements/edx/base.txt, django-statici18n +django-appconf==1.0.4 # via -r requirements/edx/base.txt, django-statici18n git+https://github.com/edx/django-babel-underscore.git@37705f7377a4d0a4e673f1431895ce28a8860cd7#egg=django-babel-underscore==0.6.0 # via -r requirements/edx/base.txt git+https://github.com/Zegocover/enmerkar.git@dbc113798aa4beabdfa2d00e6fef48248eb0f185#egg=django-babel==0.6.3.dev0 # via -r requirements/edx/base.txt django-celery==3.3.1 # via -r requirements/edx/base.txt @@ -286,7 +285,8 @@ tqdm==4.46.1 # via -r requirements/edx/base.txt, nltk transifex-client==0.13.4 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.in typed-ast==1.4.1 # via astroid unicodecsv==0.14.1 # via -r requirements/edx/base.txt, edx-enterprise -unidiff==0.6.0 # via -r requirements/edx/testing.in, coverage-pytest-plugin +unidiff==0.6.0 # via -r requirements/edx/testing.in +git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0 # via -r requirements/edx/testing.in uritemplate==3.0.1 # via -r requirements/edx/base.txt, coreapi, drf-yasg urllib3==1.25.9 # via -r requirements/edx/base.txt, elasticsearch, geoip2, requests, selenium, transifex-client user-util==0.2 # via -r requirements/edx/base.txt