ENT-11 Adding link to enterprise page in the footer

Added enterprise link, moved media kit down to second line, and adjusted styling
to avoid wrapping when possible.
This commit is contained in:
Brittney Exline
2016-12-01 13:12:00 -05:00
parent ff7c2f8c85
commit a42bbd57fb
3 changed files with 16 additions and 9 deletions

View File

@@ -164,6 +164,7 @@ def _footer_social_links():
def _footer_navigation_links(): def _footer_navigation_links():
"""Return the navigation links to display in the footer. """ """Return the navigation links to display in the footer. """
platform_name = configuration_helpers.get_value('platform_name', settings.PLATFORM_NAME)
return [ return [
{ {
"name": link_name, "name": link_name,
@@ -172,13 +173,14 @@ def _footer_navigation_links():
} }
for link_name, link_url, link_title in [ for link_name, link_url, link_title in [
("about", marketing_link("ABOUT"), _("About")), ("about", marketing_link("ABOUT"), _("About")),
("enterprise", marketing_link("ENTERPRISE"),
_("{platform_name} for Business").format(platform_name=platform_name)),
("blog", marketing_link("BLOG"), _("Blog")), ("blog", marketing_link("BLOG"), _("Blog")),
("news", marketing_link("NEWS"), _("News")), ("news", marketing_link("NEWS"), _("News")),
("help-center", settings.SUPPORT_SITE_LINK, _("Help Center")), ("help-center", settings.SUPPORT_SITE_LINK, _("Help Center")),
("contact", marketing_link("CONTACT"), _("Contact")), ("contact", marketing_link("CONTACT"), _("Contact")),
("careers", marketing_link("CAREERS"), _("Careers")), ("careers", marketing_link("CAREERS"), _("Careers")),
("donate", marketing_link("DONATE"), _("Donate")), ("donate", marketing_link("DONATE"), _("Donate")),
("media_kit", marketing_link("MEDIA_KIT"), _("Media Kit"))
] ]
if link_url and link_url != "#" if link_url and link_url != "#"
] ]
@@ -192,6 +194,7 @@ def _footer_legal_links():
("privacy_policy", marketing_link("PRIVACY"), _("Privacy Policy")), ("privacy_policy", marketing_link("PRIVACY"), _("Privacy Policy")),
("accessibility_policy", marketing_link("ACCESSIBILITY"), _("Accessibility Policy")), ("accessibility_policy", marketing_link("ACCESSIBILITY"), _("Accessibility Policy")),
("sitemap", marketing_link("SITE_MAP"), _("Sitemap")), ("sitemap", marketing_link("SITE_MAP"), _("Sitemap")),
("media_kit", marketing_link("MEDIA_KIT"), _("Media Kit")),
] ]
# Backwards compatibility: If a combined "terms of service and honor code" # Backwards compatibility: If a combined "terms of service and honor code"

View File

@@ -6,6 +6,7 @@ from django.test import TestCase
import mock import mock
from branding.api import get_logo_url, get_footer from branding.api import get_logo_url, get_footer
from django.test.utils import override_settings
class TestHeader(TestCase): class TestHeader(TestCase):
@@ -40,8 +41,10 @@ class TestFooter(TestCase):
"TOS_AND_HONOR": "/edx-terms-service", "TOS_AND_HONOR": "/edx-terms-service",
"PRIVACY": "/edx-privacy-policy", "PRIVACY": "/edx-privacy-policy",
"ACCESSIBILITY": "/accessibility", "ACCESSIBILITY": "/accessibility",
"MEDIA_KIT": "/media-kit" "MEDIA_KIT": "/media-kit",
"ENTERPRISE": "/enterprise"
}) })
@override_settings(PLATFORM_NAME='\xe9dX')
def test_get_footer(self): def test_get_footer(self):
actual_footer = get_footer(is_secure=True) actual_footer = get_footer(is_secure=True)
expected_footer = { expected_footer = {
@@ -49,12 +52,12 @@ class TestFooter(TestCase):
' EdX logos are registered trademarks or trademarks of edX Inc.', ' EdX logos are registered trademarks or trademarks of edX Inc.',
'navigation_links': [ 'navigation_links': [
{'url': 'https://edx.org/about-us', 'name': 'about', 'title': 'About'}, {'url': 'https://edx.org/about-us', 'name': 'about', 'title': 'About'},
{'url': 'https://edx.org/enterprise', 'name': 'enterprise', 'title': '\xe9dX for Business'},
{'url': 'https://edx.org/edx-blog', 'name': 'blog', 'title': 'Blog'}, {'url': 'https://edx.org/edx-blog', 'name': 'blog', 'title': 'Blog'},
{'url': 'https://edx.org/news-announcements', 'name': 'news', 'title': 'News'}, {'url': 'https://edx.org/news-announcements', 'name': 'news', 'title': 'News'},
{'url': 'https://support.example.com', 'name': 'help-center', 'title': 'Help Center'}, {'url': 'https://support.example.com', 'name': 'help-center', 'title': 'Help Center'},
{'url': 'https://edx.org/contact', 'name': 'contact', 'title': 'Contact'}, {'url': 'https://edx.org/contact', 'name': 'contact', 'title': 'Contact'},
{'url': 'https://edx.org/donate', 'name': 'donate', 'title': 'Donate'}, {'url': 'https://edx.org/donate', 'name': 'donate', 'title': 'Donate'}
{'url': 'https://edx.org/media-kit', 'name': 'media_kit', 'title': 'Media Kit'}
], ],
'legal_links': [ 'legal_links': [
{'url': 'https://edx.org/edx-terms-service', {'url': 'https://edx.org/edx-terms-service',
@@ -64,7 +67,8 @@ class TestFooter(TestCase):
{'url': 'https://edx.org/accessibility', {'url': 'https://edx.org/accessibility',
'name': 'accessibility_policy', 'name': 'accessibility_policy',
'title': 'Accessibility Policy'}, 'title': 'Accessibility Policy'},
{'url': 'https://edx.org/sitemap', 'name': 'sitemap', 'title': 'Sitemap'} {'url': 'https://edx.org/sitemap', 'name': 'sitemap', 'title': 'Sitemap'},
{'url': 'https://edx.org/media-kit', 'name': 'media_kit', 'title': 'Media Kit'}
], ],
'social_links': [ 'social_links': [
{'url': '#', 'action': 'Like \xe9dX on Facebook', 'name': 'facebook', {'url': '#', 'action': 'Like \xe9dX on Facebook', 'name': 'facebook',

View File

@@ -172,11 +172,11 @@ footer#footer-edx-v3 {
padding: 20px 10px; padding: 20px 10px;
.site-details { .site-details {
@include span-columns(7); @include span-columns(8);
} }
.external-links { .external-links {
@include span-columns(5); @include span-columns(4);
} }
.social-media-links, .social-media-links,
@@ -195,11 +195,11 @@ footer#footer-edx-v3 {
} }
.site-details { .site-details {
@include span-columns(6); @include span-columns(7);
} }
.external-links { .external-links {
@include span-columns(4); @include span-columns(3);
} }
.social-media-links { .social-media-links {