Rebased to origin; removed treechanges.

diff --combined admin.py
index 506267d,1ed5586..0744e0b
--- 1/admin.py
--- 2/admin.py
+++ b/admin.py
@@@ -7,9 -7,7 +7,9 @@@ from django.utils.translation import ug
  from django.utils.safestring import mark_safe
  from django.utils.html import escape
  from django.utils.text import truncate_words
- from models import *
+ from philo.models import *
 +from django.core.exceptions import ValidationError, ObjectDoesNotExist
 +from validators import TreeParentValidator, TreePositionValidator
  
  
  class AttributeInline(generic.GenericTabularInline):
@@@ -45,42 -43,6 +45,42 @@@ class CollectionMemberInline(admin.Tabu
  
  class CollectionAdmin(admin.ModelAdmin):
        inlines = [CollectionMemberInline]
 +      list_display = ('name', 'description', 'get_count')
 +
 +
 +class TreeForm(forms.ModelForm):
 +      def __init__(self, *args, **kwargs):
 +              super(TreeForm, self).__init__(*args, **kwargs)
 +              instance = self.instance
 +              instance_class=self.get_instance_class()
 +              
 +              if instance_class is not None:
 +                      try:
 +                              self.fields['parent'].queryset = instance_class.objects.exclude(id=instance.id)
 +                      except ObjectDoesNotExist:
 +                              pass
 +                      
 +              self.fields['parent'].validators = [TreeParentValidator(*self.get_validator_args())]
 +      
 +      def get_instance_class(self):
 +              return self.instance.__class__
 +              
 +      def get_validator_args(self):
 +              return [self.instance]
 +      
 +      def clean(self):
 +              cleaned_data = self.cleaned_data
 +              
 +              try:
 +                      parent = cleaned_data['parent']
 +                      slug = cleaned_data['slug']
 +                      obj_class = self.get_instance_class()
 +                      tpv = TreePositionValidator(parent, slug, obj_class)
 +                      tpv(self.instance)
 +              except KeyError:
 +                      pass
 +              
 +              return cleaned_data
  
  
  class TemplateAdmin(admin.ModelAdmin):
@@@ -103,8 -65,6 +103,8 @@@
        )
        save_on_top = True
        save_as = True
 +      list_display = ('__unicode__', 'slug', 'get_path',)
 +      form = TreeForm
  
  
  class ModelLookupWidget(forms.TextInput):
