From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Wed, 16 Jun 2010 14:41:39 +0000 (-0400)
Subject: Merge branch 'admin-cleanup'
X-Git-Tag: philo-0.9~79
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/e18b86f47054850e9f49c1cb7aaecd8fdf753e4d?hp=d26ea3e475103ba0c94e49fbbbc1ee88ad8a96ff

Merge branch 'admin-cleanup'

* admin-cleanup:
  Making Attribute and Relationship inlines collapsible with custom template.
  Hiding save_on_top on the Page add form template, and adding template documentation to Page change forms when the page's selected template provides it.
  Pages now have a custom add form template which notifies the user that they must select a template and save before containers will be available.
  Implementing NodeAdmin and subclasses for built-in Node types.
---

diff --git a/README b/README
index 82333d6..4170400 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ Philo is a foundation for developing web content management systems.
 
 Prerequisites:
 	* Python 2.5.4+ <http://www.python.org/>
-	* simplejson <http://code.google.com/p/simplejson/> (Not required with Python 2.6+)
 	* Django 1.1.1+ <http://www.djangoproject.com/>
 	* (Optional) django-grappelli 2.0+ <http://code.google.com/p/django-grappelli/>
 
diff --git a/__init__.py b/__init__.py
index 8ad7212..9fc18ae 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,4 @@
-from models import Template
+from philo.models import Template
 
 
 load_template_source = Template.loader
diff --git a/admin.py b/admin.py
index 1a9125e..178a904 100644
--- 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 models import *
+from philo.models import *
 
 
 class AttributeInline(generic.GenericTabularInline):
diff --git a/models.py b/models.py
index eb6ebc0..ecd1c1f 100644
--- a/models.py
+++ b/models.py
@@ -5,18 +5,15 @@ from django.contrib.contenttypes import generic
 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
diff --git a/views.py b/views.py
index c03f687..f086bfd 100644
--- a/views.py
+++ b/views.py
@@ -1,7 +1,7 @@
 from django.http import Http404, HttpResponse
 from django.template import RequestContext
 from django.contrib.sites.models import Site
-from models import Node
+from philo.models import Node
 
 
 def node_view(request, path=None, **kwargs):