X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/3d2eba570bc4586884cc112b1920a4273b4d11c1..6278f4396ce969cb7fae8a275047c9d96203db08:/forum/skins/default/templates/question.html

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index 7afcf40..efb797b 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 title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}
-{% block forejs %}
+{% block meta %}
         <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">
+{% endblock %}
+{% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}
+{% block forejs %}
         {% 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" %}" />
@@ -43,38 +46,30 @@
             });
         });
 
-        function submitClicked(e) {
-            if(!is_chrome)$("input.submit")[0].disabled=true;
+        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) {
-            var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
 
             if($("textarea#editor")[0].value != "") {
-                if(is_chrome) {
-                    return "You sure you want to leave?  Your work will be lost.";
-                } else {
-                    yourWorkWillBeLost(e);
-                }
-                return false;
+                return yourWorkWillBeLost(e);
             }
 
             var commentBoxes = $("textarea.commentBox");
             for(var index = 0; index < commentBoxes.length; index++) {
                 if(commentBoxes[index].value != "") {
-                    if(is_chrome) {
-                        return "You sure you want to leave?  Your work will be lost.";
-                    } else {
-                        yourWorkWillBeLost(e);
-                    }
-                    return false;
+                    return yourWorkWillBeLost(e);
                 }
             }
         }
         window.addEventListener('beforeunload', beforeUnload, true);
-
-        var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
         </script>
         <noscript>
             <style>
@@ -112,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>
@@ -229,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 }} 
@@ -246,7 +242,7 @@
                     <div id="previewer" class="wmd-preview"></div>                    
                 </div>
                 <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 %}
@@ -256,7 +252,7 @@
                         value="{% trans "Answer the question" %}" 
                         {% endif %}
                     {% endif %}
-                    class="submit" style="float:left" onclick="submitClicked(event)"/>
+                    class="submit" style="float:left" onclick="submitClicked(event, this.form)"/>
             {% endif %}
         </form>
     </div>
@@ -267,7 +263,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>
@@ -275,8 +275,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>