Minor cosmetic cleanup of model references following the models module restructuring.

diff --git a/__init__.py b/__init__.py
index 9fc18ae..52956f3 100644 (file)
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,4 @@
-from philo.models import Template
+from philo.models.pages import Template

 
 
 load_template_source = Template.loader
 
 
 load_template_source = Template.loader

diff --git a/models/nodes.py b/models/nodes.py
index 6bdc85d..78df3d6 100644 (file)
--- a/models/nodes.py
+++ b/models/nodes.py
@@ -1,4 +1,5 @@
 from django.db import models
 from django.db import models

+from django.contrib.sites.models import Site

 from django.http import HttpResponse, HttpResponseServerError, HttpResponseRedirect
 from django.core.servers.basehttp import FileWrapper
 from philo.models.base import InheritableTreeEntity
 from django.http import HttpResponse, HttpResponseServerError, HttpResponseRedirect
 from django.core.servers.basehttp import FileWrapper
 from philo.models.base import InheritableTreeEntity


@@ -16,6 +17,10 @@ class Node(InheritableTreeEntity):
                app_label = 'philo'
 
 
                app_label = 'philo'
 
 

+# the following line enables the selection of a node as the root for a given django.contrib.sites Site object
+models.ForeignKey(Node, related_name='sites', null=True, blank=True).contribute_to_class(Site, 'root_node')
+
+

 class MultiNode(Node):
        accepts_subpath = True
        
 class MultiNode(Node):
        accepts_subpath = True
        

diff --git a/models/pages.py b/models/pages.py
index 3435511..2ba56d0 100644 (file)
--- a/models/pages.py
+++ b/models/pages.py
@@ -10,7 +10,6 @@ from django.template import Context, RequestContext
 from django.template.loader import get_template
 from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode
 from django.http import HttpResponse
 from django.template.loader import get_template
 from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode
 from django.http import HttpResponse

-from django.contrib.sites.models import Site

 from philo.models.base import TreeModel, register_value_model
 from philo.models.nodes import Node
 from philo.utils import fattr
 from philo.models.base import TreeModel, register_value_model
 from philo.models.nodes import Node
 from philo.utils import fattr


@@ -108,10 +107,6 @@ class Page(Node):
                app_label = 'philo'
 
 
                app_label = 'philo'
 
 

-# the following line enables the selection of a node as the root for a given django.contrib.sites Site object
-models.ForeignKey(Node, related_name='sites', null=True, blank=True).contribute_to_class(Site, 'root_node')
-
-

 class Contentlet(models.Model):
        page = models.ForeignKey(Page, related_name='contentlets')
        name = models.CharField(max_length=255)
 class Contentlet(models.Model):
        page = models.ForeignKey(Page, related_name='contentlets')
        name = models.CharField(max_length=255)