Some more tweaks and fixes.

[osqa.git] / forum / skins / default / templates / question.html

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index 010ed4369482d964d08a65ed9014b791faae0e47..1173ce94726a36782af95cde7057fcc7e1d2d0c8 100644 (file)
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -8,12 +8,14 @@
 {% load humanize %}\r
 {% load i18n %}\r
 {% load cache %}\r
-{% block metadescription %}{{question.summary}}{% endblock %}\r
+{% block metadescription %}{{ question.meta_description }}{% endblock %}\r
 {% block metakeywords %}{{question.tagname_meta_generator}}{% endblock %}\r
-{% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}\r
-{% block forejs %}\r
+{% block meta %}\r
         <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}" />\r
         <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ question.get_absolute_url }}?type=rss">\r
+{% endblock %}\r
+{% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}\r
+{% block forejs %}\r
         {% if not question.nis.closed %}\r
         <script type='text/javascript' src='{% media  "/media/js/wmd/showdown.js" %}'></script>\r
         <script type='text/javascript' src='{% media  "/media/js/wmd/wmd.js" %}'></script>\r
@@ -43,30 +45,26 @@
             });\r
         });\r
 \r
-        function submitClicked(e) {\r
-            if(!is_chrome)$("input.submit")[0].disabled=true;\r
+        function submitClicked(e, f) {\r
+            if(!(browserTester('chrome') || browserTester('safari'))) {\r
+                $("input.submit")[0].disabled=true;\r
+            }\r
             window.removeEventListener('beforeunload', beforeUnload, true);\r
+            if (f) {\r
+                f.submit();\r
+            }\r
         }\r
 \r
         function beforeUnload(e) {\r
-            var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;\r
 \r
             if($("textarea#editor")[0].value != "") {\r
-                if(is_chrome) {\r
-                    return "Are you sure you want to leave?  Your work will be lost.";\r
-                } else {\r
-                    yourWorkWillBeLost(e);\r
-                }\r
+                return yourWorkWillBeLost(e);\r
             }\r
 \r
             var commentBoxes = $("textarea.commentBox");\r
             for(var index = 0; index < commentBoxes.length; index++) {\r
                 if(commentBoxes[index].value != "") {\r
-                    if(is_chrome) {\r
-                        return "You sure you want to leave?  Your work will be lost.";\r
-                    } else {\r
-                        yourWorkWillBeLost(e);\r
-                    }\r
+                    return yourWorkWillBeLost(e);\r
                 }\r
             }\r
         }\r
@@ -225,6 +223,7 @@
                                             {% trans "toggle preview" %}\r
                                     </span>\r
                                 </td>\r
+                                <td style="text-align: right;" id="editor-metrics"></td>\r
                                 {% if settings.WIKI_ON %}\r
                                 <td style="text-align:right;">\r
                                     {{ answer.wiki }} \r
@@ -242,7 +241,7 @@
                     <div id="previewer" class="wmd-preview"></div>                    \r
                 </div>\r
                 <p><span class="form-error"></span></p>\r
-                <input type="submit"\r
+                <input type="button"\r
                     {% if user.is_anonymous %}\r
                         value="{% trans "Login/Signup to Post Your Answer" %}" \r
                     {% else %}\r
@@ -252,7 +251,7 @@
                         value="{% trans "Answer the question" %}" \r
                         {% endif %}\r
                     {% endif %}\r
-                    class="submit" style="float:left" onclick="submitClicked(event)"/>\r
+                    class="submit" style="float:left" onclick="submitClicked(event, this.form)"/>\r
             {% endif %}\r
         </form>\r
     </div>\r