Author: mtredinnick
Date: 2008-08-23 14:07:49 -0500 (Sat, 23 Aug 2008)
New Revision: 8501
Modified:
django/trunk/django/contrib/admin/media/css/global.css
django/trunk/django/contrib/admin/media/css/rtl.css
django/trunk/django/contrib/admin/templates/admin/submit_line.html
Log:
Tweaked the Admin add/change page so that "save" is still the highlighted
too look like the default button and it actually operates as the defaut
(previously "save and add another" was the default action, which confused
people if you hit the save button and it looked like your work was eaten by a
grue).
Fixed #7272. Patch from Jannis Leidel.
Modified: django/trunk/django/contrib/admin/media/css/global.css
===================================================================
--- django/trunk/django/contrib/admin/media/css/global.css 2008-08-23
18:54:43 UTC (rev 8500)
+++ django/trunk/django/contrib/admin/media/css/global.css 2008-08-23
19:07:49 UTC (rev 8501)
@@ -89,7 +89,7 @@
/* FORM BUTTONS */
input[type=submit], input[type=button], .submit-row input { background:white
url(../img/admin/nav-bg.gif) bottom repeat-x; padding:3px; color:black;
border:1px solid #bbb; border-color:#ddd #aaa #aaa #ddd; }
input[type=submit]:active, input[type=button]:active {
background-image:url(../img/admin/nav-bg-reverse.gif); background-position:top;
}
-input[type=submit].default, .submit-row input.default { border:2px solid
#5b80b2; background:#7CA0C7 url(../img/admin/default-bg.gif) bottom repeat-x;
font-weight:bold; color:white; }
+input[type=submit].default, .submit-row input.default { border:2px solid
#5b80b2; background:#7CA0C7 url(../img/admin/default-bg.gif) bottom repeat-x;
font-weight:bold; color:white; float:right; }
input[type=submit].default:active {
background-image:url(../img/admin/default-bg-reverse.gif);
background-position:top; }
/* MODULES */
Modified: django/trunk/django/contrib/admin/media/css/rtl.css
===================================================================
--- django/trunk/django/contrib/admin/media/css/rtl.css 2008-08-23 18:54:43 UTC
(rev 8500)
+++ django/trunk/django/contrib/admin/media/css/rtl.css 2008-08-23 19:07:49 UTC
(rev 8501)
@@ -37,6 +37,7 @@
.submit-row { text-align: left }
.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; }
/* widget styles */
.calendarnav-previous { top:0; left:auto; right:0; }
Modified: django/trunk/django/contrib/admin/templates/admin/submit_line.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/submit_line.html
2008-08-23 18:54:43 UTC (rev 8500)
+++ django/trunk/django/contrib/admin/templates/admin/submit_line.html
2008-08-23 19:07:49 UTC (rev 8501)
@@ -1,8 +1,8 @@
{% load i18n %}
<div class="submit-row">
+{% if show_save %}<input type="submit" value="{% trans 'Save' %}"
class="default" name="_save" {{ onclick_attrib }}/>{% endif %}
{% if show_delete_link %}<p class="float-left"><a href="delete/"
class="deletelink">{% trans "Delete" %}</a></p>{% endif %}
{% if show_save_as_new %}<input type="submit" value="{% trans 'Save as new'
%}" name="_saveasnew" {{ onclick_attrib }}/>{%endif%}
{% if show_save_and_add_another %}<input type="submit" value="{% trans 'Save
and add another' %}" name="_addanother" {{ onclick_attrib }} />{% endif %}
{% if show_save_and_continue %}<input type="submit" value="{% trans 'Save and
continue editing' %}" name="_continue" {{ onclick_attrib }}/>{% endif %}
-{% if show_save %}<input type="submit" value="{% trans 'Save' %}"
class="default" name="_save" {{ onclick_attrib }}/>{% endif %}
</div>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
