From fab388ad6bf56d053b1c22251019189a3e344f53 Mon Sep 17 00:00:00 2001 From: jaebradley Date: Wed, 4 Apr 2018 13:48:33 -0400 Subject: [PATCH] add cookie policy banner with feature flag --- common/static/js/src/CookiePolicyBanner.jsx | 6 + lms/static/sass/base-v2/_build.scss | 3 + lms/static/sass/base/_build.scss | 3 + lms/static/sass/bootstrap/_build.scss | 3 + lms/templates/header/header.html | 14 +- package-lock.json | 2276 +++++-------------- package.json | 3 +- scripts/thresholds.sh | 2 +- themes/edx.org/lms/templates/header.html | 5 +- webpack.common.config.js | 2 + 10 files changed, 568 insertions(+), 1749 deletions(-) create mode 100644 common/static/js/src/CookiePolicyBanner.jsx diff --git a/common/static/js/src/CookiePolicyBanner.jsx b/common/static/js/src/CookiePolicyBanner.jsx new file mode 100644 index 0000000000..9c24d7ea0c --- /dev/null +++ b/common/static/js/src/CookiePolicyBanner.jsx @@ -0,0 +1,6 @@ +import React from 'react'; +import CookieBanner from '@edx/cookie-policy-banner'; + +const CookiePolicyBanner = () => ; + +export default CookiePolicyBanner; diff --git a/lms/static/sass/base-v2/_build.scss b/lms/static/sass/base-v2/_build.scss index 526a96b42c..6ca26b3f13 100644 --- a/lms/static/sass/base-v2/_build.scss +++ b/lms/static/sass/base-v2/_build.scss @@ -21,3 +21,6 @@ // // Note: these should be replaced by Bootstrap theme variables @import 'lms/theme/variables-v1'; + +// Cookie Policy Banner +@import '@edx/cookie-policy-banner/build/_cookie-policy-banner.scss'; diff --git a/lms/static/sass/base/_build.scss b/lms/static/sass/base/_build.scss index ad4d478eec..cad14f9545 100644 --- a/lms/static/sass/base/_build.scss +++ b/lms/static/sass/base/_build.scss @@ -31,3 +31,6 @@ @import 'edx-pattern-library-shims/base/variables'; @import 'edx-pattern-library-shims/breadcrumbs'; @import 'edx-pattern-library-shims/buttons'; + +// Cookie Policy Banner +@import '@edx/cookie-policy-banner/build/_cookie-policy-banner.scss'; diff --git a/lms/static/sass/bootstrap/_build.scss b/lms/static/sass/bootstrap/_build.scss index cf941aca74..c37b977190 100644 --- a/lms/static/sass/bootstrap/_build.scss +++ b/lms/static/sass/bootstrap/_build.scss @@ -16,3 +16,6 @@ // Base @import 'base'; @import 'variables'; + +// Cookie Policy Banner +@import '@edx/cookie-policy-banner/build/_cookie-policy-banner.scss'; diff --git a/lms/templates/header/header.html b/lms/templates/header/header.html index c55556b2f1..7c0fb64f5f 100644 --- a/lms/templates/header/header.html +++ b/lms/templates/header/header.html @@ -1,6 +1,6 @@ ## mako -<%page expression_filter="h" args="online_help_token"/> +<%page expression_filter="h" args="online_help_token, use_cookie_banner=False"/> <%namespace name='static' file='../static_content.html'/> <%namespace file='../main.html' import="login_query"/> @@ -14,6 +14,9 @@ from openedx.core.djangolib.markup import HTML, Text # App that handles subdomain specific branding from branding import api as branding_api from openedx.core.djangoapps.lang_pref.api import header_language_selector_is_enabled, released_languages + +# GDPR Flag +from openedx.features.course_experience import ENABLE_GDPR_COMPAT_FLAG %> ## Provide a hook for themes to inject branding on top. @@ -29,6 +32,13 @@ from openedx.core.djangoapps.lang_pref.api import header_language_selector_is_en % endif
+ % if use_cookie_banner and ENABLE_GDPR_COMPAT_FLAG.is_enabled_without_course_context(): + ${static.renderReact( + component="CookiePolicyBanner", + id="cookie-policy-banner", + props={} + )} + % endif
<%include file="navbar-logo-header.html" args="online_help_token=online_help_token"/>