From 789f68521e8a9980e8428702d556aca1a6fe43f0 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 22 Sep 2012 00:46:02 -0400 Subject: [PATCH] Update the theme settings tag to use the correct settings module --- apps/web_theme/templatetags/theme_tags.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/apps/web_theme/templatetags/theme_tags.py b/apps/web_theme/templatetags/theme_tags.py index 9b87cd9857..bb51c49f02 100644 --- a/apps/web_theme/templatetags/theme_tags.py +++ b/apps/web_theme/templatetags/theme_tags.py @@ -4,7 +4,7 @@ from django.conf import settings from django.template import Library, Node, TemplateSyntaxError from django.utils.safestring import mark_safe -from web_theme.settings import THEME, ENABLE_SCROLL_JS +from web_theme import settings as web_theme_settings register = Library() @@ -14,8 +14,8 @@ class GetThemeNode(Node): self.var_name = var_name def render(self, context): - context['web_theme'] = THEME - context['enable_scroll_js'] = ENABLE_SCROLL_JS + context['web_theme'] = web_theme_settings.THEME + context['enable_scroll_js'] = web_theme_settings.ENABLE_SCROLL_JS return '' @@ -56,12 +56,7 @@ class SettingsNode(Node): self.var_name = var_name def render(self, context): - #TODO: fix properly - if self.format_string == 'THEME': - context[self.var_name] = THEME - else: - context[self.var_name] = ENABLE_SCROLL_JS - #context[self.var_name] = getattr(web_theme_settings, self.format_string, '') + context[self.var_name] = getattr(web_theme_settings, self.format_string, '') return ''