Merge branch 'release' into 'master' after successful rc/2014-09-17 deploy.

2014-09-18 12:27:32 -04:00
parent 22785e96fc 6bf5207494
commit 9e830d08c4
20 changed files with 415 additions and 20 deletions
--- a/common/djangoapps/edxmako/shortcuts.py
+++ b/common/djangoapps/edxmako/shortcuts.py
@@ -103,6 +103,16 @@ def open_source_footer_context_processor(request):
    )


+def microsite_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_REQUEST_IN_MICROSITE", microsite.is_request_in_microsite())
+        ]
+    )
+
 def render_to_string(template_name, dictionary, context=None, namespace='main'):

    # see if there is an override template defined in the microsite