X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/6b9b8579ab09beb19c0956bcd3938047c900bd61..4da66439c7e1cd073b2f97466208730cf5db9dff:/forum/skins/default/templates/question.html?ds=sidebyside

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index fceff20..4583518 100644
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -3,19 +3,30 @@
 {% load node_tags %}
 {% load extra_tags %}
 {% load extra_filters %}
+{% load general_sidebar_tags %}
 {% load smart_if %}
 {% load humanize %}
 {% load i18n %}
 {% load cache %}
+{% block metadescription %}{{ question.meta_description }}{% endblock %}
+{% block metakeywords %}{{question.tagname_meta_generator}}{% endblock %}
+{% block meta %}
+        <link rel="canonical" href="{{settings.APP_BASE_URL}}{{question.get_absolute_url}}" />
+        <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ question.get_absolute_url }}?type=rss">
+{% endblock %}
 {% 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 %}
+        {% if not question.nis.closed %}
+        <script type='text/javascript' src='{% media  "/media/js/osqa.question.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" %}" />
+
+        {% if embed_youtube_videos %}
+        <script type='text/javascript' src='{% media  "/media/js/viewbox_min.js" %}'></script>
+        <script type='text/javascript' src='{% media  "/media/js/youtube.js" %}'></script>
+        <link rel="stylesheet" type="text/css" href="{% media  "/media/js/viewbox.css" %}" />
+        {% endif %}
         {% endif %}
 
         <script type="text/javascript">
@@ -28,7 +39,7 @@
             }
 
             $('#editor').TextAreaResizer();
-            
+
             //toggle preview of editor
             var display = true;
             var txt = "[{% trans "hide preview" %}]";
@@ -40,6 +51,31 @@
                 $('#pre-collapse').text(txt);
             });
         });
+
+        function submitClicked(e, f) {
+            if(!(browserTester('chrome') || browserTester('safari'))) {
+                $("input.submit")[0].disabled=true;
+            }
+            window.removeEventListener('beforeunload', beforeUnload, true);
+            if (f) {
+                f.submit();
+            }
+        }
+
+        function beforeUnload(e) {
+
+            if($("textarea#editor")[0].value != "") {
+                return yourWorkWillBeLost(e);
+            }
+
+            var commentBoxes = $("textarea.commentBox");
+            for(var index = 0; index < commentBoxes.length; index++) {
+                if(commentBoxes[index].value != "") {
+                    return yourWorkWillBeLost(e);
+                }
+            }
+        }
+        window.addEventListener('beforeunload', beforeUnload, true);
         </script>
         <noscript>
             <style>
@@ -58,11 +94,11 @@
         
 {% block content %}
 <div class="headNormal">
-    <a href="{{ question.get_absolute_url }}">{{ question.headline }}</a>
+    <h1><a href="{{ question.get_absolute_url }}">{{ question.headline }}</a></h1>
 </div>
 <div id="main-body" class="">
     <div id="askform">
-            <table style="width:100%;" id="question-table" {% if question.deleted %}class="deleted"{%endif%}>
+            <table style="width:100%;" id="question-table" {% post_classes question %}>
                 <tr>
                     <td style="width:30px;vertical-align:top">
                         <div class="vote-buttons">
@@ -75,14 +111,15 @@
                             <div class="question-body">
                                 {{ question.html|safe }}
                             </div>
-                            <div id="question-controls" class="post-controls">
-                                <div id="question-tags" class="tags">
-                                    {% for tag in question.tagname_list %}
-                                        <a href="{% url tag_questions tag|urlencode %}" class="post-tag"
-                                            title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>
-                                    {% endfor %}
-                                </div>
+                            <div id="question-tags" class="tags-container tags">
+                                {% for tag in question.tagname_list %}
+                                    <a href="{% url tag_questions tag|urlencode %}" class="post-tag tag-link-{{ tag }}"
+                                        title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>
+                                {% endfor %}
+                            </div>
+                            <div id="question-controls" class="post-controls">                            
                                 {% post_controls question request.user %}
+                                {% wiki_symbol request.user question %}
                             </div>
                             <div class="post-update-info-container">
                                     {% contributors_info question %}
@@ -93,14 +130,12 @@
                     </td>
                 </tr>
             </table>
-            {% if question.marked %}
+            {% if question.nis.closed %}
             <div class="question-status" style="margin-bottom:15px">
             <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 %}
+                {% blocktrans with question.nstate.closed.extra as close_reason %}The question has been closed for the following reason "{{ close_reason }}" by{% endblocktrans %}
+                <a href="{{ question.nstate.closed.by.get_profile_url }}">{{ question.nstate.closed.by.username }}</a>
+                 {% diff_date question.nstate.closed.at %}
             </h3>
             </div>
             {% endif %}
@@ -109,26 +144,15 @@
                 <div class="tabBar">
                     <a name="sort-top"></a>
                     <div class="headQuestions">
