Merge pull request #2163 from edx/jbau/sass-path-bugfix

small bugfixes for theming+sass+templates
openedx · Jan 14, 2014 · 6aeadb8 · 6aeadb8
2 parents 129c244 + 6560c4f
commit 6aeadb8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lms/startup.py b/lms/startup.py
@@ -9,7 +9,7 @@
 
 from django_startup import autostartup
 from xmodule.modulestore.django import modulestore
-
+import edxmako
 
 def run():
     """
@@ -50,6 +50,7 @@ def enable_theme():
     # Include the theme's templates in the template search paths
     settings.TEMPLATE_DIRS.append(theme_root / 'templates')
     settings.MAKO_TEMPLATES['main'].append(theme_root / 'templates')
+    edxmako.startup.run()
 
     # Namespace the theme's static files to 'themes/<theme_name>' to
     # avoid collisions with default edX static files

diff --git a/rakelib/assets.rake b/rakelib/assets.rake
@@ -1,5 +1,5 @@
 # Theming constants
-USE_CUSTOM_THEME = ENV_TOKENS['USE_CUSTOM_THEME']
+USE_CUSTOM_THEME = ENV_TOKENS.has_key?('FEATURES') && ENV_TOKENS['FEATURES']['USE_CUSTOM_THEME']
 if USE_CUSTOM_THEME
     THEME_NAME = ENV_TOKENS['THEME_NAME']
     THEME_ROOT = File.join(ENV_ROOT, "themes", THEME_NAME)