Merge pull request #42 from aniketschneider/validation-email-template

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

diff --git a/forum/skins/default/templates/answer_edit.html b/forum/skins/default/templates/answer_edit.html
index 4265a3e28fac37d2b67df14a21d91f034268cfce..a3be73fb8c1309b156db60f3a933b17f275d0d5f 100644 (file)
--- a/forum/skins/default/templates/answer_edit.html
+++ b/forum/skins/default/templates/answer_edit.html
@@ -6,6 +6,7 @@
 {% block forejs %}
         <script type='text/javascript' src='{% media  "/media/js/wmd/showdown.js" %}'></script>
         <script type='text/javascript' src='{% media  "/media/js/wmd/wmd.js" %}'></script>
 {% block forejs %}
         <script type='text/javascript' src='{% media  "/media/js/wmd/showdown.js" %}'></script>
         <script type='text/javascript' src='{% media  "/media/js/wmd/wmd.js" %}'></script>

+        <script type='text/javascript' src='{% media  "/media/js/html_sanitizer.js" %}'></script>

         <link rel="stylesheet" type="text/css" href="{% media  "/media/js/wmd/wmd.css" %}" />
         <script type="text/javascript">
         
         <link rel="stylesheet" type="text/css" href="{% media  "/media/js/wmd/wmd.css" %}" />
         <script type="text/javascript">
         


@@ -35,12 +36,15 @@
         });
 
 
         });
 
 

-        function submitClicked(e) {
+        function submitClicked(e, f) {

             if(!(browserTester('chrome') || browserTester('safari'))) {
                 $("input.submit")[0].disabled=true;
                 $("input.submit")[1].disabled=true;
             }
             window.removeEventListener('beforeunload', beforeUnload, true);
             if(!(browserTester('chrome') || browserTester('safari'))) {
                 $("input.submit")[0].disabled=true;
                 $("input.submit")[1].disabled=true;
             }
             window.removeEventListener('beforeunload', beforeUnload, true);

+            if (f) {
+                f.submit();
+            }

         }
 
         function beforeUnload(e) {
         }
 
         function beforeUnload(e) {


@@ -60,7 +64,8 @@
 </div>
 <div id="main-body" class="ask-body">
     <div id="askform">
 </div>
 <div id="main-body" class="ask-body">
     <div id="askform">

-        <form id="fmedit" action="{% url edit_answer answer.id %}" method="post" >
+        <form id="fmedit" action="{% url "edit_answer" answer.id %}" method="post">
+            {% csrf_token %}

             <label for="id_revision" ><strong>{% trans "revision" %}:</strong></label> <br/> 
             {% if revision_form.revision.errors %}{{ revision_form.revision.errors.as_ul }}{% endif %}
             <div>
             <label for="id_revision" ><strong>{% trans "revision" %}:</strong></label> <br/> 
             {% if revision_form.revision.errors %}{{ revision_form.revision.errors.as_ul }}{% endif %}
             <div>


@@ -72,6 +77,7 @@
                 <span class="form-error"></span>
                 <div class="preview-toggle"><span id="pre-collapse" 
                                        title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span>
                 <span class="form-error"></span>
                 <div class="preview-toggle"><span id="pre-collapse" 
                                        title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span>

+                           <span style="text-align: right; margin-left: 200px;" id="editor-metrics"></span>

                                {% if settings.WIKI_ON %}
                     <div style="float:right;">
                         {{ form.wiki }} <span style="color:#000;cursor:help" title="{{form.wiki.help_text}}">{{ form.wiki.label_tag }} </span>
                                {% if settings.WIKI_ON %}
                     <div style="float:right;">
                         {{ form.wiki }} <span style="color:#000;cursor:help" title="{{form.wiki.help_text}}">{{ form.wiki.label_tag }} </span>


@@ -86,8 +92,16 @@
             <div class="title-desc">
                 {{ form.summary.help_text }}
             </div>
             <div class="title-desc">
                 {{ form.summary.help_text }}
             </div>

-            <input type="submit" value="{% trans "Save edit" %}" class="submit" onclick="submitClicked(event)" />
-            <input type="button" value="{% trans "Cancel" %}" class="submit" onclick="history.back(-1);submitClicked(event)" />
+            
+            {% if form.recaptcha %}
+            <div class="question-captcha">
+               {{ form.recaptcha.errors }}
+               {{ form.recaptcha }}
+            </div>
+            {% endif %}
+            
+            <input type="button" value="{% trans "Save edit" %}" class="submit" onclick="submitClicked(event, this.form)" />
+            <input type="button" value="{% trans "Cancel" %}" class="submit" onclick="submitClicked(event, this.form);history.back(-1);" />

         </form>
     </div>
 </div>
         </form>
     </div>
 </div>