X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/4b20a67ddb4ebea2c6e09d51ee48da5a856edef8..2444d6ffd7995be782615589fb1d5aef2c8277ce:/forum/skins/default/templates/question.html

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index a9a1706..c6c4cde 100644
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -8,13 +8,16 @@
 {% load humanize %}
 {% load i18n %}
 {% load cache %}
-{% block metadescription %}{{question.summary}}{% endblock %}
+{% 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 %}
-        <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}" />
-        <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ question.get_absolute_url }}?type=rss">
         {% 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" %}" />
@@ -41,32 +44,33 @@
                 $('#previewer').toggle();
                 $('#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 != "") {
-               yourWorkWillBeLost(e);
+                return yourWorkWillBeLost(e);
             }
 
-            $("textarea.commentBox").each(function() {
-               if(this.value != "") {
-                   yourWorkWillBeLost(e);
-               }
-            });
-
-            return false;
+            var commentBoxes = $("textarea.commentBox");
+            for(var index = 0; index < commentBoxes.length; index++) {
+                if(commentBoxes[index].value != "") {
+                    return yourWorkWillBeLost(e);
+                }
+            }
         }
         window.addEventListener('beforeunload', beforeUnload, true);
-
-        function submitClicked() {
-             window.removeEventListener('beforeunload', beforeUnload, true);
-             $("input.submit").each(function() {
-                 this.disabled=true;
-             });
-         }
-
-         </script>
+        </script>
         <noscript>
             <style>
                 .comment.not_top_scorer {
@@ -103,7 +107,7 @@
                             </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"
+                                    <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>
@@ -220,6 +224,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 }} 
@@ -234,10 +239,19 @@
                         </table>  
                     </div>
                     {{ answer.text.errors }}
-                    <div id="previewer" class="wmd-preview"></div>                    
+                    <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 %}
@@ -247,7 +261,7 @@
                         value="{% trans "Answer the question" %}" 
                         {% endif %}
                     {% endif %}
-                    class="submit" style="float:left" onclick="submitClicked()" />
+                    class="submit" style="float:left" onclick="submitClicked(event, this.form)"/>
             {% endif %}
         </form>
     </div>
@@ -258,7 +272,11 @@
 <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>
@@ -266,8 +284,9 @@
     </p>
     <p class="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" %}" 
+        	<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>