From 86852206bc85b5e7e53ab23b8d9247ff34fa895e Mon Sep 17 00:00:00 2001 From: mrey Date: Tue, 30 May 2017 16:58:05 +0200 Subject: [PATCH 1/2] Cookie consent page loaded from navigation template instead of footer template. Following the commit ae9c68691255f1461da0b9d49c548905112cee98, we can see the cookie consent template was loaded from footer template. The login and registration templates do not load footer, so the cookie consent template is not being loader either. With this fix, the cookie consent template is being loaded from navigation template, so it is shown in login and registration pages as well. --- lms/templates/footer.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/lms/templates/footer.html b/lms/templates/footer.html index 386ca23869..7efef21e67 100644 --- a/lms/templates/footer.html +++ b/lms/templates/footer.html @@ -140,6 +140,3 @@ % endfor % endif -% if settings.FEATURES.get('ENABLE_COOKIE_CONSENT', False): - <%include file="widgets/cookie-consent.html" /> -% endif From e54c83fc8d2823e9bc730df579297901972191ee Mon Sep 17 00:00:00 2001 From: mrey Date: Thu, 17 Aug 2017 17:48:16 +0200 Subject: [PATCH 2/2] Fix cookie consent page loaded from navigation template instead of footer template after rebasing master --- lms/templates/navigation/navigation.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lms/templates/navigation/navigation.html b/lms/templates/navigation/navigation.html index d3389465f5..5db3fc03ac 100644 --- a/lms/templates/navigation/navigation.html +++ b/lms/templates/navigation/navigation.html @@ -115,3 +115,6 @@ site_status_msg = get_site_status_msg(course_id) % endif <%include file="../help_modal.html"/> +% if settings.FEATURES.get('ENABLE_COOKIE_CONSENT', False): + <%include file="../widgets/cookie-consent.html" /> +% endif