X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/a9eef437702d5df7a2f97010e6798c689371808c..30beae7541b44060bdd42b55fe525a1113452b55:/forum/skins/default/templates/question.html

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index 23c2411..466df6a 100644
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -1,46 +1,36 @@
 {% extends "base.html" %}
 <!-- question.html -->
+{% load node_tags %}
 {% load extra_tags %}
 {% load extra_filters %}
+{% load general_sidebar_tags %}
 {% load smart_if %}
 {% load humanize %}
 {% load i18n %}
-{% block title %}{% spaceless %}{{ question.get_question_title }}{% endspaceless %}{% endblock %}
+{% load cache %}
+{% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}
 {% block forejs %}
         <meta name="description" content="{{question.summary}}" />
         <meta name="keywords" content="{{question.tagname_meta_generator}}" />
         <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}" />
         {% if not question.closed %}
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.editor.js" %}'></script>
         <script type='text/javascript' src='{% media  "/media/js/wmd/showdown.js" %}'></script>
         <script type='text/javascript' src='{% media  "/media/js/wmd/wmd.js" %}'></script>
         <link rel="stylesheet" type="text/css" href="{% media  "/media/js/wmd/wmd.css" %}" />
         {% endif %}
-        <script type='text/javascript' src='{% media  "/media/js/com.cnprog.post.js" %}'></script>
-        <script type='text/javascript' src='{% media  "/media/js/jquery.validate.pack.js" %}'></script>
 
         <script type="text/javascript">
-        // define reputation needs for comments
-        var repNeededForComments = 50;
         $().ready(function(){
             $("#nav_questions").attr('className',"on");
             var answer_sort_tab = "{{ tab_id }}";
-            $("#" + answer_sort_tab).attr('className',"on");
-            
-            Vote.init({{ question.id }}, '{{ question.title|slugify }}', '{{ question.author.id }}','{{ request.user.id }}');
-            
-            {% if not question.closed and request.user.is_authenticated %}initEditor();{% endif %}
-            
-            lanai.highlightSyntax();
-            $('#btLogin').bind('click', function(){window.location.href='{% url auth_signin %}'; } )
-        });
-        
-        function initEditor(){
+
+            if (answer_sort_tab) {
+                $("#" + answer_sort_tab).attr('className',"on");
+            }
+
             $('#editor').TextAreaResizer();
-            //highlight code synctax when editor has new text
-            $("#editor").typeWatch({highlight: false, wait: 3000,
-                             captureLength: 5, callback: lanai.highlightSyntax});
-                             
+            
+            //toggle preview of editor
             var display = true;
             var txt = "[{% trans "hide preview" %}]";
             $('#pre-collapse').text(txt);
@@ -50,16 +40,26 @@
                 $('#previewer').toggle();
                 $('#pre-collapse').text(txt);
             });
-            
-            setupFormValidation("#fmanswer", CPValidator.getQuestionFormRules(), CPValidator.getQuestionFormMessages());
-        }
-         
+        });
         </script>
+        <noscript>
+            <style>
+                .comment.not_top_scorer {
+                    display: block;
+                }
+                .comment-form-container {
+                    display: block;
+                }
+                .div.comment-tools {
+                    display: none;
+                }
+            </style>
+        </noscript>
 {% endblock %}
         
 {% block content %}
 <div class="headNormal">
-    <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
+    <a href="{{ question.get_absolute_url }}">{{ question.headline }}</a>
 </div>
 <div id="main-body" class="">
     <div id="askform">
@@ -67,58 +67,8 @@
                 <tr>
                     <td style="width:30px;vertical-align:top">
                         <div class="vote-buttons">
