summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--askbot/doc/source/changelog.rst3
-rw-r--r--askbot/doc/source/contributors.rst1
-rw-r--r--askbot/skins/default/templates/user_profile/user_moderate.html28
3 files changed, 31 insertions, 1 deletions
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index 04062dc2..33a0199c 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -3,10 +3,11 @@ Changes in Askbot
Development version (not released yet)
--------------------------------------
+* Added annotations for the meanings of user levels on the "moderation" page. (Jishnu)
* Auto-link patterns - e.g. to bug databases - are configurable from settings. (Arun SAG)
0.7.23 (Current Version)
--------------------
+------------------------
* Greeting for anonymuos users can be changed from live settings (Hrishi)
* Greeting for anonymous users is shown only once (Rag Sagar)
* Added support for Akismet spam detection service (Adolfo Fitoria)
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 563026a4..b2f350df 100644
--- a/askbot/skins/default/templates/user_profile/user_moderate.html
+++ b/askbot/skins/default/templates/user_profile/user_moderate.html
@@ -15,6 +15,8 @@
<table class="form-as-table">
{{ change_user_status_form.as_table() }}
</table>
+ <p id="id_user_status_info">
+ </p>
<input type="submit" class="submit" name="change_status" value="{% trans %}Save{% endtrans %}" />
</form>
{% endif %}
@@ -64,3 +66,29 @@
</form>
{% endif %}
{% endblock %}
+{% block endjs %}
+ <script type="text/javascript" >
+ $("#id_user_status_info").hide();
+ $("#id_user_status").change(function () {
+ var optionValue = $(this).attr('value');
+ if (optionValue == "d") {
+ $('#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 %}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 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 their own posts.{% endtrans %}");
+ $('#id_user_status_info').show('slow');
+ } else if (optionValue == "b"){
+ $('#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');
+ }
+ })
+ </script>
+{% endblock %}