1 | --- trunk/django/django/conf/admin_templates/delete_confirmation_generic.html (revision 656)
|
---|
2 | +++ trunk/django/django/conf/admin_templates/delete_confirmation_generic.html (working copy)
|
---|
3 | @@ -14,7 +14,8 @@
|
---|
4 | <ul>{{ deleted_objects|unordered_list }}</ul>
|
---|
5 | <form action="" method="post">
|
---|
6 | <input type="hidden" name="post" value="yes" />
|
---|
7 | - <input type="submit" value="Yes, I'm sure" />
|
---|
8 | + <input type="submit" value="Yes, delete the {{ object_name }}" />
|
---|
9 | + <span class="cancel"> or <a href="../">cancel</a></span>
|
---|
10 | </form>
|
---|
11 | {% endif %}
|
---|
12 |
|
---|
13 | --- trunk/django/django/conf/admin_media/css/global.css (revision 656)
|
---|
14 | +++ trunk/django/django/conf/admin_media/css/global.css (working copy)
|
---|
15 | @@ -37,6 +37,7 @@
|
---|
16 | a:link, a:visited { color: #5b80b2; text-decoration:none; }
|
---|
17 | a:hover { color: #036; }
|
---|
18 | a img { border:none; }
|
---|
19 | +span.cancel {font-size:12px; vertical-align:bottom;}
|
---|
20 |
|
---|
21 | /* GLOBAL DEFAULTS */
|
---|
22 |
|
---|
23 | --- trunk/django/django/views/admin/main.py (revision 656)
|
---|
24 | +++ trunk/django/django/views/admin/main.py (working copy)
|
---|
25 | @@ -527,6 +527,7 @@
|
---|
26 | (ordered_objects and change and 'onclick="submitOrderForm();"' or ''))
|
---|
27 | t.append('<input type="submit" value="Save" class="default" %s/>' % \
|
---|
28 | (ordered_objects and change and 'onclick="submitOrderForm();"' or ''))
|
---|
29 | + t.append('<span class="cancel"> or <a href="../">cancel</a></span>')
|
---|
30 | t.append('</div>\n')
|
---|
31 | return t
|
---|
32 |
|
---|