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/>
-from models import Template
+from philo.models import Template
load_template_source = Template.loader
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
+COLLAPSE_CLASSES = ('collapse', 'collapse-closed', 'closed',)
+
+
class AttributeInline(generic.GenericTabularInline):
ct_field = 'entity_content_type'
ct_fk_field = 'entity_object_id'
model = Attribute
extra = 1
- classes = ('collapse-closed',)
+ template = 'admin/philo/edit_inline/tabular_collapse.html'
allow_add = True
ct_fk_field = 'entity_object_id'
model = Relationship
extra = 1
- classes = ('collapse-closed',)
+ template = 'admin/philo/edit_inline/tabular_collapse.html'
allow_add = True
fk_name = 'collection'
model = CollectionMember
extra = 1
- classes = ('collapse-closed',)
+ classes = COLLAPSE_CLASSES
allow_add = True
+ fields = ('member_content_type', 'member_object_id', 'index',)
class CollectionAdmin(admin.ModelAdmin):
'fields': ('parent', 'name', 'slug')
}),
('Documentation', {
- 'classes': ('collapse', 'collapse-closed'),
+ 'classes': COLLAPSE_CLASSES,
'fields': ('documentation',)
}),
(None, {
'fields': ('code',)
}),
('Advanced', {
- 'classes': ('collapse','collapse-closed'),
+ 'classes': COLLAPSE_CLASSES,
'fields': ('mimetype',)
}),
)
model=File
-class PageAdmin(EntityAdmin):
+class NodeAdmin(EntityAdmin):
+ pass
+
+
+class RedirectAdmin(NodeAdmin):
+ fieldsets = (
+ (None, {
+ 'fields': ('slug', 'target', 'status_code')
+ }),
+ ('URL/Tree/Hierarchy', {
+ 'classes': COLLAPSE_CLASSES,
+ 'fields': ('parent',)
+ }),
+ )
+ list_display=('slug', 'target', 'path', 'status_code',)
+ list_filter=('status_code',)
+ form = RedirectAdminForm
+
+
+class FileAdmin(NodeAdmin):
+ prepopulated_fields = {'slug': ('file',)}
+ fieldsets = (
+ (None, {
+ 'fields': ('file', 'slug', 'mimetype')
+ }),
+ ('URL/Tree/Hierarchy', {
+ 'classes': COLLAPSE_CLASSES,
+ 'fields': ('parent',)
+ }),
+ )
+ form=FileAdminForm
+ list_display=('slug', 'mimetype', 'path', 'file',)
+
+
+class PageAdmin(NodeAdmin):
+ add_form_template = 'admin/philo/page/add_form.html'
prepopulated_fields = {'slug': ('title',)}
fieldsets = (
(None, {
- 'fields': ('title', 'template')
+ 'fields': ('title', 'slug', 'template')
}),
('URL/Tree/Hierarchy', {
- 'classes': ('collapse', 'collapse-closed'),
- 'fields': ('parent', 'slug')
+ 'classes': COLLAPSE_CLASSES,
+ 'fields': ('parent',)
}),
)
list_display = ('title', 'path', 'template')
def get_fieldsets(self, request, obj=None, **kwargs):
fieldsets = list(self.fieldsets)
if obj: # if no obj, creating a new page, thus no template set, thus no containers
- page = obj
- template = page.template
+ template = obj.template
+ if template.documentation:
+ fieldsets.append(('Template Documentation', {
+ 'description': template.documentation
+ }))
contentlet_containers, contentreference_containers = template.containers
for container_name in contentlet_containers:
fieldsets.append((('Container: %s' % container_name), {
for container_name, container_content_type in contentreference_containers:
if ('contentreference_container_%s' % container_name) in form.cleaned_data:
content = form.cleaned_data[('contentreference_container_%s' % container_name)]
+ if content == None:
+ continue
contentreference, created = page.contentreferences.get_or_create(name=container_name, defaults={'content': content})
if not created:
contentreference.content = content
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
member = generic.GenericForeignKey('member_content_type', 'member_object_id')
def __unicode__(self):
- return '%s - %s' % (self.collection, self.member)
+ return u'%s - %s' % (self.collection, self.member)
class TreeManager(models.Manager):
response = HttpResponse(wrapper, content_type=self.mimetype)
response['Content-Length'] = self.file.size
return response
+
+ def __unicode__(self):
+ return self.file
class Template(TreeModel):
name = models.CharField(max_length=255)
content = models.TextField()
dynamic = models.BooleanField(default=False)
+
+ def __unicode__(self):
+ return self.name
class ContentReference(models.Model):
content_type = models.ForeignKey(ContentType, verbose_name='Content type')
content_id = models.PositiveIntegerField(verbose_name='Content ID')
content = generic.GenericForeignKey('content_type', 'content_id')
+
+ def __unicode__(self):
+ return self.name
register_templatetags('philo.templatetags.containers')
--- /dev/null
+{% load i18n adminmedia %}
+<div class="inline-group" id="{{ inline_admin_formset.formset.prefix }}-group">
+ <div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
+{{ inline_admin_formset.formset.management_form }}
+<fieldset class="module collapse collapse-closed closed">
+ <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
+ {{ inline_admin_formset.formset.non_form_errors }}
+ <table>
+ <thead><tr>
+ {% for field in inline_admin_formset.fields %}
+ {% if not field.widget.is_hidden %}
+ <th{% if forloop.first %} colspan="2"{% endif %}{% if field.required %} class="required"{% endif %}>{{ field.label|capfirst }}</th>
+ {% endif %}
+ {% endfor %}
+ {% if inline_admin_formset.formset.can_delete %}<th>{% trans "Delete?" %}</th>{% endif %}
+ </tr></thead>
+
+ <tbody>
+ {% for inline_admin_form in inline_admin_formset %}
+ {% if inline_admin_form.form.non_field_errors %}
+ <tr><td colspan="{{ inline_admin_form.field_count }}">{{ inline_admin_form.form.non_field_errors }}</td></tr>
+ {% endif %}
+ <tr class="{% cycle "row1" "row2" %} {% if inline_admin_form.original or inline_admin_form.show_url %}has_original{% endif %}{% if forloop.last %} empty-form{% endif %}"
+ id="{{ inline_admin_formset.formset.prefix }}-{% if not forloop.last %}{{ forloop.counter0 }}{% else %}empty{% endif %}">
+ <td class="original">
+ {% if inline_admin_form.original or inline_admin_form.show_url %}<p>
+ {% if inline_admin_form.original %} {{ inline_admin_form.original }}{% endif %}
+ {% if inline_admin_form.show_url %}<a href="../../../r/{{ inline_admin_form.original_content_type_id }}/{{ inline_admin_form.original.id }}/">{% trans "View on site" %}</a>{% endif %}
+ </p>{% endif %}
+ {% if inline_admin_form.has_auto_field %}{{ inline_admin_form.pk_field.field }}{% endif %}
+ {{ inline_admin_form.fk_field.field }}
+ {% spaceless %}
+ {% for fieldset in inline_admin_form %}
+ {% for line in fieldset %}
+ {% for field in line %}
+ {% if field.is_hidden %} {{ field.field }} {% endif %}
+ {% endfor %}
+ {% endfor %}
+ {% endfor %}
+ {% endspaceless %}
+ </td>
+ {% for fieldset in inline_admin_form %}
+ {% for line in fieldset %}
+ {% for field in line %}
+ <td class="{{ field.field.name }}">
+ {% if field.is_readonly %}
+ <p>{{ field.contents }}</p>
+ {% else %}
+ {{ field.field.errors.as_ul }}
+ {{ field.field }}
+ {% endif %}
+ </td>
+ {% endfor %}
+ {% endfor %}
+ {% endfor %}
+ {% if inline_admin_formset.formset.can_delete %}
+ <td class="delete">{% if inline_admin_form.original %}{{ inline_admin_form.deletion_field.field }}{% endif %}</td>
+ {% endif %}
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+</fieldset>
+ </div>
+</div>
+
+<script type="text/javascript">
+(function($) {
+ $(document).ready(function($) {
+ var rows = "#{{ inline_admin_formset.formset.prefix }}-group .tabular.inline-related tbody tr";
+ var alternatingRows = function(row) {
+ $(rows).not(".add-row").removeClass("row1 row2")
+ .filter(":even").addClass("row1").end()
+ .filter(rows + ":odd").addClass("row2");
+ }
+ var reinitDateTimeShortCuts = function() {
+ // Reinitialize the calendar and clock widgets by force
+ if (typeof DateTimeShortcuts != "undefined") {
+ $(".datetimeshortcuts").remove();
+ DateTimeShortcuts.init();
+ }
+ }
+ var updateSelectFilter = function() {
+ // If any SelectFilter widgets are a part of the new form,
+ // instantiate a new SelectFilter instance for it.
+ if (typeof SelectFilter != "undefined"){
+ $(".selectfilter").each(function(index, value){
+ var namearr = value.name.split('-');
+ SelectFilter.init(value.id, namearr[namearr.length-1], false, "{% admin_media_prefix %}");
+ })
+ $(".selectfilterstacked").each(function(index, value){
+ var namearr = value.name.split('-');
+ SelectFilter.init(value.id, namearr[namearr.length-1], true, "{% admin_media_prefix %}");
+ })
+ }
+ }
+ var initPrepopulatedFields = function(row) {
+ row.find('.prepopulated_field').each(function() {
+ var field = $(this);
+ var input = field.find('input, select, textarea');
+ var dependency_list = input.data('dependency_list') || [];
+ var dependencies = row.find(dependency_list.join(',')).find('input, select, textarea');
+ if (dependencies.length) {
+ input.prepopulate(dependencies, input.attr('maxlength'));
+ }
+ });
+ }
+ $(rows).formset({
+ prefix: "{{ inline_admin_formset.formset.prefix }}",
+ addText: "{% blocktrans with inline_admin_formset.opts.verbose_name|title as verbose_name %}Add another {{ verbose_name }}{% endblocktrans %}",
+ formCssClass: "dynamic-{{ inline_admin_formset.formset.prefix }}",
+ deleteCssClass: "inline-deletelink",
+ deleteText: "{% trans "Remove" %}",
+ emptyCssClass: "empty-form",
+ removed: alternatingRows,
+ added: (function(row) {
+ initPrepopulatedFields(row);
+ reinitDateTimeShortCuts();
+ updateSelectFilter();
+ alternatingRows(row);
+ })
+ });
+ });
+})(django.jQuery);
+</script>
--- /dev/null
+{% extends "admin/change_form.html" %}
+{% load i18n %}
+
+{% block form_top %}
+ <p>{% trans "First, choose a template. After saving, you'll be able to provide additional content for containers." %}</p>
+ <input type="hidden" name="_continue" value="1" />
+{% endblock %}
+
+{% block content %}
+{% with 0 as save_on_top %}
+{{ block.super }}
+{% endwith %}
+{% endblock %}
\ No newline at end of file
if 'page' in context:
container_content = self.get_container_content(context)
- if self.nodelist_main is None:
- self.nodelist_main
+ if not self.nodelist_main:
if container_content and self.as_var:
context[self.as_var] = container_content
return ''
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):
git.ithinksw.org / philo.git / commitdiff