From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Mon, 5 Jul 2010 10:29:48 +0000 (+0000)
Subject: Adds the user menu to the injectable places, makes several improvements in the user... 
X-Git-Tag: live~647
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/f982c8513663a0f9927fb04ba650a5f63bb7f21f

Adds the user menu to the injectable places, makes several improvements in the user profile and fixes some errors introduced in the last commits.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@487 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py
index d482d01..a98ef38 100644
--- a/forum/forms/qanda.py
+++ b/forum/forms/qanda.py
@@ -276,7 +276,7 @@ NOTIFICATION_CHOICES = (
 )
 
 class SubscriptionSettingsForm(forms.ModelForm):
-    user = forms.IntegerField(widget=forms.HiddenInput)
+    enable_notifications = forms.BooleanField(widget=forms.HiddenInput, required=False)
     member_joins = forms.ChoiceField(widget=forms.RadioSelect, choices=NOTIFICATION_CHOICES)
     new_question = forms.ChoiceField(widget=forms.RadioSelect, choices=NOTIFICATION_CHOICES)
     new_question_watched_tags = forms.ChoiceField(widget=forms.RadioSelect, choices=NOTIFICATION_CHOICES)
@@ -286,3 +286,4 @@ class SubscriptionSettingsForm(forms.ModelForm):
         model = SubscriptionSettings
 
 
+
diff --git a/forum/models/user.py b/forum/models/user.py
index f3a0389..7f1df5f 100644
--- a/forum/models/user.py
+++ b/forum/models/user.py
@@ -331,13 +331,13 @@ class User(BaseModel, DjangoUser):
     def suspension(self):
         if self.__dict__.get('_suspension_dencache_', False) != None:
             try:
-                self.__dict__['_suspension_dencache_'] = self.actions.get(action_type="suspend", canceled=False)
+                self.__dict__['_suspension_dencache_'] = self.reputes.get(action__action_type="suspend", action__canceled=False).action
             except ObjectDoesNotExist:
                 self.__dict__['_suspension_dencache_'] = None
             except MultipleObjectsReturned:
                 logging.error("Multiple suspension actions found for user %s (%s)" % (self.username, self.id))
-                self.__dict__['_suspension_dencache_'] = self.actions.filter(action_type="suspend", canceled=False
-                                                                             ).order_by('-action_date')[0]
+                self.__dict__['_suspension_dencache_'] = self.reputes.filter(action__action_type="suspend", action__canceled=False
+                                                                             ).order_by('-action__action_date')[0]
 
         return self.__dict__['_suspension_dencache_']
 
@@ -419,7 +419,7 @@ class UserPropertyDict(object):
 
 
 class SubscriptionSettings(models.Model):
-    user = models.OneToOneField(User, related_name='subscription_settings')
+    user = models.OneToOneField(User, related_name='subscription_settings', editable=False)
 
     enable_notifications = models.BooleanField(default=True)
 
diff --git a/forum/modules/ui.py b/forum/modules/ui.py
index 49ce249..48c0246 100644
--- a/forum/modules/ui.py
+++ b/forum/modules/ui.py
@@ -1,13 +1,13 @@
 
 
 class Registry(list):
-    def add(self, register):
+    def add(self, item):
         for i, r in enumerate(self):
-            if r.weight > register.weight:
-                self.insert(i, register)
+            if r.weight > item.weight:
+                self.insert(i, item)
                 return
 
-        self.append(register)
+        self.append(item)
 
 
 HEAD_CONTENT = 'HEAD_CONTENT'
@@ -16,6 +16,8 @@ PAGE_TOP_TABS = 'PAGE_TOP_TABS'
 FOOTER_LINKS = 'FOOTER_LINKS'
 PROFILE_TABS = 'PROFILE_TABS'
 