@@@ -134,29 -94,6 +134,29 @@@
                return mark_safe(output)
  
  
 +class NodeForm(TreeForm):
 +      def get_instance_class(self):
 +              return Node
 +              
 +      def get_validator_args(self):
 +              return [self.instance, 'instance']
 +
 +
 +class PageAdminForm(NodeForm):
 +      class Meta:
 +              model=Page
 +
 +
 +class RedirectAdminForm(NodeForm):
 +      class Meta:
 +              model=Redirect
 +
 +
 +class FileAdminForm(NodeForm):
 +      class Meta:
 +              model=File
 +
 +
  class PageAdmin(EntityAdmin):
        prepopulated_fields = {'slug': ('title',)}
        fieldsets = (
@@@ -171,7 -108,6 +171,7 @@@
        list_display = ('title', 'path', 'template')
        list_filter = ('template',)
        search_fields = ['title', 'slug', 'contentlets__content']
 +      form = PageAdminForm
        
        def get_fieldsets(self, request, obj=None, **kwargs):
                fieldsets = list(self.fieldsets)
@@@ -237,19 -173,8 +237,19 @@@
                                        contentreference.save()
  
  
 +class RedirectAdmin(admin.ModelAdmin):
 +      list_display=('slug', 'target', 'path', 'status_code',)
 +      list_filter=('status_code',)
 +      form = RedirectAdminForm
 +
 +
 +class FileAdmin(admin.ModelAdmin):
 +      form=FileAdminForm
 +      list_display=('slug', 'mimetype', 'path', 'file',)
 +
 +
  admin.site.register(Collection, CollectionAdmin)
 -admin.site.register(Redirect)
 -admin.site.register(File)
 +admin.site.register(Redirect, RedirectAdmin)
 +admin.site.register(File, FileAdmin)
  admin.site.register(Page, PageAdmin)
  admin.site.register(Template, TemplateAdmin)

diff --combined models.py
index c62d7eb,ecd1c1f..464b3b5
--- 1/models.py
--- 2/models.py
+++ b/models.py
@@@ -5,18 -5,15 +5,15 @@@ from django.contrib.contenttypes impor
  from django.contrib.contenttypes.models import ContentType
  from django.db import models
  from django.contrib.sites.models import Site
- from utils import fattr
+ from philo.utils import fattr
  from django.template import add_to_builtins as register_templatetags
  from django.template import Template as DjangoTemplate
  from django.template import TemplateDoesNotExist
  from django.template import Context, RequestContext
  from django.core.exceptions import ObjectDoesNotExist
- try:
-       import json
- except ImportError:
-       import simplejson as json
+ from django.utils import simplejson as json
  from UserDict import DictMixin
- from templatetags.containers import ContainerNode
+ from philo.templatetags.containers import ContainerNode
  from django.template.loader_tags import ExtendsNode, ConstantIncludeNode, IncludeNode
  from django.template.loader import get_template
  from django.http import Http404, HttpResponse, HttpResponseServerError, HttpResponseRedirect
@@@ -99,18 -96,12 +96,18 @@@ class Entity(models.Model)
        
        class Meta:
                abstract = True
 -
 +      
  
  class Collection(models.Model):
        name = models.CharField(max_length=255)
        description = models.TextField(blank=True, null=True)
 -
 +      
 +      def get_count(self):
 +              return self.members.count()
 +      get_count.short_description = 'Members'
 +      
 +      def __unicode__(self):
 +              return self.name
  
  class CollectionMemberManager(models.Manager):
        use_for_related_fields = True
@@@ -126,9 -117,6 +123,9 @@@ class CollectionMember(models.Model)
        member_content_type = models.ForeignKey(ContentType, verbose_name='Member type')
        member_object_id = models.PositiveIntegerField(verbose_name='Member ID')
        member = generic.GenericForeignKey('member_content_type', 'member_object_id')
 +      
 +      def __unicode__(self):
 +              return '%s - %s' % (self.collection, self.member)
  
  
  class TreeManager(models.Manager):
@@@ -247,9 -235,6 +244,9 @@@ class Node(InheritableTreeEntity)
        
        def render_to_response(self, request, path=None, subpath=None):
                return HttpResponseServerError()
 +              
 +      class Meta:
 +              unique_together=(('parent', 'slug',),)
  
  
  class MultiNode(Node):
@@@ -298,7 -283,7 +295,7 @@@ class File(Node)
  class Template(TreeModel):
        name = models.CharField(max_length=255)
        documentation = models.TextField(null=True, blank=True)
 -      mimetype = models.CharField(max_length=255, null=True, blank=True, help_text='Default: %s' % settings.DEFAULT_CONTENT_TYPE)
 +      mimetype = models.CharField(max_length=255, null=True, blank=True, help_text='Default: %s' % settings.DEFAULT_CONTENT_TYPE, default=settings.DEFAULT_CONTENT_TYPE)
        code = models.TextField(verbose_name='django template code')
        
        @property
@@@ -368,7 -353,9 +365,7 @@@
  
  class Page(Node):
        """
 -      Represents an HTML page. The page will have a number of related Contentlets
 -      depending on the template selected - but these will appear only after the
 -      page has been saved with that template.
 +      Represents a page - something which is rendered according to a template. The page will have a number of related Contentlets depending on the template selected - but these will appear only after the page has been saved with that template.
        """
        template = models.ForeignKey(Template, related_name='pages')
        title = models.CharField(max_length=255)