Commit 4d1694d0 by Edward Zarecor Committed by GitHub

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

Basic support for an optional ICP number in the footer
parents 18268e6f 6aea3dc0
# -*- coding: utf-8 -*-
""" """
This is the default template for our main set of AWS servers. This does NOT This is the default template for our main set of AWS servers. This does NOT
cover the content machines, which use content.py cover the content machines, which use content.py
...@@ -956,3 +958,6 @@ ENTERPRISE_API_CACHE_TIMEOUT = ENV_TOKENS.get( ...@@ -956,3 +958,6 @@ ENTERPRISE_API_CACHE_TIMEOUT = ENV_TOKENS.get(
# the service, and override the default parameters which are defined in common.py # 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) 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)
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</div> </div>
## Site operators: Please do not remove this paragraph! This attributes back to edX and makes your acknowledgement of edX's trademarks clear. ## 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')}"> <nav class="nav-legal" aria-label="${_('Legal')}">
<ul> <ul>
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
<link rel="stylesheet" type="text/css" href="${url}"></link> <link rel="stylesheet" type="text/css" href="${url}"></link>
% endfor % endfor
% endif % endif
% if settings.FEATURES.get('ENABLE_COOKIE_CONSENT', False): % if settings.FEATURES.get('ENABLE_COOKIE_CONSENT', False):
<%include file="widgets/cookie-consent.html" /> <%include file="widgets/cookie-consent.html" />
% endif % endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment