Several fixes in the OSQA exporter.

[osqa.git] / forum / registry.py

diff --git a/forum/registry.py b/forum/registry.py
index 6fad2f00d0f7fe04d56cc12487acfe11fde31136..ff5a1157941eea91d21b19f5822fd89329bf6921 100644 (file)
--- a/forum/registry.py
+++ b/forum/registry.py
@@ -3,6 +3,7 @@ from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
 from django.template.defaultfilters import slugify
 from forum.templatetags.extra_tags import get_score_badge
+from forum.utils.html import cleanup_urls
 from forum import settings
 
 
@@ -38,7 +39,7 @@ class SupportLink(ui.Link):
 ui.register(ui.FOOTER_LINKS,
             ui.Link(
                     text=_('contact'),
-                    url=lambda u, c: settings.CONTACT_URL and settings.CONTACT_URL or "%s?next=%s" % (reverse('feedback'), c['request'].path),
+                    url=lambda u, c: settings.CONTACT_URL and settings.CONTACT_URL or "%s?next=%s" % (reverse('feedback'), cleanup_urls( c['request'].path)),
                     weight=400),
             SupportLink(_('support'), settings.SUPPORT_URL, attrs={'target': '_blank'}, weight=300),
             ui.Link(_('privacy'), ui.Url('privacy'), weight=200),
@@ -73,6 +74,11 @@ ui.register(ui.USER_MENU,
                 span_attrs={'class': 'user-subscriptions'},
                 weight=200
             ),
+            ui.UserMenuItem(
+                label=_("other preferences"),
+                url=lambda u, c: reverse('user_preferences', kwargs={'id': c['user'].id, 'slug': slugify(c['user'].username)}),
+                weight=200
+            ),
             ModerationMenuGroup(_("Moderation tools"), items=(
                 ui.UserMenuItem(
                     label=lambda u, c: c['user'].is_suspended() and _("withdraw suspension") or _("suspend this user"),