-                            {% if question_vote %}
-                            <img id="question-img-upvote-{{ question.id }}" class="question-img-upvote" 
-                                {% if question_vote.is_upvote %}
-                                    src="{% media  "/media/images/vote-arrow-up-on.png" %}" 
-                                {% else %}
-                                    src="{% media  "/media/images/vote-arrow-up.png" %}" 
-                                {% endif %}
-                                alt="{% trans "i like this post (click again to cancel)" %}"
-                                title="{% trans "i like this post (click again to cancel)" %}" />
-                            <div id="question-vote-number-{{ question.id }}" class="vote-number" 
-                                title="{% trans "current number of votes" %}">
-                                {{ question.score }}
-                            </div>
-                            <img id="question-img-downvote-{{ question.id }}" class="question-img-downvote" 
-                                {% if question_vote.is_downvote %}
-                                    src="{% media  "/media/images/vote-arrow-down-on.png" %}" 
-                                {% else %}
-                                    src="{% media  "/media/images/vote-arrow-down.png" %}" 
-                                {% endif %}
-                                alt="{% trans "i dont like this post (click again to cancel)" %}"
-                                title="{% trans "i dont like this post (click again to cancel)" %}" />
-                           
-                            {% else %}
-                            <img id="question-img-upvote-{{ question.id }}" class="question-img-upvote" 
-                                alt="{% trans "i like this post (click again to cancel)" %}"
-                                src="{% media  "/media/images/vote-arrow-up.png" %}" 
-                                title="{% trans "i like this post (click again to cancel)" %}" />
-                            <div id="question-vote-number-{{ question.id }}" class="vote-number" 
-                                title="{% trans "current number of votes" %}">
-                                {{ question.score }}
-                            </div>
-                            <img id="question-img-downvote-{{ question.id }}" class="question-img-downvote" 
-                                src="{% media  "/media/images/vote-arrow-down.png" %}"
-                                alt="{% trans "i dont like this post (click again to cancel)" %}"
-                                title="{% trans "i dont like this post (click again to cancel)" %}" />
-                            {% endif %}
-                            {% if favorited %}
-                            <img class="question-img-favorite" src="{% media  "/media/images/vote-favorite-on.png" %}"
-                                alt="{% trans "mark this question as favorite (click again to cancel)" %}"
-                                title="{% trans "mark this question as favorite (click again to cancel)" %}" />
-                            <div id="favorite-number" class="favorite-number my-favorite-number">
-                                {{ question.favourite_count }}
-                            </div>
-                            {% else %}
-                            <img class="question-img-favorite" src="{% media  "/media/images/vote-favorite-off.png" %}"
-                                alt="{% trans "remove favorite mark from this question (click again to restore mark)" %}"
-                                title="{% trans "remove favorite mark from this question (click again to restore mark)" %}" />
-                            <div id="favorite-number" class="favorite-number">
-                               {% ifnotequal question.favourite_count 0 %}{{ question.favourite_count }}{% endifnotequal %}
-                            </div>
-                            {% endif %}
-                            
+                            {% vote_buttons question request.user %}
+                            {% favorite_mark question request.user %}                            
                         </div>
                     </td>
                     <td>
@@ -133,90 +83,26 @@
                                             title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>
                                     {% endfor %}
                                 </div>
-                                {% joinitems using '<span class="action-link-separator">|</span>' %}    
-                                    {% if request.user|can_edit_post:question %}
-                                    <span class="action-link"><a href="{% url edit_question question.id %}">{% trans 'edit' %}</a></span>
-                                    {% endif %}
-                                {% separator %}
-                                    {% if question.closed %}
-                                    {% if request.user|can_reopen_question:question %}
-                                    <span class="action-link"><a href="{% url reopen question.id %}">{% trans "reopen" %}</a></span>
-                                    {% endif %}
-                                    {% else %}
-                                    {% if request.user|can_close_question:question %}
-                                    <span class="action-link"><a href="{% url close question.id %}">{% trans "close" %}</a></span>
-                                    {% endif %}
-                                    {% endif %}
-                                {% separator %}
-                                    {% if request.user|can_flag_offensive %}
-                                    <span id="question-offensive-flag-{{ question.id }}" class="offensive-flag" 
-                                        title="{% trans "report as offensive (i.e containing spam, advertising, malicious text, etc.)" %}">
-                                        <a>{% trans "flag offensive" %}</a>
-                                        {% if request.user|can_view_offensive_flags and question.offensive_flag_count %}
-                                        <span class="darkred">({{ question.offensive_flag_count }})</span>
-                                        {% endif %}
-                                    </span>
-                                    {% endif %}
-                                {% separator %}
-                                    {% if request.user|can_delete_post:question %}
-                                    <span class="action-link"><a id="question-delete-link-{{question.id}}">{% trans "delete" %}</a></span>
-                                    {% endif %}
-                                {% endjoinitems %}
+                                {% post_controls question request.user %}
                             </div>
                             <div class="post-update-info-container">
