diff --git a/templates/gdpr/gdpr_banner.html b/templates/gdpr/gdpr_banner.html index 94f401e8..001fb408 100644 --- a/templates/gdpr/gdpr_banner.html +++ b/templates/gdpr/gdpr_banner.html @@ -1,4 +1,4 @@ -{% if request.COOKIES.gdpr_accepted %} +{% if request.COOKIES.gdpr_accepted or IS_TENANT_SITE %} {% else %} <style> div#gdprBanner { diff --git a/utils/context_processor.py b/utils/context_processor.py index a271ace8..f18bf8f6 100644 --- a/utils/context_processor.py +++ b/utils/context_processor.py @@ -5,18 +5,27 @@ def google_analytics(request): """ Use the variables returned in this function to render your Google Analytics tracking code template. + + Also check whether the site is a tenant site and create a corresponding + variable to indicate this """ host = request.get_host() ga_prop_id = getattr(settings, 'GOOGLE_ANALYTICS_PROPERTY_IDS', False).get( host) + which_urlspy = settings.MULTISITE_CMS_URLS.get(host) if ga_prop_id is None: # Try checking if we have a www in host, if yes we remove # that and check in the dict again if host.startswith('www.'): ga_prop_id = getattr(settings, 'GOOGLE_ANALYTICS_PROPERTY_IDS', False).get(host[4:]) + which_urlspy = settings.MULTISITE_CMS_URLS.get(host[4:]) + return_dict = {} if not settings.DEBUG and ga_prop_id: - return { - 'GOOGLE_ANALYTICS_PROPERTY_ID': ga_prop_id - } - return {} + return_dict['GOOGLE_ANALYTICS_PROPERTY_ID'] = ga_prop_id + + if which_urlspy: + if which_urlspy.endswith("multi"): + return_dict['IS_TENANT_SITE'] = True + + return return_dict