From 9d853036d47d087750e4864cfab83ef64fba067a Mon Sep 17 00:00:00 2001
From: Carlos Daniel Ruvalcaba Valenzuela <clsdaniel@localhost.(none)>
Date: Sat, 26 Apr 2008 02:42:23 -0500
Subject: [PATCH] More fixes to template code

---
 pages/views.py | 7 ++-----
 settings.py    | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pages/views.py b/pages/views.py
index 4b09ee5..3c4c7a0 100644
--- a/pages/views.py
+++ b/pages/views.py
@@ -32,11 +32,8 @@ from django.conf import settings
 
 from bcms.template import template_django as template
 
-from genshi.template import TemplateLoader
 from models import *
 
-loader = TemplateLoader(settings.TEMPLATE_DIRS[0], auto_reload=True)
-
 def logmeout(request):
     logout(request)
     if request.GET.has_key('redir'):
@@ -65,7 +62,7 @@ def logme(request):
     # Return rendered template as HTML
     return HttpResponse(stream.render('html', doctype='html'))
 
-@template('page_edit.html')
+@template('edit.html')
 def editPage(request, pagename):
     if request.method == 'POST':
         title = request.POST['title']
@@ -94,7 +91,7 @@ def editPage(request, pagename):
     	pagename=pagename, user=request.user)
     return args
 
-@template('page_view.html')
+@template('view.html')
 def viewPage(request, pagename):
     if not pagename:
         pagename = 'index'
diff --git a/settings.py b/settings.py
index a8a16e2..1d10058 100644
--- a/settings.py
+++ b/settings.py
@@ -79,8 +79,8 @@ SECRET_KEY = 'ieynq&un)ar73!trn!31@_r8=uv8%va_wv-ehu54p-hg9m4cs4'
 
 # List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.load_template_source',
     'django.template.loaders.app_directories.load_template_source',
+    'django.template.loaders.filesystem.load_template_source',
 #     'django.template.loaders.eggs.load_template_source',
 )
 
-- 
2.11.4.GIT