[Zope-Checkins] CVS: Zope/lib/python/OFS/dtml - main.dtml:1.18.10.1

Yvo Schubbe schubbe@web.de
Fri, 25 Apr 2003 05:33:16 -0400


Update of /cvs-repository/Zope/lib/python/OFS/dtml
In directory cvs.zope.org:/tmp/cvs-serv1934

Modified Files:
      Tag: yuppie-ordersupport-branch
	main.dtml 
Log Message:
fixed reverse sorting behavior


=== Zope/lib/python/OFS/dtml/main.dtml 1.18 => 1.18.10.1 ===
--- Zope/lib/python/OFS/dtml/main.dtml:1.18	Sun Feb  2 06:42:13 2003
+++ Zope/lib/python/OFS/dtml/main.dtml	Fri Apr 25 05:33:15 2003
@@ -66,7 +66,7 @@
 <tr class="list-header">
   <td width="5%" align="right" colspan="2"><div 
    class="list-item"><a href="./manage_main?skey=meta_type<dtml-if 
-   "rkey == ''">&rkey=meta_type</dtml-if>"
+   "skey == 'meta_type' and not rkey">&rkey=meta_type</dtml-if>"
    onMouseOver="window.status='Sort objects by type'; return true"
    onMouseOut="window.status=''; return true"><dtml-if 
    "skey == 'meta_type' or rkey == 'meta_type'"
@@ -74,7 +74,7 @@
   </td>
   <td width="50%" align="left"><div class="list-item"><a 
    href="./manage_main?skey=id<dtml-if 
-   "rkey == ''">&rkey=id</dtml-if>"
+   "skey == 'id' and not rkey">&rkey=id</dtml-if>"
    onMouseOver="window.status='Sort objects by name'; return true"
    onMouseOut="window.status=''; return true"><dtml-if 
    "skey == 'id' or rkey == 'id'"
@@ -82,7 +82,7 @@
   </td>
   <td width="15%" align="left"><div class="list-item"><a 
    href="./manage_main?skey=get_size<dtml-if 
-   "rkey == ''">&rkey=get_size</dtml-if>"
+   "skey == 'get_size' and not rkey">&rkey=get_size</dtml-if>"
    onMouseOver="window.status='Sort objects by size'; return true"
    onMouseOut="window.status=''; return true"><dtml-if 
    "skey == 'get_size' or rkey == 'get_size'"
@@ -90,8 +90,8 @@
   </td>
   <td width="29%" align="left"><div class="list-item"><a 
    href="./manage_main?skey=bobobase_modification_time<dtml-if 
-   "rkey == ''">&rkey=bobobase_modification_time</dtml-if
-   >"
+   "skey == 'bobobase_modification_time' and not rkey"
+   >&rkey=bobobase_modification_time</dtml-if>"
    onMouseOver="window.status='Sort objects by modification time'; return true"
    onMouseOut="window.status=''; return true"><dtml-if 
    "skey == 'bobobase_modification_time' or rkey == 'bobobase_modification_time'"