diff MoinMoin/theme/__init__.py @ 511:8ee8ced7dded

moved UserPreferences back to header, add Cancel button imported from: moin--main--1.5--patch-515
author Thomas Waldmann <tw@waldmann-edv.de>
date Sun, 26 Mar 2006 20:19:38 +0000
parents 993d53631fee
children 3ede5fa7001a
line wrap: on
line diff
--- a/MoinMoin/theme/__init__.py	Sun Mar 26 18:52:11 2006 +0000
+++ b/MoinMoin/theme/__init__.py	Sun Mar 26 20:19:38 2006 +0000
@@ -213,11 +213,15 @@
             if not aliasname:
                 aliasname = name
             title = "%s @ %s" % (aliasname, interwiki[0])
+            # link to (interwiki) user homepage
             homelink = (request.formatter.interwikilink(1, title=title, id="userhome", *interwiki) +
                         request.formatter.text(name) +
                         request.formatter.interwikilink(0))
             userlinks.append(homelink)        
-            
+            # link to userprefs action
+            userlinks.append(d['page'].link_to(request, text=_('User Preferences'),
+                                               querystr={'action': 'userprefs'}, id="userprefs"))
+           
         if request.cfg.show_login:
             if request.user.valid:
                 userlinks.append(d['page'].link_to(request, text=_('Logout', formatted=False),
@@ -892,7 +896,6 @@
             'RenamePage',
             'DeletePage',
             '__separator__',
-            'UserPreferences',
             'MyPages',
             'SubscribeUser',
             '__separator__',
@@ -913,7 +916,6 @@
             'DeletePage': _('Delete Page', formatted=False),
             'LikePages': _('Like Pages', formatted=False),
             'LocalSiteMap': _('Local Site Map', formatted=False),
-            'UserPreferences': _('User Preferences', formatted=False),
             'MyPages': _('My Pages', formatted=False),
             'SubscribeUser': _('Subscribe User', formatted=False),
             'Despam': _('Remove Spam', formatted=False),