apps/events/admin.py
apps/gallery/admin.py
apps/links/admin.py
apps/member/admin.py
apps/news/admin.py
apps/pages/admin.py
@@ -60,15 +60,6 @@ class Event(models.Model):
private = models.BooleanField(_('Privat'), default=False)
place = models.ForeignKey(EventPlace, blank=False, null=False)
- class Admin:
- list_display = (
- 'title',
- 'private',
- 'date_from',
- 'date_to',
- 'place',
- )
-
class Meta:
verbose_name = _('Event')
verbose_name_plural = _('Events')
apps/events/models.py
@@ -21,13 +21,6 @@ class Gallery(models.Model):
class Meta:
ordering = ('-published',)
- class Admin:
- list_display = (
- 'title',
- 'description',
- 'published',
- )
-
def __unicode__(self):
return self.title
@@ -61,21 +54,6 @@ class GalleryItem(models.Model):
visible_users = models.ManyToManyField(User, blank=True, null=True)
visible_dogs = models.ManyToManyField(Dog, blank=True, null=True)
- class Admin:
- list_display = (
- 'preview_image_url',
- 'title',
- 'mimetype',
- 'published',
- 'get_visible_users',
- 'get_visible_dogs',
- )
-
- list_display_links = (
- 'preview_image_url',
- 'title',
- )
-
class Meta:
ordering = ('-published',)
verbose_name = _('Gallery Item')
apps/gallery/models.py
@@ -9,9 +9,6 @@ class LinkCategory(models.Model):
slug = models.SlugField(_('URL-Title'), editable=False)
description = models.TextField(_('Description'), blank=True)
- class Admin:
- pass
-
def save(self):
self.slug = slugify(self.title)
super(LinkCategory, self).save()
@@ -27,13 +24,6 @@ class Link(models.Model):
description = models.TextField(_('Description'), blank=True)
url = models.URLField(_('URL'), verify_exists=True)
- class Admin:
- list_display = (
- 'title',
- 'url',
- 'category',
- )
-
def save(self):
self.slug = slugify(self.title)
super(Link, self).save()
apps/links/models.py
@@ -10,9 +10,6 @@ class DogAward(models.Model):
slug = models.SlugField(_('URL-Title'), editable=False)
icon = models.ImageField(_('Icon'), upload_to='dog-icons/', blank=True)
- class Admin:
- pass
-
def __unicode__(self):
return self.title
@@ -33,19 +30,12 @@ class Dog(models.Model):
awards = models.ManyToManyField(DogAward, blank=True)
best_dogfriend = models.ForeignKey('self', blank=True, null=True)
- class Meta:
+ class Meta:
ordering = ('name',)
-
- class Admin:
- list_display = (
- 'name',
- 'breed',
- 'photo',
- )
- def get_handler(self):
- return self.member_set.all()[0].user.username
-
+ def get_handler(self):
+ return self.member_set.all()[0].user.username
+
def __unicode__(self):
return self.name
@@ -65,9 +55,6 @@ class MemberFunction(models.Model):
slug = models.SlugField(_('URL-Title'), editable=False)
icon = models.ImageField(_('Icon'), upload_to='member-icons/', blank=True)
- class Admin:
- pass
-
def save(self):
self.slug = slugify(self.title)
super(MemberFunction, self).save()
@@ -99,14 +86,6 @@ class Member(models.Model):
def __unicode__(self):
return str(self.user.username)
- class Admin:
- list_display = (
- 'user',
- 'is_doghandler_boolean',
- 'photo',
- 'homepage_url',
- )
-
class Meta:
ordering = ('user',)
permissions = (
apps/member/models.py
@@ -15,12 +15,6 @@ class NewsCategory(models.Model):
verbose_name = _('News Category')
verbose_name_plural = _('News Category')
- class Admin:
- list_display = (
- 'title',
- 'slug',
- )
-
def save(self):
self.slug = slugify(self.title[:50])
super(NewsCategory, self).save()
@@ -42,12 +36,6 @@ class NewsEntry(models.Model):
galleries = models.ManyToManyField(Gallery, blank=True, null=True)
last_modified = models.DateTimeField(_('Modified'), auto_now=True, editable=False)
- class Admin:
- list_display = (
- 'title',
- 'slug',
- )
-
class Meta:
verbose_name = _('News Entry')
verbose_name_plural = _('News Entries')
@@ -91,9 +79,6 @@ class NewsEntryComment(models.Model):
host = models.CharField(_('User Host'), max_length=250, blank=True)
spam = models.BooleanField(_('Spam'), default=False)
- class Admin:
- pass
-
class Meta:
verbose_name = _('News Entry Comments')
verbose_name_plural = _('News Entries Comments')
apps/news/models.py
@@ -35,22 +35,6 @@ class Page(models.Model):
meta_description = models.TextField(_('Meta Description'), blank=True)
last_modified = models.DateTimeField(_('Modified'), auto_now=True, editable=False)
- class Admin:
- list_display = (
- 'id_name',
- 'title',
- 'last_modified',
- )
- fields = (
- (None, {
- 'fields': ('id_name', 'title', 'content')
- }),
- (_('Advanced options'), {
- 'classes': 'collapse',
- 'fields' : ('meta_keywords', 'meta_description')
- }),
- )
-
class Meta:
verbose_name = 'Seite'
verbose_name_plural = 'Seiten'
apps/pages/models.py
@@ -1,9 +1,9 @@
{% extends "admin/base_site.html" %}
{% load i18n admin_modify adminmedia %}
+
{% block extrahead %}{{ block.super }}
<script type="text/javascript" src="../../../jsi18n/"></script>
-{% for js in javascript_imports %}{% include_admin_script js %}{% endfor %}
-{# TINY_MCE ADDON #}
+{{ media }}
<script type="text/javascript" src="/media/theme/tiny_mce/tiny_mce.js"></script>
<script type="text/javascript">
tinyMCE.init({
@@ -15,7 +15,7 @@
language : "de",
plugins : "paste,inlinepopups,style",
- // Theme
+ // Theme
theme_advanced_toolbar_location : 'top',
theme_advanced_statusbar_location : 'bottom',
theme_advanced_buttons1 : "bold,italic,styleprops,|,justifyleft,justifycenter,justifyright,|,bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,image,|,pastetext,pasteword,cleanup,|,code",
@@ -24,22 +24,27 @@
theme_advanced_toolbar_align : "left",
theme_advanced_resizing : true,
theme_advanced_resize_horizontal : false,
- relative_urls : false,
+ relative_urls : false,
});
</script>
{% endblock %}
-{% block stylesheet %}{% admin_media_prefix %}css/forms.css{% endblock %}
+
+{% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{% endblock %}
+
{% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %}
+
{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %}
+
{% block breadcrumbs %}{% if not is_popup %}
<div class="breadcrumbs">
<a href="../../../">{% trans "Home" %}</a> ›
- <a href="../">{{ opts.verbose_name_plural|capfirst }}</a> ›
+ <a href="../../">{{ app_label|capfirst|escape }}</a> ›
+ {% if has_change_permission %}<a href="../">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} ›
{% if add %}{% trans "Add" %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %}
</div>
{% endif %}{% endblock %}
-{% block content %}
-<div id="content-main">
+
+{% block content %}<div id="content-main">
{% block object-tools %}
{% if change %}{% if not is_popup %}
<ul class="object-tools"><li><a href="history/" class="historylink">{% trans "History" %}</a></li>
@@ -50,45 +55,35 @@
<form {% if has_file_field %}enctype="multipart/form-data" {% endif %}action="{{ form_url }}" method="post" id="{{ opts.module_name }}_form">{% block form_top %}{% endblock %}
<div>
{% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}
-{% if opts.admin.save_on_top %}{% submit_row %}{% endif %}
-{% if form.error_dict %}
+{% if save_on_top %}{% submit_row %}{% endif %}
+{% if errors %}
<p class="errornote">
- {% blocktrans count form.error_dict.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
+ {% blocktrans count errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}
</p>
+ <ul class="errorlist">{% for error in adminform.form.non_field_errors %}<li>{{ error }}</li>{% endfor %}</ul>
{% endif %}
-{% for bound_field_set in bound_field_sets %}
- <fieldset class="module aligned {{ bound_field_set.classes }}">
- {% if bound_field_set.name %}<h2>{{ bound_field_set.name }}</h2>{% endif %}
- {% if bound_field_set.description %}<div class="description">{{ bound_field_set.description|safe }}</div>{% endif %}
- {% for bound_field_line in bound_field_set %}
- {% admin_field_line bound_field_line %}
- {% for bound_field in bound_field_line %}
- {% filter_interface_script_maybe bound_field %}
- {% endfor %}
- {% endfor %}
- </fieldset>
+
+{% for fieldset in adminform %}
+ {% include "admin/includes/fieldset.html" %}
{% endfor %}
+
{% block after_field_sets %}{% endblock %}
-{% if change %}
- {% if ordered_objects %}
- <fieldset class="module"><h2>{% trans "Ordering" %}</h2>
- <div class="form-row{% if form.order_.errors %} error{% endif %} ">
- {% if form.order_.errors %}{{ form.order_.html_error_list }}{% endif %}
- <p><label for="id_order_">{% trans "Order:" %}</label> {{ form.order_ }}</p>
- </div></fieldset>
- {% endif %}
-{% endif %}
-{% for related_object in inline_related_objects %}{% edit_inline related_object %}{% endfor %}
+
+{% for inline_admin_formset in inline_admin_formsets %}
+ {% include inline_admin_formset.opts.template %}
+{% endfor %}
+
{% block after_related_objects %}{% endblock %}
+
{% submit_row %}
-{% if add %}
- <script type="text/javascript">document.getElementById("{{ first_form_field_id }}").focus();</script>
-{% endif %}
-{% if auto_populated_fields %}
- <script type="text/javascript">
- {% auto_populated_field_script auto_populated_fields change %}
- </script>
+
+{% if adminform and add %}
+ <script type="text/javascript">document.getElementById("{{ adminform.first_field.auto_id }}").focus();</script>
{% endif %}
+
+{# JavaScript for prepopulated fields #}
+{% prepopulated_fields_js %}
+
</div>
</form></div>
{% endblock %}
templates/admin/change_form.html
8a0d672b3bf0add9c6a3d3f22b66e3041287a933
Martin Mahner
martin@mahner.org
http://github.com/bartTC/k9/commit/8237f75eec6facd09a127cfbfdbbb3d7b63c1a2c
8237f75eec6facd09a127cfbfdbbb3d7b63c1a2c
2009-05-23T08:13:50-07:00
2009-05-23T08:13:50-07:00
Removed Admin definitions from models. Created admin.py's for all apps.
bc6c1b18677a42f73d2c5029830c3a4b35163979
Martin Mahner
martin@mahner.org