-                                {% post_contributor_info question "original_author" %}
-                                {% post_contributor_info question "last_updater" %}
-                            </div>
-                            <div class="comments-container" id="comments-container-question-{{question.id}}">
-                            {% for comment in question.get_comments|slice:":5" %}
-                                <p class="comment" id="comment-{{comment.id}}">
-                                    {{comment.comment}} 
-                                    - <a class="comment-user" href="{{comment.user.get_profile_url}}">{{comment.user}}</a>
-                                    {% spaceless %}
-                                    <span class="comment-age">({% diff_date comment.added_at %})</span>
-                                    {% if request.user|can_delete_comment:comment %}
-                                        <img class="delete-icon" 
-                                            src="{% media  "/media/images/close-small.png" %}"
-                                            title="{% trans "delete this comment" %}"/>
-                                    {% endif %}
-                                    {% endspaceless %}
-                                </p>
-                            {% endfor %}
-                            </div>
-                            <div class="post-comments" style="margin-bottom:20px">
-                                <input id="can-post-comments-question-{{question.id}}" type="hidden" value="{{ request.user|can_add_comments:question }}"/>
-                                {% if request.user|can_add_comments:question or question.comment_count > 5 %}
-                                    <a id="comments-link-question-{{question.id}}" class="comments-link">
-                                    {% if request.user|can_add_comments:question %}
-                                        {% trans "add comment" %}
-                                    {% endif %}
-                                    {% if question.comment_count > 5 %}
-                                        {% if request.user|can_add_comments:question %}/
-                                            {% blocktrans count question.get_comments|slice:"5:"|length as counter %}
-                                            see <strong>one</strong> more 
-                                            {% plural %}
-                                            see <strong>{{counter}}</strong> more
-                                            {% endblocktrans %}
-                                        {% else %}
-                                            {% blocktrans count question.get_comments|slice:"5:"|length as counter %}
-                                            see <strong>one</strong> more comment
-                                            {% plural %}
-                                            see <strong>{{counter}}</strong> more comments
-                                            {% endblocktrans %}
-                                        {% endif %}
-                                    {% endif %}</a>
-                                {% endif %}
+                                    {% contributors_info question %}
                             </div>
+                            {% comments question request.user %}
                         </div>
                         
                     </td>
                 </tr>
             </table>
-            {% if question.closed %}
+            {% if question.marked %}
             <div class="question-status" style="margin-bottom:15px">
-            <h3>{% blocktrans with question.get_close_reason_display as close_reason %}The question has been closed for the following reason "{{ close_reason }}" by{% endblocktrans %} 
-            <a href="{{ question.closed_by.get_profile_url }}">{{ question.closed_by.username }}</a> 
-            {% blocktrans with question.closed_at as closed_at %}close date {{closed_at}}{% endblocktrans %}</h3>
+            <h3>
+                {% blocktrans with question.closed.extra as close_reason %}
+                    The question has been closed for the following reason "{{ close_reason }}" by
+                {% endblocktrans %}
+                <a href="{{ question.closed.by.get_profile_url }}">{{ question.closed.by.username }}</a>
+                 {% diff_date question.closed.at %}
+            </h3>
             </div>
             {% endif %}
             {% if answers %}
@@ -231,11 +117,11 @@
                     {% endblocktrans %}
                     </div>
                     <div class="tabsA">
-                         <a id="oldest" href="{% url question question.id %}?sort=oldest#sort-top" 
+                         <a id="oldest" href="{{ question.get_absolute_url }}?sort=oldest#sort-top"
                             title="{% trans "oldest answers will be shown first" %}">{% trans "oldest answers" %}</a>
-                        <a id="latest" href="{% url question question.id %}?sort=latest#sort-top" 
+                        <a id="latest" href="{{ question.get_absolute_url }}?sort=latest#sort-top"
                             title="{% trans "newest answers will be shown first" %}">{% trans "newest answers" %}</a>
-                        <a id="votes" href="{% url question question.id %}?sort=votes#sort-top" 
+                        <a id="votes" href="{{ question.get_absolute_url }}?sort=votes#sort-top" 
                             title="{% trans "most voted answers will be shown first" %}">{% trans "popular answers" %}</a>   
                     </div>
                 </div>
@@ -248,31 +134,8 @@
                             <tr>
                                 <td style="width:30px;vertical-align:top">
                                     <div class="vote-buttons">
-                                        <img id="answer-img-upvote-{{ answer.id }}" class="answer-img-upvote" 
-                                                src="{% blockmedia %}/media/images/vote-arrow-up{% get_user_vote_image user_answer_votes answer.id 1 %}.png{% endblockmedia %}" 
-                                                alt="{% trans "i like this answer (click again to cancel)" %}"
-                                                title="{% trans "i like this answer (click again to cancel)" %}"/>
-                                        <div id="answer-vote-number-{{ answer.id }}" class="vote-number" title="{% trans "current number of votes" %}">
-                                            {{ answer.score }}
-                                        </div>
-                                        <img id="answer-img-downvote-{{ answer.id }}" class="answer-img-downvote" 
-                                            src="{% blockmedia %}/media/images/vote-arrow-down{% get_user_vote_image user_answer_votes answer.id -1 %}.png{% endblockmedia %}" 
-                                            alt="{% trans "i dont like this answer (click again to cancel)" %}"
-                                            title="{% trans "i dont like this answer (click again to cancel)" %}" />
-                                     
-                                        {% ifequal request.user question.author  %}
-                                        <img id="answer-img-accept-{{ answer.id }}" class="answer-img-accept" 
-                                            src="{% blockmedia %}/media/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png{% endblockmedia %}" 
-                                            alt="{% trans "mark this answer as favorite (click again to undo)" %}"
-                                            title="{% trans "mark this answer as favorite (click again to undo)" %}" />
-                                        {% else %}
-                                            {% if answer.accepted %}
-                                            <img id="answer-img-accept-{{ answer.id }}" class="answer-img-accept" 
-                                                src="{% blockmedia %}/media/images/vote-accepted{% if answer.accepted %}-on{% endif %}.png{% endblockmedia %}" 
-                                                alt="{% trans "the author of the question has selected this answer as correct" %}"
-                                                title="{% trans "the author of the question has selected this answer as correct" %}" />
-                                            {% endif %}
-                                        {% endifequal %}
+                                        {% vote_buttons answer request.user %}
+                                        {% accept_button answer request.user %}
                                     </div>
                                 </td>
                                 <td>
@@ -281,83 +144,13 @@
                                             {{ answer.html|safe }}
                                         </div>
                                         <div class="answer-controls post-controls">
-                                            {% joinitems using '<span class="action-link-separator">|</span>' %}    
-                                                <span class="linksopt">
-                                                    <a href="#{{ answer.id }}" title="{% trans "answer permanent link" %}">
-                                                        {% trans "permanent link" %}
-                                                    </a>
-                                                </span>
-                                            {% separator %}
-                                                {% if request.user|can_edit_post:answer %}
-                                                <span class="action-link"><a href="{% url edit_answer answer.id %}">{% trans 'edit' %}</a></span>
-                                                {% endif %}
-                                            {% separator %}
-                                                {% if request.user|can_flag_offensive %}
-                                                <span id="answer-offensive-flag-{{ answer.id }}" class="offensive-flag" 
-                                                    title="{% trans "report as offensive (i.e containing spam, advertising, malicious text, etc.)" %}">
-                                                    <a>{% trans "flag offensive" %}</a>
-                                                    {% if request.user|can_view_offensive_flags and answer.offensive_flag_count %}
-                                                    <span class="darkred">({{ answer.offensive_flag_count }})</span>
-                                                    {% endif %}
-                                                </span>
-                                                {% endif %}
-                                            {% separator %}
-                                                {% if request.user|can_delete_post:answer %}
-                                                    {% spaceless %}
-                                                    <span class="action-link">
-                                                        <a id="answer-delete-link-{{answer.id}}">
-                                                        {% if answer.deleted %}{% trans "undelete" %}{% else %}{% trans "delete" %}{% endif %}</a>
-                                                    </span>
-                                                    {% endspaceless %}
-                                                {% endif %}
-                                            {% endjoinitems %}
+                                            {% post_controls answer request.user %}
                                         </div>
                                         <div class="post-update-info-container">
