Settings and templates updated

ellmetha · Mar 16, 2015 · ce30d53 · ce30d53
1 parent 44d4e07
commit ce30d53
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/machina/conf/settings.py b/machina/conf/settings.py
@@ -13,7 +13,6 @@
 MACHINA_FORUM_NAME = getattr(settings, 'MACHINA_FORUM_NAME', 'Machina')
 MACHINA_MARKUP_LANGUAGE = getattr(settings, 'MACHINA_MARKUP_LANGUAGE', ('django_markdown.utils.markdown', {}))
 MACHINA_MARKUP_WIDGET = getattr(settings, 'MACHINA_MARKUP_WIDGET', 'django_markdown.widgets.MarkdownWidget')
-MACHINA_BASE_TEMPLATE = getattr(settings, 'MACHINA_BASE_TEMPLATE', 'base.html')
 
 
 # Forum

diff --git a/machina/core/context_processors.py b/machina/core/context_processors.py
@@ -11,6 +11,5 @@ def metadata(request):
     Append some Machina-specific data to the template context.
     """
     return {
-        'MACHINA_BASE_TEMPLATE': machina_settings.MACHINA_BASE_TEMPLATE,
         'MACHINA_FORUM_NAME': machina_settings.MACHINA_FORUM_NAME,
     }
diff --git a/machina/templates/machina/board_base.html b/machina/templates/machina/board_base.html
@@ -1,4 +1,4 @@
-{% extends MACHINA_BASE_TEMPLATE|default:"base.html" %}
+{% extends "base.html" %}
 {% load url from future %}
 {% load static %}
 {% load i18n %}