[Spambayes-checkins] website/scripts/ht2html Sidebar.py,1.1.1.1,1.2 SpamBayesGenerator.py,1.2,1.3

[Anthony Baxter]

Update of /cvsroot/spambayes/website/scripts/ht2html
In directory sc8-pr-cvs1:/tmp/cvs-serv5318/scripts/ht2html

Modified Files:
	Sidebar.py SpamBayesGenerator.py 
Log Message:
major re-working of the website to use style sheets, and generally look a
bit nicer than the default python.org lnf.


Index: Sidebar.py
===================================================================
RCS file: /cvsroot/spambayes/website/scripts/ht2html/Sidebar.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Sidebar.py	19 Sep 2002 08:40:55 -0000	1.1.1.1
--- Sidebar.py	13 Jan 2003 03:57:58 -0000	1.2
***************
*** 52,56 ****
          print '<!-- start of sidebar table -->'
          print '<table width="100%" border="0" cellspacing="0" cellpadding="3"'
!         print '       bgcolor="%s">' % self.get_bgcolor()
  
      def __finish(self):
--- 52,56 ----
          print '<!-- start of sidebar table -->'
          print '<table width="100%" border="0" cellspacing="0" cellpadding="3"'
!         print 'class="sidebar"       bgcolor="%s">' % self.get_bgcolor()
  
      def __finish(self):
***************
*** 64,73 ****
                  if done_one:
                      # get some separation between header and last item
!                     print '<tr><td bgcolor="%s">&nbsp;' % (
!                         self.get_lightshade())
                  else:
                      done_one = 1
!                 print '<tr><td bgcolor="%s"><b><font color="%s">' % (
!                     self.get_darkshade(), self.get_bgcolor())
                  print item
                  print '</font></b></td></tr>'
--- 64,71 ----
                  if done_one:
                      # get some separation between header and last item
!                     print '<tr><td %s>&nbsp;' % (self.getSidebarNormalAttrs())
                  else:
                      done_one = 1
!                 print '<tr><td %s>'% ( self.getSidebarHeaderAttrs()) 
                  print item
                  print '</font></b></td></tr>'
***************
*** 82,86 ****
                  else:
                      s = '<a href="%s">%s</a>' % (url, text)
!                 print '<tr><td bgcolor="%s">' % self.get_lightshade()
                  print '%s%s' % (s, extra)
                  print '</td></tr>'
--- 80,84 ----
                  else:
                      s = '<a href="%s">%s</a>' % (url, text)
!                 print '<tr><td %s >' % (self.getSidebarNormalAttrs())
                  print '%s%s' % (s, extra)
                  print '</td></tr>'

Index: SpamBayesGenerator.py
===================================================================
RCS file: /cvsroot/spambayes/website/scripts/ht2html/SpamBayesGenerator.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SpamBayesGenerator.py	19 Sep 2002 18:16:11 -0000	1.2
--- SpamBayesGenerator.py	13 Jan 2003 03:57:58 -0000	1.3
***************
*** 16,25 ****
  
  sitelinks = [
-     ('%(rootdir)s/',           'Home'),
      ('http://sourceforge.net/projects/spambayes/',      'SF Project Page'),
      ]
  
  
! class SpamBayesGenerator(Skeleton, Sidebar, Banner):
      AUTHOR = 'spambayes at python.org'
  
--- 16,25 ----
  
  sitelinks = [
      ('http://sourceforge.net/projects/spambayes/',      'SF Project Page'),
      ]
  
+ class SpamBayesSidebar(Sidebar): pass
  
! class SpamBayesGenerator(Skeleton, SpamBayesSidebar, Banner):
      AUTHOR = 'spambayes at python.org'
  
***************
*** 43,47 ****
  ''' % self.__d))
          self.__linkfixer.massage(p.sidebar, self.__d)
!         Sidebar.__init__(self, p.sidebar)
          #
          # fix up our site links, no relthis because the site links are
--- 43,47 ----
  ''' % self.__d))
          self.__linkfixer.massage(p.sidebar, self.__d)
!         SpamBayesSidebar.__init__(self, p.sidebar)
          #
          # fix up our site links, no relthis because the site links are
***************
*** 80,84 ****
          if self.__parser.get('wide-page', 'no').lower() == 'yes':
              return None
!         return Sidebar.get_sidebar(self)
  
      def get_banner(self):
--- 80,84 ----
          if self.__parser.get('wide-page', 'no').lower() == 'yes':
              return None
!         return SpamBayesSidebar.get_sidebar(self)
  
      def get_banner(self):
***************
*** 94,98 ****
  <center>
      <a href="http://www.student.virginia.edu/~improv/games/findthespam.html">
!     <img alt="" border="0" src="%(rootdir)s/pics/banner.png"></a></center>''' % \
      self.__d 
  
--- 94,98 ----
  <center>
      <a href="http://www.student.virginia.edu/~improv/games/findthespam.html">
!     <img alt="" border="0" src="%(rootdir)s/images/logo.png"></a></center>''' % \
      self.__d 
  
***************
*** 119,131 ****
                  self.__body = text
  
      # python.org color scheme overrides
      def get_lightshade(self):
!         return '#c7c7d7'
  
      def get_mediumshade(self):
!         return '#867272'
  
      def get_darkshade(self):
!         return '#635d5d'
  
      def get_charset(self):
--- 119,138 ----
                  self.__body = text
  
+     def getSidebarNormalAttrs(self):
+         return 'class="normalSidebar" background="images/gutter.png"'
+     def getSidebarHeaderAttrs(self):
+         return 'class="headerSidebar" background="images/gutter-hi.png"'
+ 
      # python.org color scheme overrides
      def get_lightshade(self):
!         "used in sidebar normal items"
!         return ''
  
      def get_mediumshade(self):
!         return ''
  
      def get_darkshade(self):
!         "used in sidebar header items"
!         return ''
  
      def get_charset(self):