Merge branch 'admin-cleanup'

[philo.git] / admin.py

diff --git a/admin.py b/admin.py
index e9a59ad..178a904 100644 (file)
--- a/admin.py
+++ b/admin.py
@@ -7,7 +7,7 @@ from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.html import escape
 from django.utils.text import truncate_words
 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 *

 
 
 class AttributeInline(generic.GenericTabularInline):
 
 
 class AttributeInline(generic.GenericTabularInline):


@@ -15,7 +15,7 @@ class AttributeInline(generic.GenericTabularInline):
        ct_fk_field = 'entity_object_id'
        model = Attribute
        extra = 1
        ct_fk_field = 'entity_object_id'
        model = Attribute
        extra = 1

-       classes = ('collapse-closed',)
+       template = 'admin/philo/edit_inline/tabular_collapse.html'

        allow_add = True
 
 
        allow_add = True
 
 


@@ -24,7 +24,7 @@ class RelationshipInline(generic.GenericTabularInline):
        ct_fk_field = 'entity_object_id'
        model = Relationship
        extra = 1
        ct_fk_field = 'entity_object_id'
        model = Relationship
        extra = 1

-       classes = ('collapse-closed',)
+       template = 'admin/philo/edit_inline/tabular_collapse.html'

        allow_add = True
 
 
        allow_add = True