X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/30a08f353e2282b993db3d3079608b0736a2ccb6..ca53fa5dad4374b66e7a9b810557cbf237138fee:/admin/pages.py?ds=inline

diff --git a/admin/pages.py b/admin/pages.py
index fc60ad1..52238da 100644
--- a/admin/pages.py
+++ b/admin/pages.py
@@ -1,9 +1,11 @@
 from django.contrib import admin
 from django import forms
+from django.template import Template as DjangoTemplate
 from philo.admin import widgets
 from philo.admin.base import COLLAPSE_CLASSES
 from philo.admin.nodes import ViewAdmin
 from philo.models.pages import Page, Template, Contentlet, ContentReference
+from philo.forms import TemplateForm
 
 
 class PageAdmin(ViewAdmin):
@@ -28,7 +30,8 @@ class PageAdmin(ViewAdmin):
 			contentlet_containers, contentreference_containers = template.containers
 			for container_name in contentlet_containers:
 				fieldsets.append((('Container: %s' % container_name), {
-					'fields': (('contentlet_container_content_%s' % container_name), ('contentlet_container_dynamic_%s' % container_name))
+					'fields': (('contentlet_container_content_%s' % container_name), ('contentlet_container_dynamic_%s' % container_name)),
+					'classes': ['monospace']
 				}))
 			for container_name, container_content_type in contentreference_containers:
 				fieldsets.append((('Container: %s' % container_name), {
@@ -82,13 +85,13 @@ class PageAdmin(ViewAdmin):
 					contentreference = page.contentreferences.get(name=container_name)
 				except ContentReference.DoesNotExist:
 					contentreference = ContentReference(name=container_name, page=page, content_type=container_content_type)
-				
-				if content == None:
-					contentreference.content_id = None
 				else:
-					contentreference.content_id = content.id
+					if content == None:
+						contentreference.delete()
 				
-				contentreference.save()
+				if content is not None:
+					contentreference.content_id = content.id
+					contentreference.save()
 
 
 class TemplateAdmin(admin.ModelAdmin):
@@ -112,6 +115,7 @@ class TemplateAdmin(admin.ModelAdmin):
 	save_on_top = True
 	save_as = True
 	list_display = ('__unicode__', 'slug', 'get_path',)
+	form = TemplateForm
 
 
 admin.site.register(Page, PageAdmin)