From 791b9d8e5df5224d41fb4d50cb50cf1c456fc42a Mon Sep 17 00:00:00 2001
From: adeelehsan <adeel.ehsan@arbisoft.com>
Date: Wed, 15 May 2019 15:07:14 +0500
Subject: [PATCH] Updated ICP license in edx footer

changed ICP license to link and added
sentence with ICP license

PROD-277
---
 lms/envs/production.py                   |  1 +
 lms/templates/footer.html                | 19 +++++++++++++++++--
 themes/edx.org/lms/templates/footer.html |  8 +++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/lms/envs/production.py b/lms/envs/production.py
index 9e9efe918e..99742be2e3 100644
--- a/lms/envs/production.py
+++ b/lms/envs/production.py
@@ -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)
diff --git a/lms/templates/footer.html b/lms/templates/footer.html
index bf76031d26..f682ff586b 100644
--- a/lms/templates/footer.html
+++ b/lms/templates/footer.html
@@ -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>
diff --git a/themes/edx.org/lms/templates/footer.html b/themes/edx.org/lms/templates/footer.html
index c9f7540ab6..f4f8797351 100755
--- a/themes/edx.org/lms/templates/footer.html
+++ b/themes/edx.org/lms/templates/footer.html
@@ -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>