fix breach in award points that allows user to award infinite points / extra fix

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

diff --git a/forum/settings/sidebar.py b/forum/settings/sidebar.py
index 2ff349e91c0dcd6da24babbf2291d86df657be4a..4e5ad394a0e5ef7d78e1bd15b952f87ac377a1b4 100644 (file)
--- a/forum/settings/sidebar.py
+++ b/forum/settings/sidebar.py
@@ -1,7 +1,9 @@
 from base import Setting, SettingSet
-from django.forms.widgets import Textarea
+from django.forms.widgets import Textarea, Select
 from django.utils.translation import ugettext_lazy as _
 
+from static import RENDER_CHOICES
+
 SIDEBAR_SET = SettingSet('sidebar', 'Sidebar content', "Enter contents to display in the sidebar. You can use markdown and some basic html tags.", 10, True)
 
 SHOW_WELCOME_BOX = Setting('SHOW_WELCOME_BOX', True, SIDEBAR_SET, dict(
@@ -9,17 +11,51 @@ label = _("Show the Welcome box"),
 help_text = _("Do you want to show the welcome box when a user first visits your site."),
 required=False))
 
+SHOW_INTERESTING_TAGS_BOX = Setting('SHOW_INTERESTING_TAGS_BOX', True, SIDEBAR_SET, dict(
+label = _("Show interesting tags in the sidebar"),
+help_text = _("Check this if you want to see the interesting tags container in the sidebar."),
+required=False))
+
 APP_INTRO = Setting('APP_INTRO', u'<p>Ask and answer questions, make the world better!</p>', SIDEBAR_SET, dict(
 label = _("Application intro"),
 help_text = _("The introductory page that is visible in the sidebar for anonymous users."),
 widget=Textarea))
 
+QUESTION_TITLE_TIPS = Setting('QUESTION_TITLE_TIPS',
+u"""
+ - **ask a question relevant to the |APP_TITLE| community**
+ - the title must be in the form of a question
+ - provide enough details
+ - be clear and concise
+"""
+, SIDEBAR_SET, dict(
+label = "Question title tips",
+help_text = "Tips visible on the ask or edit questions page about the question title.",
+required=False,
+widget=Textarea(attrs={'rows': '10'})))
+
+QUESTION_TAG_TIPS = Setting('QUESTION_TAG_TIPS',
+u"""
+ - Tags are words that will tell others what this question is about.
+ - They will help other find your question.
+ - A question can have up to |FORM_MAX_NUMBER_OF_TAGS| tags, but it must have at least |FORM_MIN_NUMBER_OF_TAGS|.
+"""
+, SIDEBAR_SET, dict(
+label = "Tagging tips",
+help_text = "Tips visible on the ask or edit questions page about good tagging.",
+required=False,
+widget=Textarea(attrs={'rows': '10'})))
+
 
 SIDEBAR_UPPER_SHOW = Setting('SIDEBAR_UPPER_SHOW', True, SIDEBAR_SET, dict(
 label = "Show Upper Block",
 help_text = "Check if your pages should display the upper sidebar block.",
 required=False))
 
+SIDEBAR_UPPER_DONT_WRAP = Setting('SIDEBAR_UPPER_DONT_WRAP', False, SIDEBAR_SET, dict(
+label = "Don't Wrap Upper Block",
+help_text = "Don't wrap upper block with the standard style.",
+required=False))
 
 SIDEBAR_UPPER_TEXT = Setting('SIDEBAR_UPPER_TEXT',
 u"""
@@ -36,12 +72,23 @@ label = "Upper Block Content",
 help_text = " The upper sidebar block. ",
 widget=Textarea(attrs={'rows': '10'})))
 
+SIDEBAR_UPPER_RENDER_MODE = Setting('SIDEBAR_UPPER_RENDER_MODE', 'markdown', SIDEBAR_SET, dict(
+label = _("Upper block rendering mode"),
+help_text = _("How to render your upper block code."),
+widget=Select(choices=RENDER_CHOICES),
+required=False))
+
 
 SIDEBAR_LOWER_SHOW = Setting('SIDEBAR_LOWER_SHOW', True, SIDEBAR_SET, dict(
 label = "Show Lower Block",
 help_text = "Check if your pages should display the lower sidebar block.",
 required=False))
 
+SIDEBAR_LOWER_DONT_WRAP = Setting('SIDEBAR_LOWER_DONT_WRAP', False, SIDEBAR_SET, dict(
+label = "Don't Wrap Lower Block",
+help_text = "Don't wrap lower block with the standard style.",
+required=False))
+
 SIDEBAR_LOWER_TEXT = Setting('SIDEBAR_LOWER_TEXT',
 u"""
 ## Learn more about OSQA
@@ -52,4 +99,10 @@ are great resources to help you learn more about the OSQA open source Q&A system
 """, SIDEBAR_SET, dict(
 label = "Lower Block Content",
 help_text = " The lower sidebar block. ",
-widget=Textarea(attrs={'rows': '10'})))
\ No newline at end of file
+widget=Textarea(attrs={'rows': '10'})))
+
+SIDEBAR_LOWER_RENDER_MODE = Setting('SIDEBAR_LOWER_RENDER_MODE', 'markdown', SIDEBAR_SET, dict(
+label = _("Lower block rendering mode"),
+help_text = _("How to render your lower block code."),
+widget=Select(choices=RENDER_CHOICES),
+required=False))
\ No newline at end of file