If microsites are enabled and it is a microsite request, then take the microsite path for theming

This commit is contained in:
Felipe Montoya
2014-04-28 12:03:48 -05:00
parent 4c717ee35d
commit 8fd3ab07ba
2 changed files with 5 additions and 2 deletions

View File

@@ -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):

View File

@@ -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'