From 3cb87802843f31a5fa7c8cff3365f13fb621e673 Mon Sep 17 00:00:00 2001 From: James Tauber Date: Tue, 13 May 2014 17:08:46 -0400 Subject: [PATCH] Separate edX / Open edX footer. We need to use an Open edX footer by default (and that's what all non-edx.org instances should base their footer off) and only use the edX footer on edx.org. This commit uses `SITE_NAME` to determine which footer to use. Sites using theming or micro-sites with a `SITE_NAME` not ending in `edx.org` should not be affected. --- .../courseware/tests/test_footer.py | 35 +++++ .../courseware/tests/test_microsites.py | 1 + .../images/edx-openedx-logo-tag-dark.png | Bin 0 -> 2539 bytes .../images/edx-openedx-logo-tag-light.png | Bin 0 -> 2702 bytes lms/static/images/edx-openedx-logo-tag.png | Bin 0 -> 2596 bytes lms/static/images/logo-placeholder.png | Bin 0 -> 4243 bytes lms/static/sass/shared/_footer.scss | 142 ++++++++++++------ lms/templates/edx_footer.html | 91 +++++++++++ lms/templates/footer.html | 79 ++++------ lms/templates/main.html | 8 +- lms/templates/main_django.html | 2 +- 11 files changed, 257 insertions(+), 101 deletions(-) create mode 100644 lms/djangoapps/courseware/tests/test_footer.py create mode 100644 lms/static/images/edx-openedx-logo-tag-dark.png create mode 100644 lms/static/images/edx-openedx-logo-tag-light.png create mode 100644 lms/static/images/edx-openedx-logo-tag.png create mode 100644 lms/static/images/logo-placeholder.png create mode 100644 lms/templates/edx_footer.html diff --git a/lms/djangoapps/courseware/tests/test_footer.py b/lms/djangoapps/courseware/tests/test_footer.py new file mode 100644 index 0000000000..25d7d2f453 --- /dev/null +++ b/lms/djangoapps/courseware/tests/test_footer.py @@ -0,0 +1,35 @@ +""" +Tests related to the basic footer-switching based off SITE_NAME to ensure +edx.org uses an edx footer but other instances use an Open edX footer. +""" + +from django.test import TestCase +from django.test.utils import override_settings + + +class TestFooter(TestCase): + + @override_settings(SITE_NAME="edx.org") + def test_edx_footer(self): + """ + Verify that the homepage, when accessed at edx.org, has the edX footer + """ + + resp = self.client.get('/') + self.assertEqual(resp.status_code, 200) + + # assert that footer template has been properly overriden on homepage + self.assertContains(resp, 'EdX is a non-profit created by founding partners Harvard and MIT') + + @override_settings(SITE_NAME="example.com") + def test_openedx_footer(self): + """ + Verify that the homepage, when accessed at something other than + edx.org, has the Open edX footer + """ + + resp = self.client.get('/') + self.assertEqual(resp.status_code, 200) + + # assert that footer template has been properly overriden on homepage + self.assertContains(resp, 'Powered by Open edX') diff --git a/lms/djangoapps/courseware/tests/test_microsites.py b/lms/djangoapps/courseware/tests/test_microsites.py index 52105f33d8..c6e2f1d130 100644 --- a/lms/djangoapps/courseware/tests/test_microsites.py +++ b/lms/djangoapps/courseware/tests/test_microsites.py @@ -56,6 +56,7 @@ class TestMicrosites(ModuleStoreTestCase, LoginEnrollmentTestCase): self.activate_user(email) + @override_settings(SITE_NAME=MICROSITE_TEST_HOSTNAME) def test_microsite_anonymous_homepage_content(self): """ Verify that the homepage, when accessed via a Microsite domain, returns diff --git a/lms/static/images/edx-openedx-logo-tag-dark.png b/lms/static/images/edx-openedx-logo-tag-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..a1da4e1c4b461da02a3fb312a1bab1c16ad2826d GIT binary patch literal 2539 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 IM6N<$f_0+$Bme*a literal 0 HcmV?d00001 diff --git a/lms/static/images/edx-openedx-logo-tag.png b/lms/static/images/edx-openedx-logo-tag.png new file mode 100644 index 0000000000000000000000000000000000000000..1ee962690e3f3fb6d139f392fb4a7e39200155e6 GIT binary patch literal 2596 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 +<%! from django.utils.translation import ugettext as _ %> +<%namespace name='static' file='static_content.html'/> + +
+ +
diff --git a/lms/templates/footer.html b/lms/templates/footer.html index b6bf2cd84a..9e1e43f2af 100644 --- a/lms/templates/footer.html +++ b/lms/templates/footer.html @@ -37,56 +37,41 @@ -
- ${_('{platform_name} Logo').format(platform_name=platform_name())} - -

${_("{platform_name} is a non-profit created by founding partners {Harvard} and {MIT} whose mission is to bring the best of higher education to students of all ages anywhere in the world, wherever there is Internet access. {platform_name}'s free online MOOCs are interactive and subjects include computer science, public health, and artificial intelligence.").format(platform_name="EdX", Harvard="Harvard", MIT="MIT")}

+ + +

${_("© 2014 {platform_name}, some rights reserved").format(platform_name=settings.PLATFORM_NAME)}

+
-
- - -

${_("© 2014 {platform_name}, some rights reserved.").format(platform_name=settings.PLATFORM_NAME)}

- - + ## please leave this link and use one of the logos provided +
+

+ + ## standard powered-by logo + Powered by Open edX + ## greyscale logo for dark background + ## Powered by Open edX + ## greyscale logo for light background + ## Powered by Open edX + +

diff --git a/lms/templates/main.html b/lms/templates/main.html index 8b1603f83a..4ccbb888d6 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -73,7 +73,11 @@ header_extra_file = None header_file = microsite.get_template_path('navigation.html') google_analytics_file = microsite.get_template_path('google_analytics.html') - footer_file = microsite.get_template_path('footer.html') + + if getattr(settings, 'SITE_NAME', '').endswith('edx.org'): + footer_file = microsite.get_template_path('edx_footer.html') + else: + footer_file = microsite.get_template_path('footer.html') style_overrides_file = microsite.get_value('css_overrides_file') %> @@ -130,5 +134,3 @@ html.escape(enrollment_action) ) if course_id and enrollment_action else "" } - - diff --git a/lms/templates/main_django.html b/lms/templates/main_django.html index ceef729d6e..43b7afe02c 100644 --- a/lms/templates/main_django.html +++ b/lms/templates/main_django.html @@ -36,7 +36,7 @@ {% block bodyextra %}{% endblock %} - {% include "footer.html" %} + {% include "edx_footer.html" %} {% compressed_js 'application' %} {% compressed_js 'module-js' %}