From 42393ff604cca9aa20daae56ea3fef21548c1551 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Wed, 3 Sep 2008 04:22:39 +0000 Subject: [PATCH] Fixed #8812 -- Fixed up the positioning of the "delete" link in the admin interface for right-to-left languages (Hebrew, Arabic, etc). Patch from Jannis Leidel. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8903 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/media/css/forms.css | 3 ++- django/contrib/admin/media/css/rtl.css | 2 ++ django/contrib/admin/templates/admin/submit_line.html | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/django/contrib/admin/media/css/forms.css b/django/contrib/admin/media/css/forms.css index 21aadc9465..713665f2d0 100644 --- a/django/contrib/admin/media/css/forms.css +++ b/django/contrib/admin/media/css/forms.css @@ -47,6 +47,7 @@ fieldset.monospace textarea { font-family:"Bitstream Vera Sans Mono",Monaco,"Cou .submit-row { padding:5px 7px; text-align:right; background:white url(../img/admin/nav-bg.gif) 0 100% repeat-x; border:1px solid #ccc; margin:5px 0; } .submit-row input { margin:0 0 0 5px; } .submit-row p { margin-top:0.3em; } +.submit-row p.deletelink-box { float: left; } .submit-row .deletelink { background:url(../img/admin/icon_deletelink.gif) 0 50% no-repeat; padding-left:14px; } /* CUSTOM FORM FIELDS */ @@ -80,4 +81,4 @@ fieldset.monospace textarea { font-family:"Bitstream Vera Sans Mono",Monaco,"Cou .inline-group .tabular td.original p {position:absolute; left:0; height:1.1em; padding:2px 7px; overflow:hidden; font-size:9px; font-weight:bold; color:#666; _width:700px; } .inline-group ul.tools {padding:0; margin: 0; list-style:none;} .inline-group ul.tools li {display:inline; padding:0 5px;} -.inline-group ul.tools a.add {background:url(../img/admin/icon_addlink.gif) 0 50% no-repeat; padding-left:14px;} \ No newline at end of file +.inline-group ul.tools a.add {background:url(../img/admin/icon_addlink.gif) 0 50% no-repeat; padding-left:14px;} diff --git a/django/contrib/admin/media/css/rtl.css b/django/contrib/admin/media/css/rtl.css index 91053fa244..a7db17db9a 100644 --- a/django/contrib/admin/media/css/rtl.css +++ b/django/contrib/admin/media/css/rtl.css @@ -35,6 +35,8 @@ div.breadcrumbs { text-align:right; } /* form styles */ .aligned label { padding:0 0 3px 1em; float:right; } .submit-row { text-align: left } +.submit-row p.deletelink-box { float: right;} +.submit-row .deletelink { background:url(../img/admin/icon_deletelink.gif) 0 50% no-repeat; padding-right:14px; } .vDateField, .vTimeField { margin-left:2px; } form ul.inline li { float:right; padding-right:0; padding-left:7px; } input[type=submit].default, .submit-row input.default { float:left; } diff --git a/django/contrib/admin/templates/admin/submit_line.html b/django/contrib/admin/templates/admin/submit_line.html index c5d673fa93..8bb5d27bbf 100644 --- a/django/contrib/admin/templates/admin/submit_line.html +++ b/django/contrib/admin/templates/admin/submit_line.html @@ -1,7 +1,7 @@ {% load i18n %}
{% if show_save %}{% endif %} -{% if show_delete_link %}

{% trans "Delete" %}

{% endif %} +{% if show_delete_link %}{% endif %} {% if show_save_as_new %}{%endif%} {% if show_save_and_add_another %}{% endif %} {% if show_save_and_continue %}{% endif %}