[Moin-devel] CVS: MoinMoin user.py,1.57,1.58 userform.py,1.13,1.14 wikiutil.py,1.86,1.87

[J?rgen Hermann]

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

Modified Files:
	user.py userform.py wikiutil.py 
Log Message:
Quick links


Index: user.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/user.py,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** user.py	14 Mar 2002 20:12:44 -0000	1.57
--- user.py	15 Mar 2002 22:01:26 -0000	1.58
***************
*** 68,71 ****
--- 68,72 ----
          self.css_url    = config.css_url
          self.language   = ""
+         self.quicklinks = ""
          self.datetime_fmt = ""
          self.subscribed_pages = ""
***************
*** 249,252 ****
--- 250,266 ----
                  return None
          return None
+ 
+ 
+     def getQuickLinks(self):
+         """ Get list of pages this user wants in the page header.
+         """
+         if not self.quicklinks: return []
+ 
+         from MoinMoin import wikiutil
+         quicklinks = string.split(self.quicklinks, ',')
+         quicklinks = map(string.strip, quicklinks)
+         quicklinks = filter(None, quicklinks)
+         quicklinks = map(wikiutil.unquoteWikiname, quicklinks)
+         return quicklinks
  
  

Index: userform.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/userform.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** userform.py	14 Mar 2002 20:12:44 -0000	1.13
--- userform.py	15 Mar 2002 22:01:26 -0000	1.14
***************
*** 10,14 ****
  # Imports
  import os, string, time
! from MoinMoin import config, user, util, webapi
  from MoinMoin.i18n import _, languages
  
--- 10,14 ----
  # Imports
  import os, string, time
! from MoinMoin import config, user, util, webapi, wikiutil
  from MoinMoin.i18n import _, languages
  
***************
*** 173,176 ****
--- 173,190 ----
                  setattr(theuser, key, value)
  
+         # quicklinks for header
+         try:
+             quicklinks = form['quicklinks'].value
+             quicklinks = string.replace(quicklinks, '\r', '')
+             quicklinks = string.split(quicklinks, '\n')
+             quicklinks = map(string.strip, quicklinks)
+             quicklinks = filter(None, quicklinks)
+             quicklinks = map(wikiutil.quoteWikiname, quicklinks)
+             theuser.quicklinks = string.join(quicklinks, ',')
+         except KeyError:
+             theuser.quicklinks = ''
+         except ValueError:
+             pass
+         
          # subscription for page change notification
          try:
***************
*** 264,267 ****
--- 278,284 ----
        %(checkbox_fields)s
      </td></tr>
+     <tr><td valign="top"><b>%(label_quicklinks)s</b> </td><td>
+       <textarea name="quicklinks" rows="6" cols="50">%(quicklinklist)s</textarea>
+     </td></tr>
      %(notify)s
      <tr><td></td><td>
***************
*** 284,287 ****
--- 301,305 ----
          'label_date_format':    _('Date format'),
          'label_language':       _('Preferred language'),
+         'label_quicklinks':     _('Quick links'),
          'label_general_opts':   _('General options'),
      }
***************
*** 333,337 ****
  <tr>
    <td valign="top"><b>%(label_notification)s</b> </td>
!   <td><textarea name="subscribed_pages" rows="10" cols="50">%(notification)s</textarea>%(warning)s</td>
  </tr>""" % {
              'label_notification': _('Subscribed wiki pages<br>(one regex per line)'),
--- 351,355 ----
  <tr>
    <td valign="top"><b>%(label_notification)s</b> </td>
!   <td><textarea name="subscribed_pages" rows="6" cols="50">%(notification)s</textarea>%(warning)s</td>
  </tr>""" % {
              'label_notification': _('Subscribed wiki pages<br>(one regex per line)'),
***************
*** 351,354 ****
--- 369,373 ----
          'language_select': _lang_select(user.current),
          'notify': notify,
+         'quicklinklist': string.join(user.current.getQuickLinks(), '\n'),
      }
  

Index: wikiutil.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikiutil.py,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -r1.86 -r1.87
*** wikiutil.py	14 Mar 2002 00:00:28 -0000	1.86
--- wikiutil.py	15 Mar 2002 22:01:26 -0000	1.87
***************
*** 14,17 ****
--- 14,36 ----
  
  
+ # list of pages that should be trated as system pages
+ SYSTEM_PAGES = [
+     config.page_front_page,
+     'RecentChanges',
+     'TitleIndex',
+     'WordIndex',
+     'SiteNavigation',
+     'HelpContents',
+     'UserPreferences',
+     'HelpOnFormatting',
+     'FindPage',
+     'AbandonedPages',
+     'OrphanedPages',
+     'PageSize',
+     'RandomPage',
+     'WantedPages',
+ ]
+ 
+ 
  #############################################################################
  ### Smileys
***************
*** 518,523 ****
              '</font></td>') % {'sitename': config.sitename,}
  
!         for pagename in config.navi_bar:
!             pagename = getSysPage(pagename).page_name
              print (
                  '<td valign=top align=center bgcolor="#E8E8E8">'
--- 537,546 ----
              '</font></td>') % {'sitename': config.sitename,}
  
!         quicklinks = user.current.getQuickLinks()
!         if not quicklinks:
!             for pagename in config.navi_bar:
!                 quicklinks.append(getSysPage(pagename).page_name)
! 
!         for pagename in quicklinks:
              print (
                  '<td valign=top align=center bgcolor="#E8E8E8">'