Remove ADMIN_MEDIA_PREFIX since it has been deprecated in Django 1.4

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

diff --git a/forum/settings/moderation.py b/forum/settings/moderation.py
index 19763b40cd27a914c5866f44c12268bdef507768..742cc051c83c0e2903e2788d513333144ef3822f 100644 (file)
--- a/forum/settings/moderation.py
+++ b/forum/settings/moderation.py
@@ -3,7 +3,7 @@ from forms import StringListWidget
 
 from django.utils.encoding import smart_unicode
 from django.utils.translation import ugettext_lazy as _
 
 from django.utils.encoding import smart_unicode
 from django.utils.translation import ugettext_lazy as _

-from django.forms.widgets import Textarea
+from django.forms.widgets import Textarea, RadioSelect

 
 MODERATION_SET = SettingSet('moderation', _('Moderation settings'), _("Define the moderation workflow of your site"), 100)
 
 
 MODERATION_SET = SettingSet('moderation', _('Moderation settings'), _("Define the moderation workflow of your site"), 100)
 


@@ -18,7 +18,11 @@ CANNED_COMMENTS = Setting('CANNED_COMMENTS',
 ],
 MODERATION_SET, dict(
 label = _("Canned comments"),
 ],
 MODERATION_SET, dict(
 label = _("Canned comments"),

-help_text = _("Create some canned comments to be used for easier moderation."),
+help_text = _("""
+<p>Create some canned comments to be used for easier moderation. You can access the {{ post }} and {{ settings }} variables.</p>
+<p>If you want to access the current post author username you can use {{ post.author }}, for the question title use {{ post.title }}.</p>
+<p>To get the application title use {{ settings.APP_TITLE }}. All settings are accessible through the settings object.</p>
+"""),

 widget=StringListWidget))
 
 FLAG_TYPES = Setting('FLAG_TYPES',
 widget=StringListWidget))
 
 FLAG_TYPES = Setting('FLAG_TYPES',


@@ -37,3 +41,17 @@ MODERATION_SET, dict(
 label = _("Close Reasons"),
 help_text = _("Create some close reasons to use in the close question popup."),
 widget=StringListWidget))
 label = _("Close Reasons"),
 help_text = _("Create some close reasons to use in the close question popup."),
 widget=StringListWidget))

+
+
+# Flag control position
+REPORT_OFFENSIVE_CONTROL_POSITION_CHOICES = (
+    ('more', _('Position it in the "More" menu')),
+    ('controls', _('Position it in main controls')),
+)
+
+REPORT_OFFENSIVE_CONTROL_POSITION = Setting('REPORT_OFFENSIVE_CONTROL_POSITION', 'more', MODERATION_SET, dict(
+label = _("Position of report control"),
+help_text = _("Choose the position of the \"report (0)\" control of nodes."),
+widget=RadioSelect,
+choices=REPORT_OFFENSIVE_CONTROL_POSITION_CHOICES,
+required=False))