[Moin-devel] CVS: MoinMoin config.py,1.61,1.62 wikiutil.py,1.83,1.84

[J?rgen Hermann]

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv12641/MoinMoin

Modified Files:
	config.py wikiutil.py 
Log Message:
navi_bar as list of pages


Index: config.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/config.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -r1.61 -r1.62
*** config.py	7 Mar 2002 20:19:35 -0000	1.61
--- config.py	9 Mar 2002 15:55:22 -0000	1.62
***************
*** 74,126 ****
      'mail_from': None,
      'max_macro_size': 50,
!     'navi_bar': '''
! <table cellpadding=0 cellspacing=3 border=0 style="background-color:#C8C8C8;text-decoration:none">
!   <tr>
! 
!     <td valign=top align=center bgcolor="#E8E8E8">
!       <font face="Arial,Helvetica" size="-1">
!          <b>%(sitename)s</b> 
!       </font>
!     </td>
!     
!     <td valign=top align=center bgcolor="#E8E8E8">
!       <font face="Arial,Helvetica" size="-1">
!          <a style="text-decoration:none" href="%(scriptname)s/%(page_front_page)s">%(page_front_page)s</a> 
!       </font>
!     </td>
!     
!     <td valign=top align=center bgcolor="#E8E8E8">
!       <font face="Arial,Helvetica" size="-1">
!          <a style="text-decoration:none" href="%(scriptname)s/%(page_recent_changes)s">%(page_recent_changes)s</a> 
!       </font>
!     </td>
! 
!     <td valign=top align=center bgcolor="#E8E8E8">
!       <font face="Arial,Helvetica" size="-1">
!          <a style="text-decoration:none" href="%(scriptname)s/%(page_title_index)s">%(page_title_index)s</a> 
!       </font>
!     </td>
! 
!     <td valign=top align=center bgcolor="#E8E8E8">
!       <font face="Arial,Helvetica" size="-1">
!          <a style="text-decoration:none" href="%(scriptname)s/%(page_word_index)s">%(page_word_index)s</a> 
!       </font>
!     </td>
!     
!     <td valign=top align=center bgcolor="#E8E8E8">
!       <font face="Arial,Helvetica" size="-1">
!          <a style="text-decoration:none" href="%(scriptname)s/%(page_site_navigation)s">%(page_site_navigation)s</a> 
!       </font>
!     </td>
!     
!     <td valign=top align=center bgcolor="#E8E8E8">
!       <font face="Arial,Helvetica" size="-1">
!          <a style="text-decoration:none" href="%(scriptname)s/%(page_help_contents)s">%(page_help_contents)s</a> 
!       </font>
!     </td>
! 
!   </tr>
! </table>
! ''',
      'nonexist_qm': 0,
  
--- 74,85 ----
      'mail_from': None,
      'max_macro_size': 50,
!     'navi_bar': [
!         'FrontPage',
!         'RecentChanges',
!         'TitleIndex',
!         'WordIndex',
!         'SiteNavigation',
!         'HelpContents',
!     ],
      'nonexist_qm': 0,
  

Index: wikiutil.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikiutil.py,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -r1.83 -r1.84
*** wikiutil.py	6 Mar 2002 22:36:52 -0000	1.83
--- wikiutil.py	9 Mar 2002 15:55:22 -0000	1.84
***************
*** 404,414 ****
      from MoinMoin.Page import Page
  
!     # get name of help page
      page_help_contents = getSysPage('HelpContents').page_name
      page_title_index = getSysPage('TitleIndex').page_name
      page_word_index = getSysPage('WordIndex').page_name
-     page_site_navigation = getSysPage('SiteNavigation').page_name
      page_user_prefs = getSysPage('UserPreferences').page_name
-     page_recent_changes = getSysPage('RecentChanges').page_name
      page_edit_tips = getSysPage('HelpOnFormatting').page_name
  
--- 404,412 ----
      from MoinMoin.Page import Page
  
!     # get name of system pages
      page_help_contents = getSysPage('HelpContents').page_name
      page_title_index = getSysPage('TitleIndex').page_name
      page_word_index = getSysPage('WordIndex').page_name
      page_user_prefs = getSysPage('UserPreferences').page_name
      page_edit_tips = getSysPage('HelpOnFormatting').page_name
  
***************
*** 508,521 ****
      # print the navigation bar (if configured)
      if config.navi_bar:
!         print config.navi_bar % {
              'scriptname': webapi.getScriptname(),
!             'sitename': config.sitename,
!             'page_front_page': config.page_front_page,
!             'page_site_navigation': page_site_navigation,
!             'page_recent_changes': page_recent_changes,
!             'page_title_index': page_title_index,
!             'page_word_index': page_word_index,
!             'page_help_contents': page_help_contents,
          }
  
      # print a message if one is given
--- 506,528 ----
      # print the navigation bar (if configured)
      if config.navi_bar:
!         print (
!             '<table cellpadding=0 cellspacing=3 border=0 style="background-color:#C8C8C8;text-decoration:none">'
!             '<tr><td valign=top align=center bgcolor="#E8E8E8">'
!             '<font face="Arial,Helvetica" size="-1"> <b>%(sitename)s</b> '
!             '</font></td>') % {'sitename': config.sitename,}
! 
!         for pagename in config.navi_bar:
!             pagename = getSysPage(pagename).page_name
!             print (
!                 '<td valign=top align=center bgcolor="#E8E8E8">'
!                 '<font face="Arial,Helvetica" size="-1">'
!                 ' <a style="text-decoration:none" href="%(scriptname)s/%(pagelink)s">%(pagename)s</a> '
!                 '</font></td>') % {
              'scriptname': webapi.getScriptname(),
!             'pagelink': quoteWikiname(pagename),
!             'pagename': pagename,
          }
+ 
+         print '</tr></table>'
  
      # print a message if one is given