-                    {% blocktrans count answers|length as counter %}
-                    One Answer:
-                    {% plural %}
-                    {{counter}} Answers:
-                    {% endblocktrans %}
-                    </div>
-                    <div class="tabsA">
-                         <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="{{ question.get_absolute_url }}?sort=latest#sort-top"
-                            title="{% trans "newest answers will be shown first" %}">{% trans "newest answers" %}</a>
-                        <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>   
+                    {% blocktrans count answers.paginator.count as counter %}One Answer:{% plural %}{{counter}} Answers:{% endblocktrans %}
                     </div>
+                    {{ answers.paginator.sort_tabs }}
                 </div>
-                {% cnprog_paginator context %}
+                {{ answers.paginator.page_numbers }}
   
-                {% for answer in answers %}
+                {% for answer in answers.paginator.page %}
                     <a name="{{ answer.id }}"></a>
-                    <div id="answer-container-{{ answer.id }}" class="answer {% if answer.accepted %}accepted-answer{% endif %} {% ifequal answer.author_id question.author_id %} answered-by-owner{% endifequal %} {% if answer.deleted %}deleted{% endif %}">
+                    <div id="answer-container-{{ answer.id }}" class="answer {% post_classes answer %}">
                         <table style="width:100%;">
                             <tr>
                                 <td style="width:30px;vertical-align:top">
@@ -144,6 +168,7 @@
                                         </div>
                                         <div class="answer-controls post-controls">
                                             {% post_controls answer request.user %}
+                                            {% wiki_symbol request.user answer %}
                                         </div>
                                         <div class="post-update-info-container">
                                             {% contributors_info answer %}
@@ -156,10 +181,11 @@
                     </div>
                 {% endfor %}
                 <div class="paginator-container-left">
-                    {% cnprog_paginator context %}
+                    {{ answers.paginator.page_numbers }}
                 </div>
             {% endif %}
         <form id="fmanswer" action="{% url answer question.id %}" method="post">
+            {% csrf_token %}
             <div style="clear:both">
             </div>
             
@@ -175,17 +201,23 @@
                     </div>
                     {% endspaceless %}
                 </div>
+                {% comment %}
                 {% if not request.user.is_authenticated %}
-                    <div class="message">{% trans "you can answer anonymously and then login" %}</div>
+                    <div class="message">{% trans "You can answer anonymously and then login." %}</div>
                 {% else %}
                     <p class="message">
                         {% ifequal request.user question.author  %}
-                            {% trans "answer your own question only to give an answer" %}
+                            {% trans "Answer your own question only to give an answer." %}
                         {% else %}
-                            {% trans "please only give an answer, no discussions" %}
+                            {% trans "Please only give an answer, no discussions." %}
                         {% endifequal %}
+                        {% if not request.user.email_valid_and_can_answer %}
+                            {% blocktrans %}Remember, your answer will not be published until you validate your email.{% endblocktrans %}
+                            <a href="{% url send_validation_email %}">{% trans "Send me a validation link." %}</a>
+                        {% endif %}
                     </p>
                 {% endif %}
+                {% endcomment %}
 
                 <div id="description" class="" >
                     <div id="wmd-button-bar" class="wmd-panel"></div>
@@ -199,6 +231,7 @@
                                             {% trans "toggle preview" %}
                                     </span>
                                 </td>
+                                <td style="text-align: right;" id="editor-metrics"></td>
                                 {% if settings.WIKI_ON %}
                                 <td style="text-align:right;">
                                     {{ answer.wiki }} 
@@ -212,11 +245,20 @@
                         
                         </table>  
                     </div>
-                    <div id="previewer" class="wmd-preview"></div>
                     {{ answer.text.errors }}
+                    <div id="previewer" class="wmd-preview"></div>
                 </div>
+
+	            {% if answer.recaptcha %}
+	            <div class="question-captcha" style="float: left;">
+	            	{{ answer.recaptcha.errors }}
+	            	{{ answer.recaptcha }}
+	            </div>
+	            <div class="clear"></div>
+	            {% endif %}
+                
                 <p><span class="form-error"></span></p>
-                <input type="submit" 
+                <input type="button"
                     {% if user.is_anonymous %}
                         value="{% trans "Login/Signup to Post Your Answer" %}" 
                     {% else %}
@@ -226,7 +268,7 @@
                         value="{% trans "Answer the question" %}" 
                         {% endif %}
                     {% endif %}
-                    class="submit" style="float:left"/>
+                    class="submit" style="float:left" onclick="submitClicked(event, this.form)"/>
             {% endif %}
         </form>
     </div>
@@ -237,15 +279,21 @@
 <div class="boxC" id="subscription_box">
     {% include "subscription_status.html" %}
 </div>
+
+{% markdown_help %}
+
+{% 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 %}
-        	<a href="{% url tag_questions tag.name|urlencode %}" 
-			title="{% trans "see questions tagged"%}'{{tag.name}}'{% trans "using tags" %}" 
+        {% for tag in question.tags.all %}
+        	<a href="{% url tag_questions tag.name|urlencode %}"
+            class="tag-link-{{ tag.name }}"
+			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/>
         {% endfor %}
     </p>
@@ -260,6 +308,7 @@
     </p>
 </div>
 {% endcache %}
+{% sidebar_lower %}
 <div class="boxC">
     <h3 class="subtitle">{% trans "Related questions" %}</h3>
     <div class="questions-related">