X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/4b20a67ddb4ebea2c6e09d51ee48da5a856edef8..40e2851e2e2bf5e35063597b30ada01d06d2cc11:/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 a9a1706..03ef8ee 100644
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -10,10 +10,12 @@
 {% load cache %}
 {% block metadescription %}{{question.summary}}{% 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/wmd/showdown.js" %}'></script>
         <script type='text/javascript' src='{% media  "/media/js/wmd/wmd.js" %}'></script>
@@ -41,32 +43,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 {
@@ -220,6 +223,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 }} 
@@ -237,7 +241,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 %}
@@ -247,7 +251,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>