Skip to content

Commit f2e8cb7

Browse files
committed
[soc2009/admin-ui] Better styling for Selector Inlines, and proper javascript hiding
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/admin-ui@10959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1 parent aac3f30 commit f2e8cb7

File tree

2 files changed

+68
-29
lines changed

2 files changed

+68
-29
lines changed

django/contrib/admin/media/css/forms.css

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,10 @@ fieldset.monospace textarea {
334334
width: 19%;
335335
}
336336

337+
.inline-selector a, .inline-selector a:visited {
338+
color: #000;
339+
}
340+
337341
.inline-selector-item {
338342
background-color: #F6F6F6;
339343
border: 1px solid #E7E7E7;
@@ -342,17 +346,28 @@ fieldset.monospace textarea {
342346
font-size: 0.9em;
343347
}
344348

349+
.inline-selector-item:hover {
350+
background-color: #C1DBFD;
351+
}
352+
345353
.inline-detail {
346354
float: right;
347355
width: 80%;
348-
background: #c9c;
349356
border-left: 1px solid #EEE;
350357
}
351358

352359
.inline-selector-delete {
353360
float: right;
354361
}
355362

363+
.inline-selected {
364+
background-color: #9EB7D5;
365+
}
366+
367+
.inline-selected a, .inline-selected a:visited {
368+
color: #FFF;
369+
}
370+
356371
.clear {
357372
clear: both;
358373
}

django/contrib/admin/templates/admin/edit_inline/selector.html

Lines changed: 52 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,53 @@ <h2>{{ inline_admin_formset.opts.verbose_name_plural|capfirst }}</h2>
99
<div class="inline-selector">
1010
{% for inline_admin_form in inline_admin_formset %}
1111
<div class="inline-selector-item">
12+
<a href="#" class="inline-select" title="{{ inline_admin_formset.opts.verbose_name}}{{ forloop.counter }}">
1213
{% if inline_admin_form.original or inline_admin_form.show_url %}
1314
{% if inline_admin_form.original %} {{ inline_admin_form.original }}{% endif %}
1415
{% 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 %}
1516
{% else %}
16-
New Inline
17+
[New Inline]
1718
{% endif %}
19+
</a>
1820
</div>
1921
{% endfor %}
2022
</div>
2123

2224
<div class="inline-detail">
2325
{% for inline_admin_form in inline_admin_formset %}
24-
<h3>
25-
{% if inline_admin_form.original or inline_admin_form.show_url %}
26-
{% if inline_admin_form.original %} {{ inline_admin_form.original }}{% endif %}
27-
{% 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 %}
28-
{% else %}
29-
[New Inline]
30-
{% endif %}
31-
32-
{% if inline_admin_formset.formset.can_delete %}
33-
<span class="inline-selector-delete">
34-
{% if inline_admin_form.original %}
35-
{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}
36-
{% endif %}
37-
</span>
26+
<div class="selector-item-detail" id="{{ inline_admin_formset.opts.verbose_name}}{{ forloop.counter }}">
27+
<h3>
28+
{% if inline_admin_form.original or inline_admin_form.show_url %}
29+
{% if inline_admin_form.original %} {{ inline_admin_form.original }}{% endif %}
30+
{% 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 %}
31+
{% else %}
32+
[New Inline]
33+
{% endif %}
34+
35+
{% if inline_admin_formset.formset.can_delete %}
36+
<span class="inline-selector-delete">
37+
{% if inline_admin_form.original %}
38+
{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}
39+
{% endif %}
40+
</span>
41+
{% endif %}
42+
</h3>
43+
44+
{% if inline_admin_form.form.non_field_errors %}
45+
{{ inline_admin_form.form.non_field_errors }}
3846
{% endif %}
39-
</h3>
40-
41-
{% if inline_admin_form.form.non_field_errors %}
42-
{{ inline_admin_form.form.non_field_errors }}
43-
{% endif %}
44-
45-
<div class="selector-item-detail">
47+
4648
{% if inline_admin_form.has_auto_field %}{{ inline_admin_form.pk_field.field }}{% endif %}
49+
4750
{{ inline_admin_form.fk_field.field }}
51+
4852
{% spaceless %}
4953
{% for fieldset in inline_admin_form %}
50-
{% for line in fieldset %}
51-
{% for field in line %}
52-
{% if field.is_hidden %} {{ field.field }} {% endif %}
53-
{% endfor %}
54-
{% endfor %}
54+
{% for line in fieldset %}
55+
{% for field in line %}
56+
{% if field.is_hidden %} {{ field.field }} {% endif %}
57+
{% endfor %}
58+
{% endfor %}
5559
{% endfor %}
5660
{% endspaceless %}
5761

@@ -81,4 +85,24 @@ <h3>
8185
</div>
8286
<div class="clear"></div>
8387
</div>
84-
</div>
88+
</div>
89+
90+
<script type="text/javascript">
91+
$(function() {
92+
$('.inline-detail .selector-item-detail').hide();
93+
$('.inline-detail .selector-item-detail:first').show();
94+
$('.inline-selector .inline-selector-item:first').addClass('inline-selected');
95+
96+
$('.inline-selector-item').click(function () {
97+
$('.inline-detail .selector-item-detail').hide();
98+
$('.inline-selector .inline-selector-item').removeClass('inline-selected');
99+
100+
$(this).addClass('inline-selected');
101+
102+
var div_to_show = '#' + $(this).find('a').attr('title');
103+
$(div_to_show).fadeIn('normal');
104+
105+
return false;
106+
});
107+
});
108+
</script>

0 commit comments

Comments
 (0)