Merge pull request #5030 from edx/revert-5024-sanchez/ECOM-216-django-template-settings

Revert "The main django template needs header and footer feature flags."

common/djangoapps/edxmako/shortcuts.py

@@ -77,32 +77,6 @@ def marketing_link_context_processor(request):
     )
 
 
-def header_footer_context_processor(request):
-    """
-    A django context processor to pass feature flags through to all Django
-    Templates that are related to the display of the header and footer in
-    the edX platform.
-    """
-    # TODO: ECOM-136 Remove this processor with the corresponding header and footer feature flags.
-    return dict(
-        [
-            ("ENABLE_NEW_EDX_HEADER", settings.FEATURES.get("ENABLE_NEW_EDX_HEADER", False)),
-            ("ENABLE_NEW_EDX_FOOTER", settings.FEATURES.get("ENABLE_NEW_EDX_FOOTER", False))
-        ]
-    )
-
-
-def open_source_footer_context_processor(request):
-    """
-    Checks the site name to determine whether to use the edX.org footer or the Open Source Footer.
-    """
-    return dict(
-        [
-            ("IS_EDX_DOMAIN", settings.FEATURES.get('IS_EDX_DOMAIN', False))
-        ]
-    )
-
-
 def render_to_string(template_name, dictionary, context=None, namespace='main'):
 
     # see if there is an override template defined in the microsite

common/djangoapps/edxmako/tests.py

 
 from mock import patch, Mock
 import unittest
-import ddt
 
 from django.conf import settings
 from django.http import HttpResponse
@@ -11,16 +10,11 @@ from django.test.client import RequestFactory
 from django.core.urlresolvers import reverse
 import edxmako.middleware
 from edxmako import add_lookup, LOOKUP
-from edxmako.shortcuts import (
-    marketing_link,
-    render_to_string,
-    header_footer_context_processor,
-    open_source_footer_context_processor
-)
+from edxmako.shortcuts import marketing_link, render_to_string
 from student.tests.factories import UserFactory
 from util.testing import UrlResetMixin
 
-@ddt.ddt
+
 class ShortcutsTests(UrlResetMixin, TestCase):
     """
     Test the edxmako shortcuts file
@@ -40,26 +34,6 @@ class ShortcutsTests(UrlResetMixin, TestCase):
             link = marketing_link('ABOUT')
             self.assertEquals(link, expected_link)
 
-    @ddt.data((True, True), (False, False), (False, True), (True, False))
-    @ddt.unpack
-    def test_header_and_footer(self, header_setting, footer_setting):
-        with patch.dict('django.conf.settings.FEATURES', {
-            'ENABLE_NEW_EDX_HEADER': header_setting,
-            'ENABLE_NEW_EDX_FOOTER': footer_setting,
-        }):
-            result = header_footer_context_processor({})
-            self.assertEquals(footer_setting, result.get('ENABLE_NEW_EDX_FOOTER'))
-            self.assertEquals(header_setting, result.get('ENABLE_NEW_EDX_HEADER'))
-
-    @ddt.data(True, False)
-    @ddt.unpack
-    def test_edx_footer(self, expected_result):
-        with patch.dict('django.conf.settings.FEATURES', {
-            'IS_EDX_DOMAIN': expected_result
-        }):
-            result = open_source_footer_context_processor({})
-            self.assertEquals(expected_result, result.get('IS_EDX_DOMAIN'))
-
 
 class AddLookupTests(TestCase):
     """

lms/envs/common.py

@@ -367,12 +367,6 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     # Hack to get required link URLs to password reset templates
     'edxmako.shortcuts.marketing_link_context_processor',
 
-    # Allows the open edX footer to be leveraged in Django Templates.
-    'edxmako.shortcuts.open_source_footer_context_processor',
-
-    # TODO: Used for header and footer feature flags. Remove as part of ECOM-136
-    'edxmako.shortcuts.header_footer_context_processor',
-
     # Shoppingcart processor (detects if request.user has a cart)
     'shoppingcart.context_processor.user_has_cart_context_processor',
 )

lms/templates/main.html

@@ -83,7 +83,7 @@
 
     google_analytics_file = microsite.get_template_path('google_analytics.html')
 
-    if settings.FEATURES['IS_EDX_DOMAIN'] and not is_microsite():
+    if getattr(settings, 'SITE_NAME', '').endswith('edx.org') and not is_microsite():
         if settings.FEATURES.get('ENABLE_NEW_EDX_FOOTER', False):
             footer_file = microsite.get_template_path('edx_footer.html')
         else:

lms/templates/main_django.html

@@ -31,24 +31,13 @@
 
 <body class="{% block bodyclass %}{% endblock %} lang_{{LANGUAGE_CODE}}">
   <a class="nav-skip" href="{% block nav_skip %}#content{% endblock %}">{% trans "Skip to this view's content" %}</a>
-  {% if ENABLE_NEW_EDX_HEADER %}
-    {% include "navigation.html" %}
-  {% else %}
-    {% include "original_navigation.html" %}
-  {% endif %}
+  {% include "navigation.html" %}
   <div class="content-wrapper" id="content">
     {% block body %}{% endblock %}
     {% block bodyextra %}{% endblock %}
   </div>
-  {% if IS_EDX_DOMAIN %}
-    {% if ENABLE_NEW_EDX_FOOTER %}
-        {% include "edx_footer.html" %}
-    {% else %}
-        {% include "original_edx_footer.html" %}
-    {% endif %}
-  {% else %}
-    {% include "footer.html" %}
-  {% endif %}
+
+  {% include "edx_footer.html" %}
 
   {% compressed_js 'application' %}
   {% compressed_js 'module-js' %}