diff --git a/django/contrib/admin/media/css/forms.css b/django/contrib/admin/media/css/forms.css index 14363b26a9..2ce94f949e 100644 --- a/django/contrib/admin/media/css/forms.css +++ b/django/contrib/admin/media/css/forms.css @@ -334,6 +334,10 @@ fieldset.monospace textarea { width: 19%; } +.inline-selector a, .inline-selector a:visited { + color: #000; +} + .inline-selector-item { background-color: #F6F6F6; border: 1px solid #E7E7E7; @@ -342,10 +346,13 @@ fieldset.monospace textarea { font-size: 0.9em; } +.inline-selector-item:hover { + background-color: #C1DBFD; +} + .inline-detail { float: right; width: 80%; - background: #c9c; border-left: 1px solid #EEE; } @@ -353,6 +360,14 @@ fieldset.monospace textarea { float: right; } +.inline-selected { + background-color: #9EB7D5; +} + +.inline-selected a, .inline-selected a:visited { + color: #FFF; +} + .clear { clear: both; } \ No newline at end of file diff --git a/django/contrib/admin/templates/admin/edit_inline/selector.html b/django/contrib/admin/templates/admin/edit_inline/selector.html index 35c6454e87..5da586ff1d 100644 --- a/django/contrib/admin/templates/admin/edit_inline/selector.html +++ b/django/contrib/admin/templates/admin/edit_inline/selector.html @@ -9,49 +9,53 @@
{% for inline_admin_form in inline_admin_formset %}
+ {% 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 %}{% trans "View on site" %}{% endif %} {% else %} - New Inline + [New Inline] {% endif %} +
{% endfor %}
{% for inline_admin_form in inline_admin_formset %} -

- {% 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 %}{% trans "View on site" %}{% endif %} - {% else %} - [New Inline] +
+

+ {% 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 %}{% trans "View on site" %}{% endif %} + {% else %} + [New Inline] + {% endif %} + + {% if inline_admin_formset.formset.can_delete %} + + {% if inline_admin_form.original %} + {{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }} + {% endif %} + + {% endif %} +

+ + {% if inline_admin_form.form.non_field_errors %} + {{ inline_admin_form.form.non_field_errors }} {% endif %} - - {% if inline_admin_formset.formset.can_delete %} - - {% if inline_admin_form.original %} - {{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }} - {% endif %} - - {% endif %} -

- - {% if inline_admin_form.form.non_field_errors %} - {{ inline_admin_form.form.non_field_errors }} - {% 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 %} + {% for line in fieldset %} + {% for field in line %} + {% if field.is_hidden %} {{ field.field }} {% endif %} + {% endfor %} + {% endfor %} {% endfor %} {% endspaceless %} @@ -81,4 +85,24 @@
- \ No newline at end of file + + + \ No newline at end of file