From: richard Date: Sat, 3 Nov 2001 01:56:51 +0000 (+0000) Subject: More HTML compliance fixes. This will probably fix the Netscape problem X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0102f281b217e6c25a614fd1463ccfa3b7a45752;p=roundup.git More HTML compliance fixes. This will probably fix the Netscape problem too. git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@362 57a73879-2fb5-44c3-a270-3262357dd7e2 --- diff --git a/CHANGES.txt b/CHANGES.txt index 0943d95..0fce858 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -19,6 +19,7 @@ Fixed: . bug #474749 ] indentations lost . bug #477104 ] HTML tag error in roundup-server . bug #477107 ] HTTP header problem + . bug #477687 ] conforming html 2001-10-23 - 0.3.0 pre 3 diff --git a/roundup/htmltemplate.py b/roundup/htmltemplate.py index f3fe70c..c3ab8a1 100644 --- 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.39 2001-11-03 01:43:47 richard Exp $ +# $Id: htmltemplate.py,v 1.40 2001-11-03 01:56:51 richard Exp $ import os, re, StringIO, urllib, cgi, errno @@ -521,11 +521,11 @@ class IndexTemplate(TemplateFunctions): columns = l # display the filter section - if (hasattr(self.client, 'FILTER_POSITION') and + if (show_display_form and hasattr(self.client, 'FILTER_POSITION') and self.client.FILTER_POSITION in ('top and bottom', 'top')): w('
\n') self.filter_section(filter_template, filter, columns, group, - all_filters, all_columns, show_display_form, show_customization) + all_filters, all_columns, show_customization) # make sure that the sorting doesn't get lost either if sort: w(''% @@ -602,11 +602,11 @@ class IndexTemplate(TemplateFunctions): w('') # display the filter section - if (hasattr(self.client, 'FILTER_POSITION') and + if (show_display_form and hasattr(self.client, 'FILTER_POSITION') and self.client.FILTER_POSITION in ('top and bottom', 'bottom')): w('\n') self.filter_section(filter_template, filter, columns, group, - all_filters, all_columns, show_display_form, show_customization) + all_filters, all_columns, show_customization) # make sure that the sorting doesn't get lost either if sort: w(''% @@ -615,7 +615,7 @@ class IndexTemplate(TemplateFunctions): def filter_section(self, template, filter, columns, group, all_filters, - all_columns, show_display_form, show_customization): + all_columns, show_customization): w = self.client.write @@ -639,7 +639,6 @@ class IndexTemplate(TemplateFunctions): for name in self.properties.keys(): if name in all_filters or name in all_columns: names.append(name) - w('') if show_customization: action = '-' else: @@ -654,69 +653,71 @@ class IndexTemplate(TemplateFunctions): if all_columns and name in group: w('' % name) - if show_display_form: - # TODO: The widget style can go into the stylesheet - w('' - ' View ' - 'customisation...\n'%(len(names)+1, action)) - if show_customization: - w(' ') - for name in names: - w('%s'%name.capitalize()) - w('\n') - - # Filter - if all_filters: - w('' - 'Filters\n') - for name in names: - if name not in all_filters: - w(' ') - continue - if name in filter: checked=' checked' - else: checked='' - w('\n') - w(' \n'%(name, checked)) - w('\n') - - # Columns - if all_columns: - w('' - 'Columns\n') - for name in names: - if name not in all_columns: - w(' ') - continue - if name in columns: checked=' checked' - else: checked='' - w('\n') - w(' \n'%(name, checked)) - w('\n') - - # Grouping - w('' - 'Grouping\n') - for name in names: - prop = self.properties[name] - if name not in all_columns: - w(' ') - continue - if name in group: checked=' checked' - else: checked='' - w('\n') - w(' \n'%(name, checked)) - w('\n') - - w(' ') - w(''%len(names)) - w('') - w('\n') + # TODO: The widget style can go into the stylesheet + w('' + ' View ' + 'customisation...\n'%(len(names)+1, action)) + if not show_customization: w('\n') + w(' ') + for name in names: + w('%s'%name.capitalize()) + w('\n') + + # Filter + if all_filters: + w('' + 'Filters\n') + for name in names: + if name not in all_filters: + w(' ') + continue + if name in filter: checked=' checked' + else: checked='' + w('\n') + w(' \n'%(name, checked)) + w('\n') + + # Columns + if all_columns: + w('' + 'Columns\n') + for name in names: + if name not in all_columns: + w(' ') + continue + if name in columns: checked=' checked' + else: checked='' + w('\n') + w(' \n'%(name, checked)) + w('\n') + + # Grouping + w('' + 'Grouping\n') + for name in names: + prop = self.properties[name] + if name not in all_columns: + w(' ') + continue + if name in group: checked=' checked' + else: checked='' + w('\n') + w(' \n'%(name, checked)) + w('\n') + + w(' ') + w(''%len(names)) + w('') + w('\n') + w('\n') + + def sortby(self, sort_name, filterspec, columns, filter, group, sort): l = [] w = l.append @@ -848,6 +849,9 @@ class NewItemTemplate(TemplateFunctions): # # $Log: not supported by cvs2svn $ +# Revision 1.39 2001/11/03 01:43:47 richard +# Ahah! Fixed the lynx problem - there was a hidden input field misplaced. +# # Revision 1.38 2001/10/31 06:58:51 richard # Added the wrap="hard" attribute to the textarea of the note field so the # messages wrap sanely.