mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity

[soc2009/admin-ui] the beginnings of a new type of inline, called Selector Inline, based on this mockup: http://media.wilsonminer.com/images/django/related-objects-stacked.gif

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/admin-ui@10958 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Zain Memon 2009-06-09 03:44:46 +00:00
parent e9b2fc1f29
commit aac3f307f1
5 changed files with 119 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/admin/__init__.py
View File

@ -1,6 +1,6 @@
from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
from django.contrib.admin.options import ModelAdmin, HORIZONTAL, VERTICAL
from django.contrib.admin.options import StackedInline, TabularInline
from django.contrib.admin.options import StackedInline, TabularInline, SelectorInline
from django.contrib.admin.sites import AdminSite, site
from django.utils.importlib import import_module

28
django/contrib/admin/media/css/forms.css
View File

@ -328,3 +328,31 @@ fieldset.monospace textarea {
.add_inline {
display: none;
}
.inline-selector {
float: left;
width: 19%;
}
.inline-selector-item {
background-color: #F6F6F6;
border: 1px solid #E7E7E7;
padding: 5px;
margin: 7px 0px 7px 5px;
font-size: 0.9em;
}
.inline-detail {
float: right;
width: 80%;
background: #c9c;
border-left: 1px solid #EEE;
}
.inline-selector-delete {
float: right;
}
.clear {
clear: both;
}

3
django/contrib/admin/options.py
View File

@ -1166,3 +1166,6 @@ class StackedInline(InlineModelAdmin):
class TabularInline(InlineModelAdmin):
template = 'admin/edit_inline/tabular.html'
class SelectorInline(InlineModelAdmin):
template = 'admin/edit_inline/selector.html'

84
django/contrib/admin/templates/admin/edit_inline/selector.html Normal file
View File

@ -0,0 +1,84 @@
{% load i18n %}
<div class="inline-group">
<div class="tabular inline-related {% if forloop.last %}last-related{% endif %}">
{{ inline_admin_formset.formset.management_form }}
<h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
{{ inline_admin_formset.formset.non_form_errors }}
<div class="inline-selector">
{% for inline_admin_form in inline_admin_formset %}
<div class="inline-selector-item">
{% if inline_admin_form.original or inline_admin_form.show_url %}
{% 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 %}
{% else %}
New Inline
{% endif %}
</div>
{% endfor %}
</div>
<div class="inline-detail">
{% for inline_admin_form in inline_admin_formset %}
<h3>
{% if inline_admin_form.original or inline_admin_form.show_url %}
{% 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 %}
{% else %}
[New Inline]
{% endif %}
{% if inline_admin_formset.formset.can_delete %}
<span class="inline-selector-delete">
{% if inline_admin_form.original %}
{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}
{% endif %}
</span>
{% endif %}
</h3>
{% if inline_admin_form.form.non_field_errors %}
{{ inline_admin_form.form.non_field_errors }}
{% endif %}
<div class="selector-item-detail">
{% 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 %}
{% for fieldset in inline_admin_form %}
<fieldset class="module aligned {{ fieldset.classes }}">
{% if fieldset.name %}<h2>{{ fieldset.name }}</h2>{% endif %}
{% if fieldset.description %}<div class="description">{{ fieldset.description|safe }}</div>{% endif %}
{% for line in fieldset %}
<div class="form-row{% if line.errors %} errors{% endif %} {% for field in line %}{{ field.field.name }} {% endfor %} ">
{{ line.errors }}
{% for field in line %}
<div{% if not line.fields|length_is:"1" %} class="field-box"{% endif %}>
{% if field.is_checkbox %}
{{ field.field }}{{ field.label_tag }}
{% else %}
{{ field.label_tag }}{{ field.field }}
{% endif %}
{% if field.field.field.help_text %}<p class="help">{{ field.field.field.help_text|safe }}</p>{% endif %}
</div>
{% endfor %}
</div>
{% endfor %}
</fieldset>
{% endfor %}
</div>
{% endfor %}
</div>
<div class="clear"></div>
</div>
</div>

3
django/contrib/contenttypes/generic.py
View File

@ -399,3 +399,6 @@ class GenericStackedInline(GenericInlineModelAdmin):
class GenericTabularInline(GenericInlineModelAdmin):
template = 'admin/edit_inline/tabular.html'
class GenericSelectorInline(GenericInlineModelAdmin):
template = 'admin/edit_inline/selector.html'