From a5e098902124cbfc8ce6218166f4f384142beaff Mon Sep 17 00:00:00 2001 From: Hamza Munir Date: Thu, 21 Dec 2017 19:05:21 +0500 Subject: [PATCH] Footer Bootstrap new design fixes WIP Fixes for new design as per instruction in this ticket. LEARNER-3131 --- lms/djangoapps/branding/api.py | 1 + lms/djangoapps/branding/tests/test_api.py | 2 + lms/envs/devstack_docker.py | 3 +- .../images/app/google_play_badge_45.png | Bin 4532 -> 4109 bytes lms/static/sass/shared/_footer-edx.scss | 239 +++++++++++------- themes/edx.org/lms/templates/footer.html | 46 ++-- 6 files changed, 174 insertions(+), 117 deletions(-) mode change 100644 => 100755 themes/edx.org/lms/templates/footer.html diff --git a/lms/djangoapps/branding/api.py b/lms/djangoapps/branding/api.py index 0cdc8070fc..7adf42cab3 100644 --- a/lms/djangoapps/branding/api.py +++ b/lms/djangoapps/branding/api.py @@ -273,6 +273,7 @@ def _footer_more_info_links(): ("terms_of_service_and_honor_code", marketing_link("TOS_AND_HONOR"), _("Terms of Service & Honor Code")), ("privacy_policy", marketing_link("PRIVACY"), _("Privacy Policy")), ("accessibility_policy", marketing_link("ACCESSIBILITY"), _("Accessibility Policy")), + ("trademarks", marketing_link("TRADEMARKS"), _("Trademarks")), ("sitemap", marketing_link("SITE_MAP"), _("Sitemap")), ] diff --git a/lms/djangoapps/branding/tests/test_api.py b/lms/djangoapps/branding/tests/test_api.py index 38dc0d83a3..b35ff78ada 100644 --- a/lms/djangoapps/branding/tests/test_api.py +++ b/lms/djangoapps/branding/tests/test_api.py @@ -54,6 +54,7 @@ class TestFooter(TestCase): "DONATE": "/donate", "JOBS": "/jobs", "SITE_MAP": "/sitemap", + "TRADEMARKS": "/trademarks", "TOS_AND_HONOR": "/edx-terms-service", "PRIVACY": "/edx-privacy-policy", "ACCESSIBILITY": "/accessibility", @@ -98,6 +99,7 @@ class TestFooter(TestCase): {'url': 'https://edx.org/accessibility', 'name': 'accessibility_policy', 'title': 'Accessibility Policy'}, + {'url': 'https://edx.org/trademarks', 'name': 'trademarks', 'title': 'Trademarks'}, {'url': 'https://edx.org/sitemap', 'name': 'sitemap', 'title': 'Sitemap'}, ], diff --git a/lms/envs/devstack_docker.py b/lms/envs/devstack_docker.py index 145c28b3af..c61d6e48f1 100644 --- a/lms/envs/devstack_docker.py +++ b/lms/envs/devstack_docker.py @@ -52,7 +52,7 @@ MKTG_URLS = { 'AFFILIATES': '/affiliates', 'BLOG': '/blog', 'CAREERS': '/careers', - 'CONTACT': '/contact', + 'CONTACT': 'https://courses.edx.org/support/contact_us', 'COURSES': '/course', 'DONATE': '/donate', 'ENTERPRISE': '/enterprise', @@ -66,6 +66,7 @@ MKTG_URLS = { 'ROOT': MARKETING_SITE_ROOT, 'SCHOOLS': '/schools-partners', 'SITE_MAP': '/sitemap', + 'TRADEMARKS': '/trademarks', 'TOS': '/edx-terms-service', 'TOS_AND_HONOR': '/edx-terms-service', 'WHAT_IS_VERIFIED_CERT': '/verified-certificate', diff --git a/lms/static/images/app/google_play_badge_45.png b/lms/static/images/app/google_play_badge_45.png index 609f8203a742012441efaf9fc493a0a65f88324f..c1b08d70b85563b6600c6027b461429eb8de40c4 100644 GIT binary patch literal 4109 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 LNkvXXu0mjfC-A}B literal 4532 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