Merge branch 'master' of git://github.com/melinath/philo

[philo.git] / philo / admin / pages.py

diff --git a/philo/admin/pages.py b/philo/admin/pages.py
index f9e96c0..3e8f0f1 100644 (file)
--- a/philo/admin/pages.py
+++ b/philo/admin/pages.py
@@ -1,10 +1,11 @@
+from django import forms

 from django.conf import settings
 from django.contrib import admin
 from django.conf import settings
 from django.contrib import admin

-from django import forms
-from philo.admin.base import COLLAPSE_CLASSES, TreeAdmin
+
+from philo.admin.base import COLLAPSE_CLASSES, TreeEntityAdmin
+from philo.admin.forms.containers import *

 from philo.admin.nodes import ViewAdmin
 from philo.models.pages import Page, Template, Contentlet, ContentReference
 from philo.admin.nodes import ViewAdmin
 from philo.models.pages import Page, Template, Contentlet, ContentReference

-from philo.admin.forms.containers import *

 
 
 class ContentletInline(admin.StackedInline):
 
 
 class ContentletInline(admin.StackedInline):


@@ -54,7 +55,7 @@ class PageAdmin(ViewAdmin):
                return super(PageAdmin, self).response_add(request, obj, post_url_continue)
 
 
                return super(PageAdmin, self).response_add(request, obj, post_url_continue)
 
 

-class TemplateAdmin(TreeAdmin):
+class TemplateAdmin(TreeEntityAdmin):

        prepopulated_fields = {'slug': ('name',)}
        fieldsets = (
                (None, {
        prepopulated_fields = {'slug': ('name',)}
        fieldsets = (
                (None, {