From 33640b247a8d1d40f1f08bb82c975f3161068b7f Mon Sep 17 00:00:00 2001
From: Robert Wittams <robert@wittams.com>
Date: Fri, 4 Nov 2005 13:37:10 +0000
Subject: [PATCH] Added change_list_results.html and fixed order_type

git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1071 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 .../templates/admin/change_list_results.html    | 17 +++++++++++++++++
 django/contrib/admin/templatetags/admin_list.py |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 django/contrib/admin/templates/admin/change_list_results.html

diff --git a/django/contrib/admin/templates/admin/change_list_results.html b/django/contrib/admin/templates/admin/change_list_results.html
new file mode 100644
index 0000000000..58773e416c
--- /dev/null
+++ b/django/contrib/admin/templates/admin/change_list_results.html
@@ -0,0 +1,17 @@
+<table cellspacing="0">
+<thead>
+<tr>
+{% for header in result_headers %}<th{{header.class_attrib}}>
+{%if header.sortable%}<a href="{% query_string cl override ORDER_VAR:i ORDER_TYPE_VAR:header.order %}" %>{%endif%}
+{{header.text|capfirst}}
+{%if header.sortable %}</a>{% endif %}</th>{% endfor %}
+</tr>
+</thead>
+{%for result in results %}
+  <tr class="{%cycle row1,row2%}" >
+  {%for item in result %}
+    {{item }}
+  {%endfor%}
+  </tr>
+{%endfor%}
+</table>
diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py
index 48cf2d12a6..86ac765b0d 100644
--- a/django/contrib/admin/templatetags/admin_list.py
+++ b/django/contrib/admin/templatetags/admin_list.py
@@ -135,8 +135,8 @@ def result_headers(cl):
                     th_classes = []
                     new_order_type = 'asc'
                     if field_name == cl.order_field:
-                        th_classes.append('sorted %sending' % order_type.lower())
-                        new_order_type = {'asc': 'desc', 'desc': 'asc'}[order_type.lower()]
+                        th_classes.append('sorted %sending' % cl.order_type.lower())
+                        new_order_type = {'asc': 'desc', 'desc': 'asc'}[cl.order_type.lower()]
                     
                     yield {"text" : f.verbose_name, 
                            "sortable": True,