Adds optional status diamonds next to the usernames.

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

diff --git a/forum/models/user.py b/forum/models/user.py
index f5eb9a615304bcd045617859fc01f8b0d6c6623e..a1481b3bce9b55f8d0d1a452080fbdbe336e9e39 100644 (file)
--- a/forum/models/user.py
+++ b/forum/models/user.py
@@ -129,6 +129,17 @@ class User(BaseModel, DjangoUser):
         #todo: temporary thing, for now lets just assume that the site owner will always be the first user of the application
         return self.id == 1
 
+    @property
+    def decorated_name(self):
+        if settings.SHOW_STATUS_DIAMONDS:
+            if self.is_superuser:
+                return u"%s \u2666\u2666" % self.username
+
+            if self.is_staff:
+                return u"%s \u2666" % self.username
+
+        return self.username
+
     @property
     def gravatar(self):
         return md5(self.email).hexdigest()

diff --git a/forum/modules/__init__.py b/forum/modules/__init__.py
index 14c56e875ff8eea2e50f3da1f926db2174a51969..77a266fc799018f2c5024daeb130813382c7fe1f 100644 (file)
--- a/forum/modules/__init__.py
+++ b/forum/modules/__init__.py
@@ -26,7 +26,7 @@ def get_modules_script(script_name):
         try:
             all.append(__import__('%s.%s' % (m.__name__, script_name), globals(), locals(), [m.__name__]))
         except ImportError, e:
-            #repr(type(e)) + m.__name__ + ":" + str(e)
+            #print repr(type(e)) + m.__name__ + ":" + str(e)
             pass
         except:
             pass

diff --git a/forum/settings/users.py b/forum/settings/users.py
index 07f47b6a7f6943f6c81c259ec45c610bd4710c0e..1645948ed47a4f30cb85e5d2dddf856d2e047a0b 100644 (file)
--- a/forum/settings/users.py
+++ b/forum/settings/users.py
@@ -21,6 +21,11 @@ label = _("Disabled usernames"),
 help_text = _("A comma separated list of disabled usernames (usernames not allowed during a new user registration)."),
 widget=CommaStringListWidget))
 
+SHOW_STATUS_DIAMONDS = Setting('SHOW_STATUS_DIAMONDS', True, USERS_SET, dict(
+label=_("Show status diamonds"),
+help_text = _("Show status \"diamonds\" next to moderators or superusers usernames.")
+))
+
 EMAIL_UNIQUE = Setting('EMAIL_UNIQUE', True, USERS_SET, dict(
 label = _("Force unique email"),
 help_text = _("Should each user have an unique email.")))
@@ -41,4 +46,5 @@ help_text=_("How much time in minutes a post should be kept in session until the
 WARN_PENDING_POSTS_MINUTES = Setting('WARN_PENDING_POSTS_MINUTES', 15, USERS_SET, dict(
 label=_("Warn about pending posts afer X minutes"),
 help_text=_("How much time in minutes a user that just logged in or validated his email should be warned about a pending post instead of publishing it automatically.")
-))
\ No newline at end of file
+))
+

diff --git a/forum/skins/default/templates/node/contributors_info.html b/forum/skins/default/templates/node/contributors_info.html
index 0c40cf2762d369a9d460d8ef9bf80f1f8cdcc4ba..80121eafd5803e78774cdb106ca294997fe12d2a 100644 (file)
--- a/forum/skins/default/templates/node/contributors_info.html
+++ b/forum/skins/default/templates/node/contributors_info.html
@@ -5,7 +5,7 @@
         <strong>{% diff_date node.added_at %}</strong>
     </p>
     {% gravatar node.author 32 %}
-    <p><a {% if node.author.is_suspended %}class="suspended-user" {% endif %}href="{{ node.author.get_profile_url }}">{{ node.author.username }}</a><br/>
+    <p><a {% if node.author.is_suspended %}class="suspended-user" {% endif %}href="{{ node.author.get_profile_url }}">{{ node.author.decorated_name }}</a><br/>
     {% get_score_badge node.author %}</p>
 </div>
 {% if node.last_edited %}
@@ -18,7 +18,7 @@
         </p>
         {% ifnotequal node.author node.last_edited.by %}
             {% gravatar node.last_edited.by 32 %}
-            <p><a {% if node.last_edited.by.is_suspended %}class="suspended-user" {% endif %}href="{{ node.last_edited.by.get_profile_url }}">{{ node.last_edited.by.username }}</a><br/>
+            <p><a {% if node.last_edited.by.is_suspended %}class="suspended-user" {% endif %}href="{{ node.last_edited.by.get_profile_url }}">{{ node.last_edited.by.decorated_name }}</a><br/>
             {% get_score_badge node.last_edited.by %}</p>
         {% endifnotequal %}
     </div>

diff --git a/forum/skins/default/templates/users/info.html b/forum/skins/default/templates/users/info.html
index 8ffc7fa5cb385066cfaadcac3c100fbabad76c4c..e14cbf8adc694c03b5d1ff6723fa963985620120 100644 (file)
--- a/forum/skins/default/templates/users/info.html
+++ b/forum/skins/default/templates/users/info.html
@@ -8,7 +8,7 @@
 {% load user_tags %}
 
 <div id="subheader" class="headUser{% if view_user.is_suspended %} suspended-user{% endif %}">
-    {{view_user.username}}
+    {{view_user.decorated_name}}
 </div>
 <table class="user-info-table">
     <tr>

diff --git a/forum/skins/default/templates/users/signature.html b/forum/skins/default/templates/users/signature.html
index 2bf9aadc5ca84cbaae5f83c5099cd171d1096884..9805429aa52d86d88f4496aae35e493bb590a772 100644 (file)
--- a/forum/skins/default/templates/users/signature.html
+++ b/forum/skins/default/templates/users/signature.html
@@ -4,7 +4,7 @@
     {% ifequal format "full" %}\r
 \r
     {% else %}\r
-        <a href="{{ user.get_absolute_url }}">{{ user.username }}</a>\r
+        <a href="{{ user.get_absolute_url }}">{{ user.decorated_name }}</a>\r
         <span class="score" title="{{ user.reputation }} {% trans "reputation" %}">{{ user.reputation }}</span>\r
         {% ifequal format "badges" %}\r
             {% if user.gold %}\r
@@ -28,6 +28,6 @@
         {% endifequal %}\r
     {% endifequal %}\r
 {% else %}\r
-    <a class="suspended-user" href="{{ user.get_absolute_url }}">{{ user.username }}</a>{% trans "(suspended)" %}\r
+    <a class="suspended-user" href="{{ user.get_absolute_url }}">{{ user.decorated_name }}</a>{% trans "(suspended)" %}\r
 {% endif %}\r
 {% endspaceless %}\r