+USER_MENU = 'USER_MENU'
+
 
 __CONTAINER = {
     HEAD_CONTENT: Registry(),
@@ -23,6 +25,8 @@ __CONTAINER = {
     PAGE_TOP_TABS: Registry(),
     FOOTER_LINKS: Registry(),
     PROFILE_TABS: Registry(),
+
+    USER_MENU: Registry(),
 }
 
 
diff --git a/forum/modules/ui_objects.py b/forum/modules/ui_objects.py
index b88ea50..7fcf96c 100644
--- a/forum/modules/ui_objects.py
+++ b/forum/modules/ui_objects.py
@@ -2,6 +2,8 @@ from django.core.urlresolvers import reverse
 from django.template.defaultfilters import slugify
 from django import template
 from forum.utils import html
+from ui import Registry
+from copy import copy
 
 class Visibility(object):
     def __init__(self, level='public'):
@@ -15,17 +17,28 @@ class Visibility(object):
             self.by_reputation = False
 
         self.level = level
+        self.negated = False
 
     def show_to(self, user):
         if self.by_reputation:
-            return user.is_authenticated() and (user.reputation >= int(self.level) or user.is_staff or user.is_superuser)
+            res = user.is_authenticated() and (user.reputation >= int(self.level) or user.is_staff or user.is_superuser)
         else:
-            return self.level == 'public' or (user.is_authenticated() and (
+            res = self.level == 'public' or (user.is_authenticated() and (
                 self.level == 'authenticated' or (
                 self.level == 'superuser' and user.is_superuser) or (
                 self.level == 'staff' and (user.is_staff or user.is_superuser)) or (
                 self.level == 'owner' and user.is_siteowner)))
 
+        if self.negated:
+            return not res
+        else:
+            return res
+
+    def __invert__(self):
+        inverted = copy(self)
+        inverted.negated = True
+        
+
 Visibility.PUBLIC = Visibility('public')
 Visibility.AUTHENTICATED = Visibility('authenticated')
 Visibility.STAFF = Visibility('staff')
@@ -49,7 +62,8 @@ class ObjectBase(object):
 
         def __call__(self, context):
             if callable(self.argument):
-                return self.argument(context['request'].user, context)
+                user = context.get('request', None) and context['request'].user or None
+                return self.argument(user, context)
             else:
                 return self.argument
 
@@ -57,8 +71,14 @@ class ObjectBase(object):
         self.visibility = visibility
         self.weight = weight
 
+    def _visible_to(self, user):
+        return (not self.visibility) or (self.visibility and self.visibility.show_to(user))
+
     def can_render(self, context):
-        return (not self.visibility) or (self.visibility and self.visibility.show_to(context['request'].user))
+        try:
+            return self._visible_to(context['request'].user)
+        except KeyError:
+            return True
 
     def render(self, context):
         return ''
@@ -139,4 +159,48 @@ class ProfileTab(LoopBase):
             tab_title=self.title,
             tab_description = self.description,
             tab_url=self.url_getter(context['view_user'])
-        ))
\ No newline at end of file
+        ))
+
+
+class AjaxMenuItem(ObjectBase):
+    def __init__(self, label, url, a_attrs=None, span_label='', span_attrs=None, visibility=None, weight=500):
+        super(AjaxMenuItem, self).__init__(visibility, weight)
+        self.label = self.Argument(label)
+        self.url = self.Argument(url)
+        self.a_attrs = self.Argument(a_attrs or {})
+        self.span_label = self.Argument(span_label)
+        self.span_attrs = self.Argument(span_attrs or {})
+
+    def render(self, context):
+        return html.buildtag('li',
+            html.buildtag('span', self.span_label(context), **self.span_attrs(context)) + \
+            html.hyperlink(self.url(context), self.label(context), **self.a_attrs(context)),
+            **{'class': 'item'})
+
+class AjaxMenuGroup(ObjectBase, Registry):
+    def __init__(self, label, items, visibility=None, weight=500):
+        super(AjaxMenuGroup, self).__init__(visibility, weight)
+        self.label = label
+
+        for item in items:
+            self.add(item)
+
+    def can_render(self, context):
+        if super(AjaxMenuGroup, self).can_render(context):
+            for item in self:
+                if item.can_render(context): return True
+
+        return False
+
+    def render(self, context):
+        return html.buildtag('li', self.label, **{'class': 'separator'}) + "".join([
+            item.render(context) for item in self if item.can_render(context)
+        ])
+
+class UserMenuItem(AjaxMenuItem):
+    def __init__(self, render_to=None, *args, **kwargs):
+        super(UserMenuItem, self).__init__(*args, **kwargs)
+        self.render_to = render_to
+
+    def can_render(self, context):
+        return (not self.render_to or (self.render_to(context['user']))) and super(UserMenuItem, self)._visible_to(context['viewer'])
diff --git a/forum/registry.py b/forum/registry.py
new file mode 100644
index 0000000..6fad2f0
--- /dev/null
+++ b/forum/registry.py
@@ -0,0 +1,103 @@
+from forum.modules import ui
+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 import settings
+
+
+ui.register(ui.HEADER_LINKS,
+            ui.Link(_('faq'), ui.Url('faq'), weight=400),
+            ui.Link(_('about'), ui.Url('about'), weight=300),
+
+            ui.Link(
+                    text=lambda u, c: u.is_authenticated() and _('logout') or _('login'),
+                    url=lambda u, c: u.is_authenticated() and reverse('logout') or reverse('auth_signin'),
+                    weight=200),
+
+            ui.Link(
+                    visibility=ui.Visibility.AUTHENTICATED,
+                    text=lambda u, c: u.username,
+                    url=lambda u, c: u.get_profile_url(),
+                    post_code=lambda u, c: get_score_badge(u),
+                    weight=100),
+
+            ui.Link(
+                    visibility=ui.Visibility.SUPERUSER,
+                    text=_('administration'),
+                    url=lambda u, c: reverse('admin_index'),
+                    weight=0)
+
+)
+
+class SupportLink(ui.Link):
+    def can_render(self, context):
+        return bool(settings.SUPPORT_URL)
+
+
+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),
+                    weight=400),
+            SupportLink(_('support'), settings.SUPPORT_URL, attrs={'target': '_blank'}, weight=300),
+            ui.Link(_('privacy'), ui.Url('privacy'), weight=200),
+            ui.Link(_('faq'), ui.Url('faq'), weight=100),
+            ui.Link(_('about'), ui.Url('about'), weight=0),
+)
+
+class ModerationMenuGroup(ui.AjaxMenuGroup):
+    def can_render(self, context):
+        return context['user'] != context['viewer'] and super(ModerationMenuGroup, self).can_render(context)
+
+class SuperUserSwitchMenuItem(ui.UserMenuItem):
+    def can_render(self, context):
+        return context['viewer'].is_siteowner or not context['user'].is_superuser
+
+ui.register(ui.USER_MENU,
+            ui.UserMenuItem(
+                label=_("edit profile"),
+                url=lambda u, c: reverse('edit_user', kwargs={'id': c['user'].id}),
+                span_attrs={'class': 'user-edit'},
+                weight=0
+            ),
+            ui.UserMenuItem(
+                label=_("authentication settings"),
+                url=lambda u, c: reverse('user_authsettings', kwargs={'id': c['user'].id}),
+                span_attrs={'class': 'user-auth'},
+                weight=100
+            ),
+            ui.UserMenuItem(
+                label=_("email notification settings"),
+                url=lambda u, c: reverse('user_subscriptions', kwargs={'id': c['user'].id, 'slug': slugify(c['user'].username)}),
+                span_attrs={'class': 'user-subscriptions'},
+                weight=200
+            ),
+            ModerationMenuGroup(_("Moderation tools"), items=(
+                ui.UserMenuItem(
+                    label=lambda u, c: c['user'].is_suspended() and _("withdraw suspension") or _("suspend this user"),
+                    url=lambda u, c: reverse('user_suspend', kwargs={'id': c['user'].id}),
+                    a_attrs=lambda u, c: {'class': c['user'].is_suspended() and 'ajax-command confirm' or 'ajax-command withprompt'},
+                    render_to=lambda u: not u.is_superuser,
+                ),
+                ui.UserMenuItem(
+                    label=lambda u, c: _("give/take karma"),
+                    url=lambda u, c: reverse('user_award_points', kwargs={'id': c['user'].id}),
+                    a_attrs=lambda u, c: {'id': 'award-rep-points', 'class': 'ajax-command withprompt'},
+                    span_attrs={'class': 'user-award_rep'},
+                    render_to=lambda u: not u.is_suspended(),
+                ),
+                ui.UserMenuItem(
+                    label=lambda u, c: c['user'].is_staff and _("remove moderator status") or _("grant moderator status"),
+                    url=lambda u, c: reverse('user_powers', kwargs={'id': c['user'].id, 'action':c['user'].is_staff and 'remove' or 'grant', 'status': 'staff'}),
+                    a_attrs=lambda u, c: {'class': 'ajax-command confirm'},
+                    span_attrs={'class': 'user-moderator'},
+                ),
+                SuperUserSwitchMenuItem(
+                    label=lambda u, c: c['user'].is_superuser and _("remove super user status") or _("grant super user status"),
+                    url=lambda u, c: reverse('user_powers', kwargs={'id': c['user'].id, 'action':c['user'].is_superuser and 'remove' or 'grant', 'status': 'super'}),
+                    a_attrs=lambda u, c: {'class': 'ajax-command confirm'},
+                    span_attrs={'class': 'user-superuser'},
+                ),
+            ), visibility=ui.Visibility.SUPERUSER, weight=500)
+)
diff --git a/forum/skins/default/media/js/osqa.main.js b/forum/skins/default/media/js/osqa.main.js
index 270a6b4..2a2a48e 100644
--- a/forum/skins/default/media/js/osqa.main.js
+++ b/forum/skins/default/media/js/osqa.main.js
@@ -299,6 +299,8 @@ $(function() {
     $('a.ajax-command').live('click', function(evt) {
         if (running) return false;
 
+        $('.context-menu-dropdown').slideUp('fast');
+
         var el = $(this);
 
         if (el.is('.withprompt')) {
@@ -344,7 +346,8 @@ $(function() {
             $dropdown.slideToggle('fast', function() {
                 if ($dropdown.is(':visible')) {
                    $dropdown.one('clickoutside', function() {
-                        $dropdown.slideUp('fast')
+                       if ($dropdown.is(':visible'))
+                            $dropdown.slideUp('fast');
                     });
                 }
             });    
diff --git a/forum/skins/default/media/js/osqa.user.js b/forum/skins/default/media/js/osqa.user.js
deleted file mode 100644
index 5241880..0000000
--- a/forum/skins/default/media/js/osqa.user.js
+++ /dev/null
@@ -1,73 +0,0 @@
-$().ready(function() {
-    var $dropdown = $('#user-menu-dropdown');
-
-    $('#user-menu').click(function() {
-        $('.dialog').fadeOut('fast', function() {
-            $dialog.remove();
-        });
-        $dropdown.slideToggle('fast', function() {
-            if ($dropdown.is(':visible')) {
-                $dropdown.one('clickoutside', function() {
-                    $dropdown.slideUp('fast')
-                });
-            }
-        });
-    });
-
-    $('.confirm').each(function() {
-        var $link = $(this);
-
-        $link.click(function(e) {
-            $dropdown.slideUp('fast');
-
-            show_dialog({
-                html: messages.confirm,
-                extra_class: 'confirm',
-                event: e,
-                yes_callback: function() {
-                    window.location = $link.attr('href');
-                },
-                yes_text: messages.yes,
-                show_no: true,
-                no_text: messages.no
-            });
-
-            return false;
-        });
-    });
-
-    $('#award-rep-points').click(function(e) {
-        $dropdown.slideUp('fast');
-
-        var table = '<table><tr><th>' + messages.points + '</th><td><input type="text" id="points-to-award" value="1" /></td></tr>'
-                + '<tr><th>' + messages.message + '</th><td><textarea id="award-message"></textarea></td></tr></table>';
-
-        show_dialog({
-            html: table,
-            extra_class: 'award-rep-points',
-            event: e,
-            yes_callback: function($dialog) {
-                var $points_input = $('#points-to-award');
-                var _points = parseInt($points_input.val());
-
-                if (!isNaN(_points)) {
-                    $dialog.fadeOut('fast');
-                    var _message = $('#award-message').val();
-                    $.post($('#award-rep-points').attr('href'), {points: _points, message: _message}, function(data) {
-                        if (data.success) {
-                            $('#user-reputation').css('background', 'yellow');
-                            $('#user-reputation').html(data.reputation);
-
-                            $('#user-reputation').animate({ backgroundColor: "transparent" }, 1000);
-
-                        }
-                    }, 'json')
-                }
-            },
-            show_no: true
-        });
-
-        return false;
-    });
-
-});
\ No newline at end of file
diff --git a/forum/skins/default/media/style/style.css b/forum/skins/default/media/style/style.css
index e0605d6..c61c065 100644
--- a/forum/skins/default/media/style/style.css
+++ b/forum/skins/default/media/style/style.css
@@ -1622,6 +1622,7 @@ div.dialog, .context-menu-dropdown {
     top: 1.5em;
     text-align: left;
     list-style-type: none;
+    z-index: 500;
 }
 
 .context-menu-dropdown li.item {
@@ -1661,6 +1662,7 @@ div.dialog, .context-menu-dropdown {
 
 div.dialog .dialog-content {
     padding: 12px 12px 37px 12px;
+    z-index: 1000;
 }
 
 div.dialog .dialog-buttons {
diff --git a/forum/skins/default/templates/node/post_controls.html b/forum/skins/default/templates/node/post_controls.html
index c34e50f..e756fff 100644
--- a/forum/skins/default/templates/node/post_controls.html
+++ b/forum/skins/default/templates/node/post_controls.html
@@ -10,9 +10,9 @@
 {% endfor %}
 {% if menu|length %}
     <span class="action-link-separator">|</span>
-    <span id="node-{{ node.id }}-menu" class="context-menu">
-        <span id="node-{{ node.id }}-menu-trigger" class="action-link context-menu-trigger">{% trans "more" %} &#9660;</span>
-        <ul id="node-{{ node.id }}-menu-dropdown" class="context-menu-dropdown">
+    <span id="node-{{ post.id }}-menu" class="context-menu">
+        <span id="node-{{ post.id }}-menu-trigger" class="action-link context-menu-trigger">{% trans "more" %} &#9660;</span>
+        <ul id="node-{{ post.id }}-menu-dropdown" class="context-menu-dropdown">
             {% for item in menu %}
             <li class="item"><a class="{{ item.classes }}" href="{{ item.url }}" title="{{ item.title }}" >{{ item.text }}</a></li>
             {% endfor %}
diff --git a/forum/skins/default/templates/user.html b/forum/skins/default/templates/user.html
index 89fd69f..ec852cc 100644
--- a/forum/skins/default/templates/user.html
+++ b/forum/skins/default/templates/user.html
@@ -15,24 +15,19 @@
 {% block forejs %}
     {% if request.user.is_superuser or request.user == view_user %}
         <script type="text/javascript">google.load("jquery", "1.4.2");google.load("jqueryui", "1.8.1");</script>
-        <script src="{% media "/media/js/osqa.user.js" %}" type="text/javascript"></script>
+        <script type="text/javascript">
+            response_commands['update_profile_karma'] = function(new_karma) {
+                $('#user-reputation').css('background', 'yellow');
+                $('#user-reputation').html(new_karma);
+                $('#user-reputation').animate({ backgroundColor: "transparent" }, 1000);
+            }
+        </script>
 
         <link rel="stylesheet" href="http://jquery-ui.googlecode.com/svn/tags/latest/themes/base/jquery-ui.css" type="text/css" media="all" />
         <link rel="stylesheet" href="http://static.jquery.com/ui/css/demo-docs-theme/ui.theme.css" type="text/css" media="all" />
         <link rel="stylesheet" type="text/css" media="screen" href="{% media "/media/style/user.css" %}"/>
     {% endif %}
-    <script type="text/javascript">
-        var viewUserID = {{view_user.id}};
-        $().ready(function(){
-            {% ifequal view_user request.user%}
-                $("#nav_profile").attr('className',"on");
-            {% else %}
-                $("#nav_users").attr('className',"on");
-            {% endifequal %}
-        });
-    </script>
-    {% block userjs %}
-    {% endblock %}
+    {% block userjs %}{% endblock %}
 {% endblock %}
 {% block content %}
     <div id="mainbar-full">
@@ -40,6 +35,5 @@
         {% include "users/tabs.html" %}
         {% block usercontent %}
         {% endblock %}
-        {%comment%}{% include "users/footer.html" %}{%endcomment%}
 	</div>
 {% endblock %}<!-- end user.html -->
diff --git a/forum/skins/default/templates/users/edit.html b/forum/skins/default/templates/users/edit.html
index e21bf32..3240fd2 100644
--- a/forum/skins/default/templates/users/edit.html
+++ b/forum/skins/default/templates/users/edit.html
@@ -42,7 +42,7 @@
             {% endif %}
             <div style="padding:20px 0 0 20px;font-weight:bold;font-size:150%">
                 <a href="http://www.gravatar.com/" target="_blank" 
-					title="gravatar {% trans "image associated with your email address" %}">{% blocktrans %}avatar, see {{gravatar_faq_url}}{% endblocktrans %}</a>
+					title="gravatar {% trans "image associated with your email address" %}">{% trans "gravatar" %}</a>
             </div>
         </div>
         
diff --git a/forum/skins/default/templates/users/footer.html b/forum/skins/default/templates/users/footer.html
deleted file mode 100644
index ee34774..0000000
--- a/forum/skins/default/templates/users/footer.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- user_footer.html -->
-<div id="mainbar-footer">
-
-</div><!-- end user_footer.html -->
diff --git a/forum/skins/default/templates/users/karma_bonus.html b/forum/skins/default/templates/users/karma_bonus.html
new file mode 100644
index 0000000..b39c276
--- /dev/null
+++ b/forum/skins/default/templates/users/karma_bonus.html
@@ -0,0 +1,12 @@
+{% load i18n %}
+
+<table>
+    <tr>
+        <th>{% trans "Points" %}:</th>
+        <td><input type="text" id="points-to-award" name="points" value="1" /></td>
+    </tr>
+    <tr>
+        <th>{% trans "Message" %}:</th>
+        <td><textarea id="award-message" name="message"></textarea></td>
+    </tr>
+</table>
\ No newline at end of file
diff --git a/forum/skins/default/templates/users/menu.html b/forum/skins/default/templates/users/menu.html
index 650c41f..24d213d 100644
--- a/forum/skins/default/templates/users/menu.html
+++ b/forum/skins/default/templates/users/menu.html
@@ -1,57 +1,8 @@
-{% load i18n %}
-{% load smart_if %}
+{% load i18n smart_if ui_registry %}
 
-<script type="text/javascript">
-    messages['points'] = "{% trans "Points" %}"
-</script>
-
-<div id="user-menu-container">
-    <span id="user-menu">{% trans "User tools" %} &#9660;</span>
-    <ul id="user-menu-dropdown">
-        <li class="item"><span class="user-edit"></span><a href="{% url edit_user id=user.id %}">{% trans "edit profile" %}</a></li>
-        <li class="item"><span class="user-auth"></span><a href="{% url user_authsettings id=user.id %}">{% trans "authentication settings" %}</a></li>
-        <li class="item"><span class="user-subscriptions"></span><a href="{% url user_subscriptions id=user.id,slug=user.username|slugify %}">{% trans "email notification settings" %}</a></li>
-        {% ifnotequal user viewer %}
-            {% if viewer.is_superuser %}
-            <li class="separator">{% trans "Moderation tools" %}</li>
-            {% if not user.is_superuser %}
-                {% if user.is_suspended %}
-                <li class="item"><span></span>
-                    <a href="{% url user_suspend id=user.id %}" class="ajax-command confirm" id="suspend-user">{% trans "withdraw suspension" %}</a>
-                </li>
-                {% else %}
-                <li class="item"><span></span>
-                    <a href="{% url user_suspend id=user.id %}" class="ajax-command withprompt" id="suspend-user">{% trans "suspend this user" %}</a>
-                </li>
-                {% endif %}
-            {% endif %}
-            {% if not user.is_suspended %}
-                <li class="item"><span class="user-award_rep"></span>
-                    <a href="{% url user_award_points id=user.id %}" id="award-rep-points">{% trans "reputation bonus" %}</a>
-                </li>
-            {% endif %}
-                {% if not user.is_superuser %}
-                    {% if not user.is_staff %}
-                    <li class="item"><span class="user-moderator"></span>
-                        <a class="confirm" href="{% url user_powers id=user.id,action="grant",status="staff" %}">{% trans "grant moderator status" %}</a>
-                    </li>
-                    {% else %}
-                    <li class="item"><span class="user-moderator"></span>
-                        <a class="confirm" href="{% url user_powers id=user.id,action="remove",status="staff" %}">{% trans "remove moderator status" %}</a>
-                    </li>
-                    {% endif %}
-                    <li class="item"><span class="user-superuser"></span>
-                        <a class="confirm" href="{% url user_powers id=user.id,action="grant",status="super" %}">{% trans "grant super user status" %}</a>
-                    </li>
-                {% else %}
-                    {% if viewer.is_siteowner %}
-                    <li class="item"><span class="user-superuser"></span>
-                        <a class="confirm" href="{% url user_powers id=user.id,action="remove",status="super" %}">{% trans "remove super user status" %}</a>
-                    </li>
-                    {% endif %}
-                {% endif %}
-            {% endif %}
-        {% endifnotequal %}
+<div id="user-menu-container" class="context-menu">
+    <span id="user-menu" class="context-menu-trigger">{% trans "User tools" %} &#9660;</span>
+    <ul id="user-menu-dropdown" class="context-menu-dropdown">
+        {% loadregistry user_menu %}{% endloadregistry %}
     </ul>
 </div>
-
diff --git a/forum/skins/default/templates/users/subscriptions.html b/forum/skins/default/templates/users/subscriptions.html
index dcbea98..a6a93e3 100644
--- a/forum/skins/default/templates/users/subscriptions.html
+++ b/forum/skins/default/templates/users/subscriptions.html
@@ -126,7 +126,6 @@
             <input type="submit" class="submit" name="notswitch" value="{% trans "Start notifications" %}"/>            
             {% endif %}
         </div>
-        {{ form.user }}
     </form>
     </div>
 {% endblock %}
diff --git a/forum/startup.py b/forum/startup.py
index d203ab2..a5ae1db 100644
--- a/forum/startup.py
+++ b/forum/startup.py
@@ -3,7 +3,7 @@ import os
 sys.path.append(os.path.join(os.path.dirname(__file__),'markdownext'))
 
 
-from forum.modules import get_modules_script, ui
+from forum.modules import get_modules_script
 
 get_modules_script('settings')
 get_modules_script('startup')
@@ -11,55 +11,7 @@ get_modules_script('startup')
 
 import forum.badges
 import forum.subscriptions
-
-
-from django.utils.translation import ugettext as _
-from django.core.urlresolvers import reverse
-from forum.templatetags.extra_tags import get_score_badge
-from forum import settings
-
-
-ui.register(ui.HEADER_LINKS,
-            ui.Link(_('faq'), ui.Url('faq'), weight=400),
-            ui.Link(_('about'), ui.Url('about'), weight=300),
-
-            ui.Link(
-                    text=lambda u, c: u.is_authenticated() and _('logout') or _('login'),
-                    url=lambda u, c: u.is_authenticated() and reverse('logout') or reverse('auth_signin'),
-                    weight=200),
-
-            ui.Link(
-                    visibility=ui.Visibility.AUTHENTICATED,
-                    text=lambda u, c: u.username,
-                    url=lambda u, c: u.get_profile_url(),
-                    post_code=lambda u, c: get_score_badge(u),
-                    weight=100),
-
-            ui.Link(
-                    visibility=ui.Visibility.SUPERUSER,
-                    text=_('administration'),
-                    url=lambda u, c: reverse('admin_index'),
-                    weight=0)
-
-)
-
-class SupportLink(ui.Link):    
-    def can_render(self, context):
-        return bool(settings.SUPPORT_URL)
-
-
-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),
-                    weight=400),
-            SupportLink(_('support'), settings.SUPPORT_URL, attrs={'target': '_blank'}, weight=300),
-            ui.Link(_('privacy'), ui.Url('privacy'), weight=200),
-            ui.Link(_('faq'), ui.Url('faq'), weight=100),
-            ui.Link(_('about'), ui.Url('about'), weight=0),
-)
-
-
+import forum.registry
 
 
 
diff --git a/forum/utils/html.py b/forum/utils/html.py
index d424382..70fe1b3 100644
--- a/forum/utils/html.py
+++ b/forum/utils/html.py
@@ -58,7 +58,7 @@ def html2text(s, ignore_tags=(), indent_width=4, page_width=80):
     return mark_safe(parser.result)
 
 def buildtag(name, content, **attrs):
-    return mark_safe('<%s %s>%s</a>' % (name, " ".join('%s="%s"' % i for i in attrs.items()), str(content)))
+    return mark_safe('<%s %s>%s</%s>' % (name, " ".join('%s="%s"' % i for i in attrs.items()), str(content), name))
 
 def hyperlink(url, title, **attrs):
     return mark_safe('<a href="%s" %s>%s</a>' % (url, " ".join('%s="%s"' % i for i in attrs.items()), title))
diff --git a/forum/views/users.py b/forum/views/users.py
index 43464d8..4222acf 100644
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -115,10 +115,13 @@ def edit_user(request, id):
     }, context_instance=RequestContext(request))
 
 
-@login_required
+@decorate.withfn(decorators.command)
 def user_powers(request, id, action, status):
     if not request.user.is_superuser:
-        return HttpResponseUnauthorized(request)
+        raise decorators.CommandException(_("Only superusers are allowed to alter other users permissions."))
+
+    if (action == 'remove' and 'status' == 'super') and not request.user.is_siteowner():
+        raise decorators.CommandException(_("Only the site owner can remove the super user status from other user."))
 
     user = get_object_or_404(User, id=id)
     new_state = action == 'grant'
@@ -131,26 +134,32 @@ def user_powers(request, id, action, status):
         raise Http404()
 
     user.save()
-    return HttpResponseRedirect(user.get_profile_url())
+    return decorators.RefreshPageCommand()
 
 
 @decorate.withfn(decorators.command)
 def award_points(request, id):
-    if (not request.POST) and request.POST.get('points', None):
-        raise decorators.CommandException(_("Invalid request type"))
+    if not request.POST:
+        return render_to_response('users/karma_bonus.html')
 
     if not request.user.is_superuser:
         raise decorators.CommandException(_("Only superusers are allowed to award reputation points"))
 
+    try:
+        points = int(request.POST['points'])
+    except:
+        raise decorators.CommandException(_("Invalid number of points to award."))
+
     user = get_object_or_404(User, id=id)
-    points = int(request.POST['points'])
 
     extra = dict(message=request.POST.get('message', ''), awarding_user=request.user.id, value=points)
 
     BonusRepAction(user=request.user, extra=extra).save(data=dict(value=points, affected=user))
 
-    return dict(reputation=user.reputation)
-
+    return {'commands': {
+            'update_profile_karma': [user.reputation]
+        }}
+    
 
 @decorate.withfn(decorators.command)
 def suspend(request, id):
@@ -159,7 +168,7 @@ def suspend(request, id):
     if not request.user.is_superuser:
         raise decorators.CommandException(_("Only superusers can suspend other users"))
 
-    if not request.POST:
+    if not request.POST.get('bantype', None):
         if user.is_suspended():
             suspension = user.suspension
             suspension.cancel(user=request.user, ip=request.META['REMOTE_ADDR'])
@@ -196,6 +205,7 @@ def user_view(template, tab_name, tab_title, tab_description, private=False, tab
             rev_page_title = user.username + " - " + tab_description
 
             context.update({
+            "tab": "users",
             "active_tab" : tab_name,
             "tab_description" : tab_description,
             "page_title" : rev_page_title,
@@ -287,30 +297,31 @@ def user_favorites(request, user):
 
 @user_view('users/subscriptions.html', 'subscriptions', _('subscription settings'), _('subscriptions'), True, tabbed=False)
 def user_subscriptions(request, user):
+    enabled = user.subscription_settings.enable_notifications
+
     if request.method == 'POST':        
         form = SubscriptionSettingsForm(data=request.POST, instance=user.subscription_settings)
 
         if form.is_valid():
-            if form.cleaned_data['user'] != user.id:
-                return HttpResponseUnauthorized(request)
+            form.save()
+            message = _('New subscription settings are now saved')
 
             if 'notswitch' in request.POST:
-                user.subscription_settings.enable_notifications = not user.subscription_settings.enable_notifications
-                user.subscription_settings.save()
+                enabled = not enabled
 
-                if user.subscription_settings.enable_notifications:
-                    request.user.message_set.create(message=_('Notifications are now enabled'))
+                if enabled:
+                    message = _('Notifications are now enabled')
                 else:
-                    request.user.message_set.create(message=_('Notifications are now disabled'))
+                    message = _('Notifications are now disabled')
 
-            form.save()
-            request.user.message_set.create(message=_('New subscription settings are now saved'))
+            user.subscription_settings.enable_notifications = enabled
+            user.subscription_settings.save()
+
+            request.user.message_set.create(message=message)
     else:
         form = SubscriptionSettingsForm(instance=user.subscription_settings)
 
-    notificatons_on = user.subscription_settings.enable_notifications
-
-    return {'view_user':user, 'notificatons_on': notificatons_on, 'form':form}
+    return {'view_user':user, 'notificatons_on': enabled, 'form':form}
 
 @login_required
 def account_settings(request):