|
From: Fred L. D. <fd...@us...> - 2002-03-26 04:25:40
|
Update of /cvsroot/ht2html/ht2html
In directory usw-pr-cvs1:/tmp/cvs-serv16566
Modified Files:
BAWGenerator.py JPyGenerator.py JPyLocalGenerator.py
PDOGenerator.py SelfGenerator.py Sidebar.py Skeleton.py
Log Message:
Be (somewhat) more XHTML friendly: quote all attribute values.
Index: BAWGenerator.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/BAWGenerator.py,v
retrieving revision 2.0
retrieving revision 2.1
diff -C2 -d -r2.0 -r2.1
*** BAWGenerator.py 22 Mar 2002 17:45:40 -0000 2.0
--- BAWGenerator.py 26 Mar 2002 04:25:36 -0000 2.1
***************
*** 38,42 ****
p.sidebar.append(('http://www.python.org/', '''
<center>
! <img border=0 src="%(rootdir)s/images/PythonPoweredSmall.gif"></center>'''
% self.__d))
p.sidebar.append(BLANKCELL)
--- 38,43 ----
p.sidebar.append(('http://www.python.org/', '''
<center>
! <img border="0"
! src="%(rootdir)s/images/PythonPoweredSmall.gif"></center>'''
% self.__d))
p.sidebar.append(BLANKCELL)
***************
*** 64,68 ****
<center>
<a href="%(rootdir)s/index.html">
! <img border=0 src="%(rootdir)s/images/baw.jpg"></a></center>''' \
% self.__d
--- 65,69 ----
<center>
<a href="%(rootdir)s/index.html">
! <img border="0" src="%(rootdir)s/images/baw.jpg"></a></center>''' \
% self.__d
***************
*** 80,84 ****
def get_banner_attributes(self):
! return 'CELLSPACING=0 CELLPADDING=0'
def get_body(self):
--- 81,85 ----
def get_banner_attributes(self):
! return 'CELLSPACING="0" CELLPADDING="0"'
def get_body(self):
Index: JPyGenerator.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/JPyGenerator.py,v
retrieving revision 2.0
retrieving revision 2.1
diff -C2 -d -r2.0 -r2.1
*** JPyGenerator.py 22 Mar 2002 17:45:40 -0000 2.0
--- JPyGenerator.py 26 Mar 2002 04:25:36 -0000 2.1
***************
*** 37,41 ****
p.sidebar.append(('http://www.python.org/', '''
<center>
! <img border=0 src="%(rootdir)s/images/PythonPoweredSmall.gif"></center>
''' % self._d))
self.__linkfixer.massage(p.sidebar, self._d)
--- 37,41 ----
p.sidebar.append(('http://www.python.org/', '''
<center>
! <img border="0" src="%(rootdir)s/images/PythonPoweredSmall.gif"></center>
''' % self._d))
self.__linkfixer.massage(p.sidebar, self._d)
***************
*** 66,71 ****
<center>
<a href="%(rootdir)s/">
! <img border=0 src="%(rootdir)s/images/jpython-new-small.gif"></a></center>''' % \
! self._d
def get_body(self):
--- 66,71 ----
<center>
<a href="%(rootdir)s/">
! <img border="0" src="%(rootdir)s/images/jpython-new-small.gif"></a></center>''' % \
! self._d
def get_body(self):
Index: JPyLocalGenerator.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/JPyLocalGenerator.py,v
retrieving revision 2.0
retrieving revision 2.1
diff -C2 -d -r2.0 -r2.1
*** JPyLocalGenerator.py 22 Mar 2002 17:45:40 -0000 2.0
--- JPyLocalGenerator.py 26 Mar 2002 04:25:36 -0000 2.1
***************
*** 25,28 ****
<center>
<a href="http://www.jpython.org/">
! <img border=0 src="%(rootdir)s/images/jpython-new-small.gif"></a></center>''' % \
self._d
--- 25,28 ----
<center>
<a href="http://www.jpython.org/">
! <img border="0" src="%(rootdir)s/images/jpython-new-small.gif"></a></center>''' % \
self._d
Index: PDOGenerator.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/PDOGenerator.py,v
retrieving revision 2.1
retrieving revision 2.2
diff -C2 -d -r2.1 -r2.2
*** PDOGenerator.py 22 Mar 2002 17:58:31 -0000 2.1
--- PDOGenerator.py 26 Mar 2002 04:25:36 -0000 2.2
***************
*** 43,47 ****
p.sidebar.append(('%(rootdir)s', '''
<center>
! <img alt="" border=0
src="%(rootdir)s/pics/PythonPoweredSmall.gif"></center>
''' % self.__d))
--- 43,47 ----
p.sidebar.append(('%(rootdir)s', '''
<center>
! <img alt="" border="0"
src="%(rootdir)s/pics/PythonPoweredSmall.gif"></center>
''' % self.__d))
***************
*** 78,82 ****
def get_banner_attributes(self):
! return 'CELLSPACING=0 CELLPADDING=0'
def get_corner(self):
--- 78,82 ----
def get_banner_attributes(self):
! return 'CELLSPACING="0" CELLPADDING="0"'
def get_corner(self):
***************
*** 86,90 ****
<center>
<a href="%(rootdir)s/">
! <img alt="" border=0 src="%(rootdir)s/pics/%(banner)s"></a></center>''' % \
self.__d
--- 86,91 ----
<center>
<a href="%(rootdir)s/">
! <img alt="" border="0"
! src="%(rootdir)s/pics/%(banner)s"></a></center>''' % \
self.__d
Index: SelfGenerator.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/SelfGenerator.py,v
retrieving revision 2.1
retrieving revision 2.2
diff -C2 -d -r2.1 -r2.2
*** SelfGenerator.py 22 Mar 2002 19:41:57 -0000 2.1
--- SelfGenerator.py 26 Mar 2002 04:25:36 -0000 2.2
***************
*** 41,45 ****
p.sidebar.append(('http://www.python.org/', '''
<center>
! <img alt="[Python Powered]" border=0
src="PythonPoweredSmall.png"></center>
''' % self.__d))
--- 41,45 ----
p.sidebar.append(('http://www.python.org/', '''
<center>
! <img alt="[Python Powered]" border="0"
src="PythonPoweredSmall.png"></center>
''' % self.__d))
***************
*** 77,81 ****
def get_banner_attributes(self):
! return 'CELLSPACING=0 CELLPADDING=0'
def get_corner(self):
--- 77,81 ----
def get_banner_attributes(self):
! return 'CELLSPACING="0" CELLPADDING="0"'
def get_corner(self):
***************
*** 85,91 ****
<center>
<a href="index.html">
! <img alt="ht2html" border=0
src="ht2html.png"></a></center>''' % \
! self.__d
def get_corner_bgcolor(self):
--- 85,91 ----
<center>
<a href="index.html">
! <img alt="ht2html" border="0"
src="ht2html.png"></a></center>''' % \
! self.__d
def get_corner_bgcolor(self):
Index: Sidebar.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/Sidebar.py,v
retrieving revision 2.2
retrieving revision 2.3
diff -C2 -d -r2.2 -r2.3
*** Sidebar.py 22 Mar 2002 17:59:49 -0000 2.2
--- Sidebar.py 26 Mar 2002 04:25:36 -0000 2.3
***************
*** 51,55 ****
def __start_table(self):
print '<!-- start of sidebar table -->'
! print '<TABLE WIDTH="100%" BORDER=0 CELLSPACING=0 CELLPADDING=3'
print ' BGCOLOR="%s">' % self.get_bgcolor()
--- 51,55 ----
def __start_table(self):
print '<!-- start of sidebar table -->'
! print '<TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="3"'
print ' BGCOLOR="%s">' % self.get_bgcolor()
Index: Skeleton.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/Skeleton.py,v
retrieving revision 2.1
retrieving revision 2.2
diff -C2 -d -r2.1 -r2.2
*** Skeleton.py 22 Mar 2002 18:03:23 -0000 2.1
--- Skeleton.py 26 Mar 2002 04:25:36 -0000 2.2
***************
*** 156,160 ****
self.__start_body()
print '<!-- start of page table -->'
! print '<TABLE WIDTH="100%" BORDER=0 CELLSPACING=0 CELLPADDING=0>'
if banner is not None:
print '<!-- start of banner row -->'
--- 156,161 ----
self.__start_body()
print '<!-- start of page table -->'
! print ('<TABLE WIDTH="100%" BORDER="0"'
! ' CELLSPACING="0" CELLPADDING="0">')
if banner is not None:
print '<!-- start of banner row -->'
***************
*** 197,201 ****
def __do_corner(self, corner):
print '<!-- start of corner cells -->'
! print '<TD WIDTH=150 VALIGN=MIDDLE BGCOLOR="%s">' % (
self.get_corner_bgcolor())
# it is important not to have a newline between the corner text and
--- 198,202 ----
def __do_corner(self, corner):
print '<!-- start of corner cells -->'
! print '<TD WIDTH="150" VALIGN="MIDDLE" BGCOLOR="%s">' % (
self.get_corner_bgcolor())
# it is important not to have a newline between the corner text and
***************
*** 206,210 ****
print corner,
print '</TD>'
! print '<TD WIDTH=15 BGCOLOR="%s"> </TD><!--spacer-->' % (
self.get_lightshade())
print '<!-- end of corner cells -->'
--- 207,211 ----
print corner,
print '</TD>'
! print '<TD WIDTH="15" BGCOLOR="%s"> </TD><!--spacer-->' % (
self.get_lightshade())
print '<!-- end of corner cells -->'
***************
*** 212,225 ****
def __do_sidebar(self, sidebar):
print '<!-- start of sidebar cells -->'
! print '<TD WIDTH=150 VALIGN=TOP BGCOLOR="%s">' % (
self.get_lightshade())
print sidebar
print '</TD>'
! print '<TD WIDTH=15> </TD><!--spacer-->'
print '<!-- end of sidebar cell -->'
def __do_body(self, body):
print '<!-- start of body cell -->'
! print '<TD VALIGN=TOP WIDTH="%s%%"><BR>' % (
self.get_banner_width())
print body
--- 213,226 ----
def __do_sidebar(self, sidebar):
print '<!-- start of sidebar cells -->'
! print '<TD WIDTH="150" VALIGN="TOP" BGCOLOR="%s">' % (
self.get_lightshade())
print sidebar
print '</TD>'
! print '<TD WIDTH="15"> </TD><!--spacer-->'
print '<!-- end of sidebar cell -->'
def __do_body(self, body):
print '<!-- start of body cell -->'
! print '<TD VALIGN="TOP" WIDTH="%s%%"><BR>' % (
self.get_banner_width())
print body
|