merged annotation of user types by Jishnu

3 files changed, 11 insertions, 6 deletions

diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index 7bbd734c..87933311 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -1,7 +1,11 @@
 Changes in Askbot
 =================
 
-0.7.23 (Current Version)
+0.7.24 (development version - not released)
+-------------------------------------------
+* Added annotations for the meanings of user levels on the "moderation" page. (Jishnu)
+
+0.7.23 (Current)
 -------------------
 * Greeting for anonymuos users can be changed from live settings (Hrishi)
 * Greeting for anonymous users is shown only once (Rag Sagar)
diff --git a/askbot/doc/source/contributors.rst b/askbot/doc/source/contributors.rst
index 35c02be1..fb8d9690 100644
--- a/askbot/doc/source/contributors.rst
+++ b/askbot/doc/source/contributors.rst
@@ -15,6 +15,7 @@ Programming and documentation
 * Andy Knotts
 * Benoit Lavine (with Windriver Software, Inc.)
 * Jeff Madynski
+* `Jishnu <http://thecodecracker.com/>`_
 * `Hrishi <https://github.com/stultus>`_
 * Andrei Mamoutkine
 * Ramiro Morales (with Machinalis)
diff --git a/askbot/skins/default/templates/user_profile/user_moderate.html b/askbot/skins/default/templates/user_profile/user_moderate.html
index 674f8770..b2f350df 100644
--- a/askbot/skins/default/templates/user_profile/user_moderate.html
+++ b/askbot/skins/default/templates/user_profile/user_moderate.html
@@ -72,19 +72,19 @@
         $("#id_user_status").change(function () {
             var optionValue = $(this).attr('value');
             if (optionValue == "d") {
-                $('#id_user_status_info').html("{% trans %}Administrator is the top-level user privilege set. This amounts to the same as an Operational user's privileges, plus the ability to manage users and alter system settings.{% endtrans %}");
+                $('#id_user_status_info').html("{% trans %}Administrators have privileges of normal users, but in addition they can assign/revoke any status to any user, and are exempt from the reputation limits.{% endtrans %}");
                 $('#id_user_status_info').show('slow');
             } else if (optionValue == "m"){
-                $('#id_user_status_info').html("{% trans %}Moderator differ from admins in that they cannot set anyone's status to 'moderator' or remove it.{% endtrans %}");
+                $('#id_user_status_info').html("{% trans %}Moderators have the same privileges as administrators, but cannot add or remove user status of 'moderator' or 'administrator'.{% endtrans %}");
                 $('#id_user_status_info').show('slow');
             } else if (optionValue == "a"){
-                $('#id_user_status_info').html("{% trans %}Approved status is for a regular user.{% endtrans %}");
+                $('#id_user_status_info').html("{% trans %}'Approved' status means the same as regular user.{% endtrans %}");
                 $('#id_user_status_info').show('slow');
             } else if (optionValue == "s"){
-                $('#id_user_status_info').html("{% trans %}Suspended users can only edit or delete his/her own posts.{% endtrans %}");
+                $('#id_user_status_info').html("{% trans %}Suspended users can only edit or delete their own posts.{% endtrans %}");
                 $('#id_user_status_info').show('slow');
             } else if (optionValue == "b"){
-                $('#id_user_status_info').html("{% trans %}Blocked user can login and send feedback. nothing else.{% endtrans %}");
+                $('#id_user_status_info').html("{% trans %}Blocked users can only login and send feedback to the site administrators.{% endtrans %}");
                 $('#id_user_status_info').show('slow');
             } else {
                 $('#id_user_status_info').hide('slow');