CVS: ht2html Skeleton.py,2.11,2.12 PDOGenerator.py,2.22,2.23

Update of /cvsroot/ht2html/ht2html
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31404

Modified Files:
	Skeleton.py PDOGenerator.py 
Log Message:
Make search bar match www.python.org/alt/

Index: Skeleton.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/Skeleton.py,v
retrieving revision 2.11
retrieving revision 2.12
diff -C2 -d -r2.11 -r2.12
*** Skeleton.py	8 Apr 2004 18:24:49 -0000	2.11
--- Skeleton.py	3 Oct 2004 00:01:32 -0000	2.12
***************
*** 192,195 ****
--- 192,198 ----
              self.__do_head()
              self.__start_body()
+             bar = self.get_searchbar()
+             if bar:
+                 print bar
              print '<!-- start of page table -->'
              print ('<table width="100%" border="0"'
***************
*** 347,350 ****
--- 350,356 ----
          return '<b>The Banner</b>'
  
+     def get_searchbar(self):
+         return ""
+ 
      def get_sidebar(self):
          return '''<ul><li>Sidebar line 1

Index: PDOGenerator.py
===================================================================
RCS file: /cvsroot/ht2html/ht2html/PDOGenerator.py,v
retrieving revision 2.22
retrieving revision 2.23
diff -C2 -d -r2.22 -r2.23
*** PDOGenerator.py	24 Sep 2004 12:28:58 -0000	2.22
--- PDOGenerator.py	3 Oct 2004 00:01:32 -0000	2.23
***************
*** 22,39 ****
      rst_html = None
  
! SEARCHBOX = \
  '''<!-- start of search bar -->
! <div id="search">
! <form method="get" action="http://www.google.com/search">
! Search: <input id="q" name="q" size="30" value="">
! <input type="hidden" id="domains" name="domains"
!        value="docs.python.org" />
! <input type="hidden" id="sitesearch" name="sitesearch"
!        value="docs.python.org" />
! <input type="hidden" id="sourceid" name="sourceid"
!        value="google-search" />
! <input type="submit" id="submit" name="submit" value="submit" />
  </form>
! </div><!-- end of search bar -->
  '''
  
--- 22,38 ----
      rst_html = None
  
! SEARCHBAR = \
  '''<!-- start of search bar -->
! <div class="google" id="search">
! <table width="100%" cellspacing="0" cellpadding="0">
! <tr>
! <td id="search">
! <form method="get" action="http://www.google.com/search">Search: <input id="q" name="q" size="30" value=""><input type="hidden" id="domains" name="domains" value="www.python.org"><input type="hidden" id="sitesearch" name="sitesearch" value="www.python.org"><input type="hidden" id="sourceid" name="sourceid" value="google-search"><input type="submit" id="submit" name="submit" value="submit">
  </form>
! </td>
! </tr>
! </table>
! </div>
! <!-- end of search bar -->
  '''
  
***************
*** 130,137 ****
          return Sidebar.get_sidebar(self)
  
      def get_banner(self):
          banner = Banner.get_banner(self)
-         if self.__parser.get('search-box', 'yes').lower() == 'yes':
-             banner = SEARCHBOX + banner
          return banner
          
--- 129,140 ----
          return Sidebar.get_sidebar(self)
  
+     def get_searchbar (self):
+         if self.__parser.get('search-box', 'yes').lower() == 'yes':
+ 	    return SEARCHBAR
+         else:
+ 	    return ""
+ 
      def get_banner(self):
          banner = Banner.get_banner(self)
          return banner
          



-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl