Log message for revision 40344: Collector #1957: Made ZPublisher.HTTPResponse._error_html return conformant XHTML.
Changed: U Zope/branches/Zope-2_8-branch/doc/CHANGES.txt U Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/HTTPResponse.py -=- Modified: Zope/branches/Zope-2_8-branch/doc/CHANGES.txt =================================================================== --- Zope/branches/Zope-2_8-branch/doc/CHANGES.txt 2005-11-23 16:49:33 UTC (rev 40343) +++ Zope/branches/Zope-2_8-branch/doc/CHANGES.txt 2005-11-23 17:06:23 UTC (rev 40344) @@ -26,6 +26,9 @@ Bugs Fixed + - Collector #1957: Made ZPublisher.HTTPResponse._error_html + return conformant XHTML. + - Collector #1891: Backported changes to ZCatalog regression tests, removing use of 'whrandom' (and its 'seed' function). Modified: Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/HTTPResponse.py =================================================================== --- Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/HTTPResponse.py 2005-11-23 16:49:33 UTC (rev 40343) +++ Zope/branches/Zope-2_8-branch/lib/python/ZPublisher/HTTPResponse.py 2005-11-23 17:06:23 UTC (rev 40344) @@ -599,43 +599,44 @@ def _error_html(self,title,body): # XXX could this try to use standard_error_message somehow? return ("""\ -<TABLE BORDER="0" WIDTH="100%"> -<TR VALIGN="TOP"> +<table border="0" width="100%"> +<tr valign="top"> -<TD WIDTH="10%" ALIGN="CENTER"> +<td width="10%" align="center"> -</TD> +</td> -<TD WIDTH="90%"> - <H2>Site Error</H2> - <P>An error was encountered while publishing this resource. - </P>""" + \ +<td width="90%"> + <h2>Site Error</h2> + <p>An error was encountered while publishing this resource. + </p>""" + \ """ - <P><STRONG>%s</STRONG></P> + <p><strong>%s</strong></p> %s""" %(title,body) + \ """ - <HR NOSHADE> + <hr noshade="noshade"/> - <P>Troubleshooting Suggestions</P> + <p>Troubleshooting Suggestions</p> - <UL> - <LI>The URL may be incorrect.</LI> - <LI>The parameters passed to this resource may be incorrect.</LI> - <LI>A resource that this resource relies on may be - encountering an error.</LI> - </UL> + <ul> + <li>The URL may be incorrect.</li> + <li>The parameters passed to this resource may be incorrect.</li> + <li>A resource that this resource relies on may be + encountering an error.</li> + </ul> - <P>For more detailed information about the error, please + <p>For more detailed information about the error, please refer to error log. - </P> + </p> - <P>If the error persists please contact the site maintainer. + <p>If the error persists please contact the site maintainer. Thank you for your patience. - </P> -</TD></TR> -</TABLE>""") + </p> +</td></tr> +</table>""") + def notFoundError(self,entry='Unknown'): self.setStatus(404) raise NotFound, self._error_html( _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins