From 6560c4faf80314e3c143a634baee5b435a2abfa2 Mon Sep 17 00:00:00 2001 From: Jason Bau Date: Fri, 10 Jan 2014 15:51:32 -0800 Subject: [PATCH] small bugfixes for theming+sass+templates change ruby and to && --- lms/startup.py | 3 ++- rakelib/assets.rake | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lms/startup.py b/lms/startup.py index 68f3095159..2021db8e64 100644 --- a/lms/startup.py +++ b/lms/startup.py @@ -9,7 +9,7 @@ settings.INSTALLED_APPS # pylint: disable=W0104 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/' to # avoid collisions with default edX static files diff --git a/rakelib/assets.rake b/rakelib/assets.rake index f0a854b114..98a4f7ba54 100644 --- 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)