Merge pull request #46 from udacity/subfolder_fixes

[osqa.git] / forum / settings / users.py

diff --git a/forum/settings/users.py b/forum/settings/users.py
index cceaf578e43b5985cfd47c031cf566a5954b3a49..a108ebf408882ccc4adce5620b48ba9d909bcfa6 100644 (file)
--- a/forum/settings/users.py
+++ b/forum/settings/users.py
@@ -1,4 +1,4 @@
-from forms import CommaStringListWidget
+from forms import CommaStringListWidget, StringListWidget

 from django.forms import CheckboxSelectMultiple
 from django.forms.widgets import RadioSelect
 from base import Setting, SettingSet
 from django.forms import CheckboxSelectMultiple
 from django.forms.widgets import RadioSelect
 from base import Setting, SettingSet


@@ -6,6 +6,16 @@ from django.utils.translation import ugettext as _
 
 USERS_SET = SettingSet('users', _('Users settings'), _("General settings for the OSQA users."), 20)
 
 
 USERS_SET = SettingSet('users', _('Users settings'), _("General settings for the OSQA users."), 20)
 

+ALLOW_NEGATIVE_REPUTATION = Setting('ALLOW_NEGATIVE_REPUTATION', True, USERS_SET, dict(
+label = _("Allow negative reputation"),
+help_text = _("Check if you want to allow negative user reputations in the community."),
+required=False))
+
+STORE_GREETING_IN_COOKIE = Setting('STORE_GREETING_IN_COOKIE', True, USERS_SET, dict(
+label = _("Store greeting in cookie"),
+help_text = _("If you check this the greeting will be stored in a cookie and the users won't be notified on logout."),
+required=False))
+

 EDITABLE_SCREEN_NAME = Setting('EDITABLE_SCREEN_NAME', False, USERS_SET, dict(
 label = _("Editable screen name"),
 help_text = _("Allow users to alter their screen name."),
 EDITABLE_SCREEN_NAME = Setting('EDITABLE_SCREEN_NAME', False, USERS_SET, dict(
 label = _("Editable screen name"),
 help_text = _("Allow users to alter their screen name."),


@@ -28,6 +38,18 @@ help_text = _("The long usernames will be truncated.."),
 required=False,
 ))
 
 required=False,
 ))
 

+SHOW_USER_ACCEPT_RATE = Setting('SHOW_USER_ACCEPT_RATE', True, USERS_SET, dict(
+label = _("Show user accept rate"),
+help_text = _("If you check this the user accept rate will be displayed on the user posts."),
+required=False))
+
+FREEZE_ACCEPT_RATE_FOR = Setting('FREEZE_ACCEPT_RATE_FOR',
+["admin",],
+USERS_SET, dict(
+label = _("Freeze accept rate"),
+help_text = _("Freeze answers accept rate for the selected users."),
+widget=StringListWidget))
+

 TRUNCATE_USERNAMES_LONGER_THAN = Setting('TRUNCATE_USERNAMES_LONGER_THAN', 15, USERS_SET, dict(
 label = _("Truncate usernames longer than"),
 help_text = _("The usernames that are longer than this will be truncated and ... will be appended.")))
 TRUNCATE_USERNAMES_LONGER_THAN = Setting('TRUNCATE_USERNAMES_LONGER_THAN', 15, USERS_SET, dict(
 label = _("Truncate usernames longer than"),
 help_text = _("The usernames that are longer than this will be truncated and ... will be appended.")))