Adds the option to enable/disable email digests and makes small tweak on the handling...

[osqa.git] / forum / skins / default / templates / users / menu.html

diff --git a/forum/skins/default/templates/users/menu.html b/forum/skins/default/templates/users/menu.html
index 65d726e635f94218e2197eff4f161d10ca7e52fc..650c41f4e996d09661775ba05086b44c2cc20bee 100644 (file)
--- a/forum/skins/default/templates/users/menu.html
+++ b/forum/skins/default/templates/users/menu.html
@@ -10,7 +10,7 @@
     <ul id="user-menu-dropdown">\r
         <li class="item"><span class="user-edit"></span><a href="{% url edit_user id=user.id %}">{% trans "edit profile" %}</a></li>\r
         <li class="item"><span class="user-auth"></span><a href="{% url user_authsettings id=user.id %}">{% trans "authentication settings" %}</a></li>\r
-        <li class="item"><span class="user-subscriptions"></span><a href="{% url user_subscriptions id=user.id %}">{% trans "email notification settings" %}</a></li>\r
+        <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>\r
         {% ifnotequal user viewer %}\r
             {% if viewer.is_superuser %}\r
             <li class="separator">{% trans "Moderation tools" %}</li>\r
@@ -25,8 +25,11 @@
                 </li>\r
                 {% endif %}\r
             {% endif %}\r
-\r
-            <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>\r
+            {% if not user.is_suspended %}\r
+                <li class="item"><span class="user-award_rep"></span>\r
+                    <a href="{% url user_award_points id=user.id %}" id="award-rep-points">{% trans "reputation bonus" %}</a>\r
+                </li>\r
+            {% endif %}\r
                 {% if not user.is_superuser %}\r
                     {% if not user.is_staff %}\r
                     <li class="item"><span class="user-moderator"></span>\r
@@ -41,11 +44,11 @@
                         <a class="confirm" href="{% url user_powers id=user.id,action="grant",status="super" %}">{% trans "grant super user status" %}</a>\r
                     </li>\r
                 {% else %}\r
-                    {% ifequal viewer.id 1 %}\r
+                    {% if viewer.is_siteowner %}\r
                     <li class="item"><span class="user-superuser"></span>\r
                         <a class="confirm" href="{% url user_powers id=user.id,action="remove",status="super" %}">{% trans "remove super user status" %}</a>\r
                     </li>\r
-                    {% endifequal %}\r
+                    {% endif %}\r
                 {% endif %}\r
             {% endif %}\r
         {% endifnotequal %}\r