Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #20598 from edx/aehsan/prod-277/update_the_edx_icp_license

Browse Source 
Updated ICP license in edx footer
This commit is contained in:
adeelehsan
2019-05-22 22:12:56 +05:00
committed by GitHub
parent 7177d55f73 791b9d8e5d
commit db50cbe503
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/envs/production.py
View File

@@ -1049,6 +1049,7 @@ COURSES_API_CACHE_TIMEOUT = ENV_TOKENS.get('COURSES_API_CACHE_TIMEOUT', COURSES_
# 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)
ICP_LICENSE_INFO = ENV_TOKENS.get('ICP_LICENSE_INFO', {})
############## Settings for CourseGraph ############################
COURSEGRAPH_JOB_QUEUE = ENV_TOKENS.get('COURSEGRAPH_JOB_QUEUE', DEFAULT_PRIORITY_QUEUE)

19
lms/templates/footer.html
View File

@@ -7,6 +7,7 @@
from openedx.core.djangoapps.lang_pref.api import footer_language_selector_is_enabled
%>
<% footer = get_footer(is_secure=is_secure) %>
<% icp_license_info = getattr(settings, 'ICP_LICENSE_INFO', {})%>
<%namespace name='static' file='static_content.html'/>
% if uses_bootstrap:
@@ -25,7 +26,14 @@
</nav>
## 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']} ${u" | {icp}".format(icp=getattr(settings,'ICP_LICENSE')) if getattr(settings,'ICP_LICENSE',False) else ""}</p>
<p class="copyright">${footer['copyright']}
% if icp_license_info.get('icp_license'):
${u" | {text}".format(text=icp_license_info.get('text'))}
<a href="${icp_license_info.get('icp_license_link', '#')}">
${u" {icp}".format(icp=icp_license_info.get('icp_license'))}
</a>
% endif
</p>
<nav class="navbar legal-nav navbar-expand-sm" aria-label="${_('Legal')}">
<ul class="navbar-nav">
@@ -99,7 +107,14 @@
</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']} ${u" | {icp}".format(icp=getattr(settings,'ICP_LICENSE')) if getattr(settings,'ICP_LICENSE',False) else ""}</p>
<p class="copyright">${footer['copyright']}
% if icp_license_info.get('icp_license'):
${u" | {text}".format(text=icp_license_info.get('text'))}
<a href="${icp_license_info.get('icp_license_link', '#')}">
${u" {icp}".format(icp=icp_license_info.get('icp_license'))}
</a>
% endif
</p>
<nav class="nav-legal" aria-label="${_('Legal')}">
<ul>

8
themes/edx.org/lms/templates/footer.html
View File

@@ -8,6 +8,7 @@
from openedx.core.djangoapps.lang_pref.api import footer_language_selector_is_enabled
%>
<% footer = get_footer(is_secure=is_secure, language=language) %>
<% icp_license_info = getattr(settings, 'ICP_LICENSE_INFO', {})%>
<%namespace name='static' file='static_content.html'/>
@@ -138,7 +139,12 @@
u"EdX, Open edX, and MicroMasters are registered trademarks of edX Inc. "
)}
${u" | {icp}".format(icp=getattr(settings,'ICP_LICENSE')) if getattr(settings,'ICP_LICENSE',False) else ""}
% if icp_license_info.get('icp_license'):
${u" | {text}".format(text=icp_license_info.get('text'))}
<a href="${icp_license_info.get('icp_license_link', '#')}">
${u" {icp}".format(icp=icp_license_info.get('icp_license'))}
</a>
% endif
</p>
</div>
</div>