Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cms/templates/widgets/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</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>
Expand Down
2 changes: 1 addition & 1 deletion common/djangoapps/edxmako/shortcuts.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/branding/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions lms/djangoapps/branding/tests/test_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def test_get_footer(self):
{'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'},

Expand Down Expand Up @@ -156,7 +156,7 @@ def test_get_footer(self):
'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'
},
Expand Down
2 changes: 1 addition & 1 deletion lms/djangoapps/branding/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions lms/envs/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -1585,8 +1585,8 @@ def _make_locale_paths(settings): # pylint: disable=missing-function-docstring
# 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
Expand Down
2 changes: 1 addition & 1 deletion lms/templates/index_overlay.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
%>

<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>