From 8fd067230582e411db23ff11f0da68592a1e9b0a Mon Sep 17 00:00:00 2001 From: qw3rty Date: Thu, 29 Apr 2010 20:40:00 +0000 Subject: [PATCH 1/1] fixes osqa-101: made it so the faq page reflex the admin settings. git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@100 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/skins/default/templates/faq.html | 29 +++++++++++++------------- forum/views/meta.py | 1 + 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/forum/skins/default/templates/faq.html b/forum/skins/default/templates/faq.html index 0876db4..c5dd284 100644 --- a/forum/skins/default/templates/faq.html +++ b/forum/skins/default/templates/faq.html @@ -58,42 +58,43 @@ --> - 50 + {{ settings.REP_TO_COMMENT }} {% trans "add comments" %} - 100 + {{ settings.REP_TO_VOTE_DOWN }} {% trans "downvote" %} - - 250 - {% trans "open and close own questions" %} - 500 + {{ settings.REP_TO_CLOSE_OWN }} + {% trans "close own questions" %} + + + {{ settings.REP_TO_REOPEN_OWN }} + {% trans "reopen own questions" %} + + + {{ settings.REP_TO_RETAG }} {% trans "retag questions" %} {% if settings.WIKI_ON %} - 750 + {{ settings.REP_TO_EDIT_WIKI }} {% trans "edit community wiki questions" %} {% endif %} - 2000 + {{ settings.REP_TO_EDIT_OTHERS }} {% trans "edit any answer" %} - 3000 + {{ settings.REP_TO_CLOSE_OTHERS }} {% trans "open any closed question" %} - 5000 + {{ settings.REP_TO_DELETE_COMMENTS }} {% trans "delete any comment" %} - - 10000 - {% trans "delete any questions and answers and perform other moderation tasks" %} - diff --git a/forum/views/meta.py b/forum/views/meta.py index 940bc4a..b11c538 100644 --- a/forum/views/meta.py +++ b/forum/views/meta.py @@ -24,6 +24,7 @@ def faq(request): data = { 'gravatar_faq_url': reverse('faq') + '#gravatar', 'ask_question_url': reverse('ask'), + 'settings': settings, } return render_to_response('faq.html', data, context_instance=RequestContext(request)) -- 2.39.5