From d1c8e444e8f4ba0035eca955ec0426383e6c7660 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sat, 31 Mar 2012 17:03:38 -0400
Subject: made karma completely hideable by configuration

---
 askbot/conf/karma_and_badges_visibility.py                 |  3 ++-
 askbot/doc/source/changelog.rst                            |  2 +-
 .../widgets/user_long_score_and_badge_summary.html         |  2 ++
 .../skins/default/templates/widgets/user_navigation.html   | 14 +++++++++-----
 askbot/views/users.py                                      |  2 ++
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/askbot/conf/karma_and_badges_visibility.py b/askbot/conf/karma_and_badges_visibility.py
index ffa8fe59..4c75cb22 100644
--- a/askbot/conf/karma_and_badges_visibility.py
+++ b/askbot/conf/karma_and_badges_visibility.py
@@ -21,7 +21,8 @@ settings.register(
         default = 'public',
         choices = (
             ('public', 'show publicly'),
-            ('private', 'show to owners only')
+            ('private', 'show to owners only'),
+            ('hidden', 'hide completely'),
         ),#todo: later implement hidden mode
         description = _("Visibility of karma"),
         clear_cache = True,
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index 4a87a5a0..ebc602b3 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -4,7 +4,7 @@ Changes in Askbot
 Future version
 --------------
 * User groups (Evgeny)
-* Public/Private reputation (Evgeny)
+* Public/Private/Hidden reputation (Evgeny)
 * Enabling/disabling the badges system (Evgeny)
 
 Development version (not released yet)
diff --git a/askbot/skins/default/templates/widgets/user_long_score_and_badge_summary.html b/askbot/skins/default/templates/widgets/user_long_score_and_badge_summary.html
index da9474fc..cf3b8add 100644
--- a/askbot/skins/default/templates/widgets/user_long_score_and_badge_summary.html
+++ b/askbot/skins/default/templates/widgets/user_long_score_and_badge_summary.html
@@ -1,6 +1,8 @@
+{% if karma_mode != 'hidden' %}
 <a class="user-micro-info" 
        href="{{user.get_absolute_url()}}?sort=reputation"
 >{% trans %}karma:{% endtrans %} {{user.reputation}}</a>
+{% endif %}
 {% if badges_mode == 'public' %}
     {%- if user.gold or user.silver or user.bronze %}
     <a class="user-micro-info"
diff --git a/askbot/skins/default/templates/widgets/user_navigation.html b/askbot/skins/default/templates/widgets/user_navigation.html
index e1e445e4..82cfb624 100644
--- a/askbot/skins/default/templates/widgets/user_navigation.html
+++ b/askbot/skins/default/templates/widgets/user_navigation.html
@@ -3,11 +3,15 @@
     <span class="user-info">
     {{ macros.inbox_link(request.user) }}
     {{ macros.moderation_items_link(request.user, moderation_items) }}
-    ({{ macros.user_long_score_and_badge_summary(
-                                            user,
-                                            badges_mode = settings.BADGES_MODE
-        )
-    }})
+    {% 
+        if settings.KARMA_MODE != 'hidden' and settings.BADGES_MODE != 'hidden' 
+    %}
+        ({{ macros.user_long_score_and_badge_summary(
+                                        user,
+                                        badges_mode = settings.BADGES_MODE
+            )
+        }})
+    {% endif %}
     </span>
     {% if settings.USE_ASKBOT_LOGIN_SYSTEM %}
          <a href="{{ settings.LOGOUT_URL }}?next={{ settings.LOGOUT_REDIRECT_URL }}">{% trans %}sign out{% endtrans %}</a>
diff --git a/askbot/views/users.py b/askbot/views/users.py
index 11b36b91..a4469e83 100644
--- a/askbot/views/users.py
+++ b/askbot/views/users.py
@@ -838,6 +838,8 @@ def user(request, id, slug=None, tab_name=None):
 
     if askbot_settings.KARMA_MODE == 'public':
         can_show_karma = True
+    elif askbot_settings.KARMA_MODE == 'hidden':
+        can_show_karma = False
     else:
         if request.user.is_administrator_or_moderator() \
             or request.user == profile_owner:
-- 
cgit v1.2.3-1-g7c22