Merge pull request #15090 from edx/e0d/icp-footer

Basic support for an optional ICP number in the footer
This commit is contained in:
Edward Zarecor
2017-05-12 09:28:01 -04:00
committed by GitHub
2 changed files with 6 additions and 2 deletions

View File

@@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-
"""
This is the default template for our main set of AWS servers. This does NOT
cover the content machines, which use content.py
@@ -956,3 +958,6 @@ ENTERPRISE_API_CACHE_TIMEOUT = ENV_TOKENS.get(
# the service, and override the default parameters which are defined in common.py
COURSES_API_CACHE_TIMEOUT = ENV_TOKENS.get('COURSES_API_CACHE_TIMEOUT', COURSES_API_CACHE_TIMEOUT)
# Add an ICP license for serving content in China if your organization is registered to do so
ICP_LICENSE = ENV_TOKENS.get('ICP_LICENSE', None)

View File

@@ -44,7 +44,7 @@
</div>
## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear.
<p class="copyright">${footer['copyright']}</p>
<p class="copyright">${footer['copyright']} ${u" | {icp}".format(icp=getattr(settings,'ICP_LICENSE')) if getattr(settings,'ICP_LICENSE',False) else ""}</p>
<nav class="nav-legal" aria-label="${_('Legal')}">
<ul>
@@ -83,7 +83,6 @@
<link rel="stylesheet" type="text/css" href="${url}"></link>
% endfor
% endif
% if settings.FEATURES.get('ENABLE_COOKIE_CONSENT', False):
<%include file="widgets/cookie-consent.html" />
% endif