Merge pull request #3495 from eduNEXT/feature/fmo/theme-microsite-support

Microsites alongside Theme

common/djangoapps/microsite_configuration/microsite.py

@@ -36,7 +36,7 @@ def is_request_in_microsite():
     """
     This will return if current request is a request within a microsite
     """
-    return get_configuration()
+    return bool(get_configuration())
 
 
 def get_value(val_name, default=None):

lms/templates/main.html

@@ -20,6 +20,9 @@
 <%def name="theme_enabled()">
   <% return settings.FEATURES.get("USE_CUSTOM_THEME", False) %>
 </%def>
+<%def name="is_microsite()">
+  <% return microsite.is_request_in_microsite() %>
+</%def>
 
 <%def name="stanford_theme_enabled()">
   <%
@@ -61,7 +64,7 @@
   <%block name="headextra"/>
 
 <%
-  if theme_enabled():
+  if theme_enabled() and not is_microsite():
     header_extra_file = 'theme-head-extra.html'
     header_file = 'theme-header.html'
     google_analytics_file = 'theme-google-analytics.html'