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

diff --git a/forum/skins/default/templates/faq.html b/forum/skins/default/templates/faq.html
index 0876db47be7902ac47cc4fc906ce3a1e57682a7b..c5dd284fedbb881c14f910d210c6373bcc5c64fb 100644 (file)
--- a/forum/skins/default/templates/faq.html
+++ b/forum/skins/default/templates/faq.html
@@ -58,42 +58,43 @@
                 </tr>
                 -->
                 <tr>
                 </tr>
                 -->
                 <tr>

-                    <td style="text-align:right;padding-right:5px"><strong>50</strong></td>
+                    <td style="text-align:right;padding-right:5px"><strong>{{ settings.REP_TO_COMMENT }}</strong></td>

                     <td>{% trans "add comments" %}</td>
                 </tr>
                 <tr>
                     <td>{% trans "add comments" %}</td>
                 </tr>
                 <tr>

-                    <td style="text-align:right;padding-right:5px"><strong>100</strong></td>
+                    <td style="text-align:right;padding-right:5px"><strong>{{ settings.REP_TO_VOTE_DOWN }}</strong></td>

                     <td>{% trans "downvote" %}</td>
                     <td>{% trans "downvote" %}</td>

-                </tr><tr>
-                    <td style="text-align:right;padding-right:5px"><strong>250</strong></td>
-                    <td>{% trans "open and close own questions" %}</td>

                 </tr>
                 <tr>
                 </tr>
                 <tr>

-                    <td style="text-align:right;padding-right:5px"><strong>500</strong></td>
+                    <td style="text-align:right;padding-right:5px"><strong>{{ settings.REP_TO_CLOSE_OWN }}</strong></td>
+                    <td>{% trans "close own questions" %}</td>
+                </tr>
+                <tr>
+                    <td style="text-align:right;padding-right:5px"><strong>{{ settings.REP_TO_REOPEN_OWN }}</strong></td>
+                    <td>{% trans "reopen own questions" %}</td>
+                </tr>
+                <tr>
+                    <td style="text-align:right;padding-right:5px"><strong>{{ settings.REP_TO_RETAG }}</strong></td>

                     <td>{% trans "retag questions" %}</td>
                 </tr>
                 {% if settings.WIKI_ON %}
                 <tr>
                     <td>{% trans "retag questions" %}</td>
                 </tr>
                 {% if settings.WIKI_ON %}
                 <tr>

-                    <td style="text-align:right;padding-right:5px"><strong>750</strong></td>
+                    <td style="text-align:right;padding-right:5px"><strong>{{ settings.REP_TO_EDIT_WIKI }}</strong></td>

                     <td>{% trans "edit community wiki questions" %}</td>
                 </tr>
                 {% endif %}
                 <tr>
                     <td>{% trans "edit community wiki questions" %}</td>
                 </tr>
                 {% endif %}
                 <tr>

-                    <td style="text-align:right;padding-right:5px"><strong>2000</strong></td>
+                    <td style="text-align:right;padding-right:5px"><strong>{{ settings.REP_TO_EDIT_OTHERS }}</strong></td>

                     <td>{% trans "edit any answer" %}</td>
                 </tr>
                 <tr>
                     <td>{% trans "edit any answer" %}</td>
                 </tr>
                 <tr>

-                    <td style="text-align:right;padding-right:5px"><strong>3000</strong></td>
+                    <td style="text-align:right;padding-right:5px"><strong>{{ settings.REP_TO_CLOSE_OTHERS }}</strong></td>

                     <td>{% trans "open any closed question" %}</td>
                 </tr>
                 <tr>
                     <td>{% trans "open any closed question" %}</td>
                 </tr>
                 <tr>

-                    <td style="text-align:right;padding-right:5px"><strong>5000</strong></td>
+                    <td style="text-align:right;padding-right:5px"><strong>{{ settings.REP_TO_DELETE_COMMENTS }}</strong></td>

                     <td>{% trans "delete any comment" %}</td>
                 </tr>
                     <td>{% trans "delete any comment" %}</td>
                 </tr>

-                <tr>
-                    <td style="text-align:right;padding-right:5px"><strong>10000</strong></td>
-                    <td>{% trans "delete any questions and answers and perform other moderation tasks" %}</td>
-                </tr>

 
             </table>
         </div>
 
             </table>
         </div>

diff --git a/forum/views/meta.py b/forum/views/meta.py
index 940bc4a52dc705f76ebe871629fdd4674b928975..b11c538d294a5fbb215ab336d6ae4120e595771a 100644 (file)
--- 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'),
     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))
 
     }
     return render_to_response('faq.html', data, context_instance=RequestContext(request))