diff -r 0f1acc4c3e1e -r 7dd6d8347b56 app/soc/views/simple.py
--- a/app/soc/views/simple.py	Fri Oct 03 22:17:05 2008 +0000
+++ b/app/soc/views/simple.py	Fri Oct 03 23:01:49 2008 +0000
@@ -27,8 +27,9 @@
 
 from soc.logic import out_of_band
 from soc.logic.site import id_user
+from soc.views import helper
+import soc.views.helper.templates
 from soc.views.helpers import response_helpers
-from soc.views.helpers import template_helpers
 
 
 def templateWithLinkName(request,
@@ -74,7 +75,7 @@
   """
   return templateWithLinkName(
       request, linkname=linkname, context=context,
-      template=template_helpers.makeSiblingTemplatesList(
+      template=helper.templates.makeSiblingTemplatesList(
           template, 'public.html'))
 
 
@@ -97,7 +98,7 @@
   context = response_helpers.getUniversalContext(request, context=context)
   
   # make a list of possible "sibling" templates, then append a default
-  error_templates = template_helpers.makeSiblingTemplatesList(
+  error_templates = helper.templates.makeSiblingTemplatesList(
       template, 'error.html', default_template=DEF_ERROR_TMPL)
 
   context['error_status'] = error.response_args.get('status')
@@ -130,7 +131,7 @@
   context = response_helpers.getUniversalContext(request, context=context)
   
   # make a list of possible "sibling" templates, then append a default
-  login_templates = template_helpers.makeSiblingTemplatesList(
+  login_templates = helper.templates.makeSiblingTemplatesList(
       template, 'login.html', default_template=DEF_LOGIN_TMPL)
   
   if not context.get('login_message'):