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

Use https for open.edx.org

Browse Source
This commit is contained in:
Ned Batchelder
2020-11-02 06:10:35 -05:00
parent 8fea5971f8
commit 21d7e6f3b2
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/templates/widgets/footer.html
View File

@@ -55,7 +55,7 @@ from openedx.core.djangolib.markup import HTML, Text
</div>
<div class="footer-about-openedx">
<a href="http://open.edx.org" title="${_("Powered by Open edX")}">
<a href="https://open.edx.org" title="${_("Powered by Open edX")}">
<img alt="${_("Powered by Open edX")}" src="https://files.edx.org/openedx-logos/edx-openedx-logo-tag.png">
</a>
</div>

2
common/djangoapps/edxmako/shortcuts.py
View File

@@ -81,7 +81,7 @@ def marketing_link(name):
# Using urljoin here allows us to enable a marketing site and set
# a site ROOT, but still specify absolute URLs for other marketing
# URLs in the MKTG_URLS setting
# e.g. urljoin('http://marketing.com', 'http://open-edx.org/about') >>> 'http://open-edx.org/about'
# e.g. urljoin('https://marketing.com', 'https://open-edx.org/about') >>> 'https://open-edx.org/about'
return urljoin(marketing_urls.get('ROOT'), marketing_urls.get(name))
# only link to the old pages when the marketing site isn't on
elif not enable_mktg_site and name in link_map:

2
lms/djangoapps/branding/api.py
View File

@@ -90,7 +90,7 @@ def get_footer(is_secure=True, language=settings.LANGUAGE_CODE):
# ...
],
"openedx_link": {
"url": "http://open.edx.org",
"url": "https://open.edx.org",
"title": "Powered by Open edX",
"image": "http://example.com/openedx.png"
}

4
lms/djangoapps/branding/tests/test_api.py
View File

@@ -103,7 +103,7 @@ class TestFooter(TestCase):
{'url': 'https://edx.org/about-us', 'name': 'about', 'title': 'About'},
{'url': business_url, 'name': 'enterprise', 'title': '\xe9dX for Business'},
{'url': 'https://edx.org/affiliate-program', 'name': 'affiliates', 'title': 'Affiliates'},
{'url': 'http://open.edx.org', 'name': 'openedx', 'title': 'Open edX'},
{'url': 'https://open.edx.org', 'name': 'openedx', 'title': 'Open edX'},
{'url': 'https://edx.org/careers', 'name': 'careers', 'title': 'Careers'},
{'url': 'https://edx.org/news-announcements', 'name': 'news', 'title': 'News'},
@@ -156,7 +156,7 @@ class TestFooter(TestCase):
'mobile_links': [],
'logo_image': 'https://edx.org/static/images/logo.png',
'openedx_link': {
'url': 'http://open.edx.org',
'url': 'https://open.edx.org',
'image': 'https://files.edx.org/openedx-logos/edx-openedx-logo-tag.png',
'title': 'Powered by Open edX'
},

2
lms/djangoapps/branding/views.py
View File

@@ -215,7 +215,7 @@ def footer(request):
# ...
],
"openedx_link": {
"url": "http://open.edx.org",
"url": "https://open.edx.org",
"title": "Powered by Open edX",
"image": "http://example.com/openedx.png"
},

4
lms/envs/common.py
View File

@@ -1585,8 +1585,8 @@ PARENTAL_CONSENT_AGE_LIMIT = 13
# Constants for the footer used on the site and shared with other sites
# (such as marketing and the blog) via the branding API.
# URL for OpenEdX displayed in the footer
FOOTER_OPENEDX_URL = "http://open.edx.org"
# URL for Open edX displayed in the footer
FOOTER_OPENEDX_URL = "https://open.edx.org"
# URL for the OpenEdX logo image
# We use logo images served from files.edx.org so we can (roughly) track

2
lms/templates/index_overlay.html
View File

@@ -6,5 +6,5 @@ from openedx.core.djangolib.markup import HTML, Text
%>
<h1>${Text(_(u"Welcome to {platform_name}")).format(platform_name=settings.PLATFORM_NAME)}</h1>
## Translators: 'Open edX' is a registered trademark, please keep this untranslated. See http://open.edx.org for more information.
## Translators: 'Open edX' is a registered trademark, please keep this untranslated. See https://open.edx.org for more information.
<p>${Text(_("It works! Powered by Open edX{registered_trademark}")).format(registered_trademark=HTML("<sup style='font-size: 65%'>&reg;</sup>"))}</p>