Bugfix in filter "widget" placement, thanks Roch'e

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@331 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/doc/announcement.txt b/doc/announcement.txt
index 0ce13e8e3c89450450253f25dc9359dab5fb20d7..5be3d64d6be37682f1890c64ae387880067e668e 100644 (file)
--- a/doc/announcement.txt
+++ b/doc/announcement.txt
@@ -1,9 +1,8 @@
-            Roundup 0.3.0pre2 - an issue tracking system
+            Roundup 0.3.0pre3 - an issue tracking system
 
                         **PREVIEW RELEASE**
 
-This release is in use by Bizar Software, but has had little testing beyond
-that. It contains several new features which will require migration, so
+This release contains several new features which will require migration, so
 we're releasing this preview for the bleeding-edge users.
 
 **NOTE** existing users _must_ read the MIGRATION.txt that accompanies the
@@ -13,13 +12,13 @@ This release contains a bunch of changes and bug fixes. See the CHANGES
 file for details.
 
 Source and documentation is available at the website:
-      http://roundup.sourceforge.net/
+     http://roundup.sourceforge.net/
 
 Release Info (via download page):
-     https://sourceforge.net/project/showfiles.php?group_id=31577
+     http://sourceforge.net/project/showfiles.php?group_id=31577
 
 Mailing lists - the place to ask questions:
-     https://sourceforge.net/mail/?group_id=31577
+     http://sourceforge.net/mail/?group_id=31577
 
 
 

diff --git a/roundup/htmltemplate.py b/roundup/htmltemplate.py
index fc0baa454079c1a11e94759ef31d127ab02e9597..d028393073e35b41edd48b0d41259215f00eb26f 100644 (file)
--- a/roundup/htmltemplate.py
+++ b/roundup/htmltemplate.py
@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: htmltemplate.py,v 1.33 2001-10-23 01:00:18 richard Exp $
+# $Id: htmltemplate.py,v 1.34 2001-10-23 22:56:36 richard Exp $
 
 import os, re, StringIO, urllib, cgi, errno
 
@@ -487,18 +487,6 @@ class IndexTemplate(TemplateFunctions):
             filter_template = None
             all_filters = []
 
-        # display the filter section
-        if (hasattr(self.client, 'FILTER_POSITION') and
-                self.client.FILTER_POSITION in ('top and bottom', 'top')):
-            w('<form>\n')
-            self.filter_section(filter_template, filter, columns, group,
-                all_filters, all_columns, show_display_form, show_customization)
-            w('</form>\n')
-
-        # make sure that the sorting doesn't get lost either
-        if sort:
-            w('<input type="hidden" name=":sort" value="%s">'%','.join(sort))
-
         # XXX deviate from spec here ...
         # load the index section template and figure the default columns from it
         template = open(os.path.join(self.templates,
@@ -516,6 +504,18 @@ class IndexTemplate(TemplateFunctions):
                     l.append(name)
             columns = l
 
+        # display the filter section
+        if (hasattr(self.client, 'FILTER_POSITION') and
+                self.client.FILTER_POSITION in ('top and bottom', 'top')):
+            w('<form>\n')
+            self.filter_section(filter_template, filter, columns, group,
+                all_filters, all_columns, show_display_form, show_customization)
+            w('</form>\n')
+
+        # make sure that the sorting doesn't get lost either
+        if sort:
+            w('<input type="hidden" name=":sort" value="%s">'%','.join(sort))
+
         # now display the index section
         w('<table width=100% border=0 cellspacing=0 cellpadding=2>\n')
         w('<tr class="list-header">\n')
@@ -827,6 +827,13 @@ class NewItemTemplate(TemplateFunctions):
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.33  2001/10/23 01:00:18  richard
+# Re-enabled login and registration access after lopping them off via
+# disabling access for anonymous users.
+# Major re-org of the htmltemplate code, cleaning it up significantly. Fixed
+# a couple of bugs while I was there. Probably introduced a couple, but
+# things seem to work OK at the moment.
+#
 # Revision 1.32  2001/10/22 03:25:01  richard
 # Added configuration for:
 #  . anonymous user access and registration (deny/allow)