[Moin-devel] CVS: MoinMoin cgimain.py,1.47,1.48 wikiutil.py,1.84,1.85

[J?rgen Hermann]

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

Modified Files:
	cgimain.py wikiutil.py 
Log Message:
Dynamic handling for frontpage


Index: cgimain.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/cgimain.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** cgimain.py	11 Mar 2002 21:48:48 -0000	1.47
--- cgimain.py	12 Mar 2002 22:27:35 -0000	1.48
***************
*** 168,172 ****
              handler = wikiaction.getHandler(action)
              if handler:
!                 handler(pagename or config.page_front_page, request.form)
              else:
                  webapi.http_headers()
--- 168,172 ----
              handler = wikiaction.getHandler(action)
              if handler:
!                 handler(pagename or wikiutil.getSysPage(config.page_front_page).page_name, request.form)
              else:
                  webapi.http_headers()
***************
*** 178,182 ****
                  query = pagename
              else:
!                 query = wikiutil.unquoteWikiname(os.environ.get('QUERY_STRING', '')) or config.page_front_page
  
              if config.allow_extended_names:
--- 178,183 ----
                  query = pagename
              else:
!                 query = wikiutil.unquoteWikiname(os.environ.get('QUERY_STRING', '')) or \
!                     wikiutil.getSysPage(config.page_front_page).page_name
  
              if config.allow_extended_names:

Index: wikiutil.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikiutil.py,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -r1.84 -r1.85
*** wikiutil.py	9 Mar 2002 15:55:22 -0000	1.84
--- wikiutil.py	12 Mar 2002 22:27:35 -0000	1.85
***************
*** 405,408 ****
--- 405,409 ----
  
      # get name of system pages
+     page_front_page = getSysPage(config.page_front_page).page_name
      page_help_contents = getSysPage('HelpContents').page_name
      page_title_index = getSysPage('TitleIndex').page_name
***************
*** 429,433 ****
  
      # Links
!     print '<link rel="Start" href="%s">' % quoteWikiname(config.page_front_page)
      if keywords.has_key('pagename'):
          print '<link rel="Alternate" media="print" title="Print" href="%s?action=print">' % (
--- 430,434 ----
  
      # Links
!     print '<link rel="Start" href="%s">' % quoteWikiname(page_front_page)
      if keywords.has_key('pagename'):
          print '<link rel="Alternate" media="print" title="Print" href="%s?action=print">' % (
***************
*** 463,467 ****
  
      if config.logo_string:
!         print link_tag(quoteWikiname(config.page_front_page), config.logo_string)
      print '</td><td width="99%" valign="middle" class="headline"><font size="+3"> <b>'
      if keywords.get('link'):
--- 464,468 ----
  
      if config.logo_string:
!         print link_tag(quoteWikiname(page_front_page), config.logo_string)
      print '</td><td width="99%" valign="middle" class="headline"><font size="+3"> <b>'
      if keywords.get('link'):