-                                            {% post_contributor_info answer "original_author" %}
-                                            {% post_contributor_info answer "last_updater" %}
-                                        </div>
-                                        <div class="comments-container" id="comments-container-answer-{{answer.id}}">
-                                        {% for comment in answer.get_comments|slice:":5" %}
-                                            <p id="comment-{{comment.id}}" class="comment">
-                                                {{comment.comment}} 
-                                                - <a class="comment-user" href="{{comment.user.get_profile_url}}">{{comment.user}}</a>
-                                                {% spaceless %}
-                                                <span class="comment-age">({% diff_date comment.added_at %})</span>
-                                                {% if request.user|can_delete_comment:comment %}
-                                                    <img class="delete-icon" 
-                                                        src="{% media  "/media/images/close-small.png" %}"
-                                                        title="{% trans "delete this comment" %}"/>
-                                                {% endif %}
-                                                {% endspaceless %}
-                                            </p>
-                                        {% endfor %}
-                                        </div>
-                                        <div class="post-comments" style="margin-bottom:20px">
-                                            <input id="can-post-comments-answer-{{answer.id}}" type="hidden" value="{{ request.user|can_add_comments:answer}}"/>
-                                            {% if request.user|can_add_comments:answer or answer.comment_count > 5 %}
-                                                <a id="comments-link-answer-{{answer.id}}" class="comments-link">
-                                                {% if request.user|can_add_comments:answer %}
-                                                    {% trans "add comment" %}
-                                                {% endif %}
-                                                {% if answer.comment_count > 5 %}
-                                                    {% if request.user|can_add_comments:answer %}/
-                                                        {% blocktrans count answer.get_comments|slice:"5:"|length as counter %}
-                                                        see <strong>one</strong> more 
-                                                        {% plural %}
-                                                        see <strong>{{counter}}</strong> more
-                                                        {% endblocktrans %}
-                                                    {% else %}
-                                                        {% blocktrans count answer.get_comments|slice:"5:"|length as counter %}
-                                                        see <strong>one</strong> more comment
-                                                        {% plural %}
-                                                        see <strong>{{counter}}</strong> more comments
-                                                        {% endblocktrans %}
-                                                    {% endif %}
-                                                {% endif %}</a>
-                                            {% endif %}
+                                            {% contributors_info answer %}
                                         </div>
+                                        {% comments answer request.user %}
                                     </div>
-                                    
                                 </td>
                             </tr>
                         </table>
@@ -368,32 +161,6 @@
                 </div>
             {% endif %}
         <form id="fmanswer" action="{% url answer question.id %}" method="post">
-            {% if request.user.is_authenticated %}
-                <p style="padding-left:3px">
-                {{ answer.email_notify }} 
-                <label for="question-subscribe-updates">
-                {% ifequal request.user.get_q_sel_email_feed_frequency 'n' %}
-                    {% trans "Notify me once a day when there are any new answers" %}
-                {% else %}
-                    {% ifequal request.user.get_q_sel_email_feed_frequency 'd' %}
-                        {% trans "Notify me once a day when there are any new answers" %}
-                    {% else %}
-                        {% ifequal request.user.get_q_sel_email_feed_frequency 'w' %}
-                            {% trans "Notify me weekly when there are any new answers" %}
-                        {% endifequal %}
-                    {% endifequal %}
-                {% endifequal %}
-                </label>
-                {% blocktrans with request.user.get_profile_url as profile_url %}
-                You can always adjust frequency of email updates from your {{profile_url}}
-                {% endblocktrans %}
-                </p>
-            {% else %}
-                <p style="padding-left:3px">
-                    <input class="nomargin" type="checkbox" disabled="disabled" />
-                    <label>{% trans "once you sign in you will be able to subscribe for any updates here" %}</label>
-                </p>
-            {% endif %}
             <div style="clear:both">
             </div>
             
@@ -446,8 +213,8 @@
                         
                         </table>  
                     </div>
-                    <div id="previewer" class="wmd-preview"></div>
                     {{ answer.text.errors }}
+                    <div id="previewer" class="wmd-preview"></div>                    
                 </div>
                 <p><span class="form-error"></span></p>
                 <input type="submit" 
@@ -468,12 +235,17 @@
 {% endblock %}
 
 {% block sidebar %}
+<div class="boxC" id="subscription_box">
+    {% include "subscription_status.html" %}
+</div>
+{% sidebar_upper %}
+{% cache 60 questions_tags settings.APP_URL question.id %}
 <div class="boxC">
     <p>
 		{% trans "Question tags" %}:
     </p>
     <p class="tags" >
-        {% for tag in tags %}
+        {% for tag in question.tags.all %}
         	<a href="{% url tag_questions tag.name|urlencode %}" 
 			title="{% trans "see questions tagged"%}'{{tag.name}}'{% trans "using tags" %}" 
 			rel="tag">{{ tag.name }}</a> <span class="tag-number">&#215;{{ tag.used_count|intcomma }}</span><br/>
@@ -489,15 +261,18 @@
         {% trans "last updated" %}: <strong title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</strong>
     </p>
 </div>
-
+{% endcache %}
+{% sidebar_lower %}
 <div class="boxC">
     <h3 class="subtitle">{% trans "Related questions" %}</h3>
     <div class="questions-related">
+
         {% for question in similar_questions %}
         <p>
-            <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a>
+            <a href="{{ question.get_absolute_url }}">{{ question.headline }}</a>
         </p>
         {% endfor %}
+
     </div>
 </div>