Merge pull request #2 from udacity/update_django

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

diff --git a/forum/skins/default/templates/ask.html b/forum/skins/default/templates/ask.html
index 35a6c2c50acd383fb971572897dbd8498fa66559..0c7b25544a3d6e05fc09a354a712a973ad621ec7 100644 (file)
--- a/forum/skins/default/templates/ask.html
+++ b/forum/skins/default/templates/ask.html
@@ -1,20 +1,28 @@
 {% extends "base.html" %}
 <!-- template ask.html -->
 {% extends "base.html" %}
 <!-- template ask.html -->

-{% load i18n %}
-{% load extra_tags %}
+{% load i18n extra_tags extra_filters %}

 {% block title %}{% spaceless %}{% trans "Ask a question" %}{% endspaceless %}{% endblock %}
 {% 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 title %}{% spaceless %}{% trans "Ask a question" %}{% endspaceless %}{% endblock %}
 {% 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" %}" />
         <link rel="stylesheet" type="text/css" href="{% media  "/media/js/wmd/wmd.css" %}" />

+        <script type="text/html" id="question-summary-template">
+            <div class="answer-summary">
+                <a href="%URL%"><div class="answer-votes">%SCORE%</div></a>
+                <div class="answer-link">
+                    <a class="question-hyperlink" href="%URL%" title="%SUMMARY%">%TITLE%</a>
+                </div>
+            </div>
+        </script>

         <script type="text/javascript">
         <script type="text/javascript">

-        $().ready(function(){
+        $(function(){

             //set current module button style
             $("#nav_ask").attr('className',"on");
             $('#editor').TextAreaResizer();
 
             //toggle preview of editor
             //set current module button style
             $("#nav_ask").attr('className',"on");
             $('#editor').TextAreaResizer();
 
             //toggle preview of editor

-                       //todo remove copy-paste
+            //todo remove copy-paste

             var display = true;
             var txt = "[{% trans "hide preview" %}]";
             $('#pre-collapse').text(txt);
             var display = true;
             var txt = "[{% trans "hide preview" %}]";
             $('#pre-collapse').text(txt);


@@ -26,53 +34,75 @@
             });
 
             //Tags autocomplete action
             });
 
             //Tags autocomplete action

-               $("#id_tags").autocomplete("/matching_tags", {
+            $("#id_tags").autocomplete('{% url "matching_tags" %}', {

                 minChars: 1,
                 minChars: 1,

-                       matchContains: true,
-                max: 20,
+                matchContains: true,
+                max: 10,

                 multiple: true,
                 multipleSeparator: " ",
                 multiple: true,
                 multipleSeparator: " ",

-                       /*formatItem: function(row, i, max) {
-                               return row.n + " ("+ row.c +")";
-                       },
-                formatResult: function(row, i, max){
-                    return row.n;
-                }*/
+                highlightItem: true,
+                scroll: true,
+                scrollHeight: 300,
+

                 formatItem: function(row, i, max, value) {
                 formatItem: function(row, i, max, value) {

-                    return row[1].split(".")[0] + " (" + row[1].split(".")[1] + ")";
+                    return row[1] + " (" + row[2] + ")";

                 },
 
                 formatResult: function(row, i, max, value){
                 },
 
                 formatResult: function(row, i, max, value){

-                    return row[0];
+                    return row[1];

                 }
 
             });
                 }
 
             });

+

         });
         });

+
+        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($("input#id_title")[0].value != "" || $("textarea#editor")[0].value != "" || $("input#id_tags")[0].value != "") {
+                return yourWorkWillBeLost(e);
+            }
+        }
+        window.addEventListener('beforeunload', beforeUnload, true);
+
+        var related_questions_url = '{% url "related_questions" %}';

         </script>
         </script>

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

 {% endblock %}
 
 {% block content %}
 <div id="main-bar" class="headNormal">
 {% endblock %}
 
 {% block content %}
 <div id="main-bar" class="headNormal">

-       {% trans "Ask a question" %}
+    {% trans "Ask a question" %}

 </div>
 <div id="main-body" class="ask-body">
     <div id="askform">
 </div>
 <div id="main-body" class="ask-body">
     <div id="askform">

-        <form id="fmask" action="" method="post" >
-                       {% if not request.user.is_authenticated %}
+        <form id="fmask" action="" method="post" accept-charset="utf-8">
+            {% csrf_token %}
+            {% if not request.user.is_authenticated %}

             <div class="message">
             <div class="message">

-                           <p>{% trans "login to post question info" %}</p>
+                <span class="strong big">{% trans "You are welcome to start submitting your question anonymously." %}</span>
+                <p>{% blocktrans %}
+                    After submiting your question, you will be redirected to the login/signup page.
+                    Your question will be saved in the current session and will be published after you login with your existing account,
+                    or signup for a new account{% endblocktrans %}{% if "ask"|contained_in:settings.REQUIRE_EMAIL_VALIDATION_TO %}
+                    {% trans "and validate your email." %}{% else %}.{% endif %}</p>

             </div>
             {% else %}
             </div>
             {% else %}

-                {% ifequal settings.EMAIL_VALIDATION 'on' %}
-                    {% if not request.user.email_isvalid %}
-                        <div class="message">
-                            {% blocktrans with request.user.email as email %}must have valid {{email}} to post, 
-                            see {{email_validation_faq_url}}
-                            {% endblocktrans %}
-                        </div>
-                    {% endif %}
-                {% endifequal %}
-                       {% endif %}
+                {% if not request.user.email_valid_and_can_ask %}
+                    <div class="message">
+                        {% blocktrans %}Remember, your question will not be published until you validate your email.{% endblocktrans %}
+                        <a href="{% url "send_validation_email" %}">{% trans "Send me a validation link." %}</a>
+                    </div>
+                {% endif %}
+            {% endif %}

             <div class="form-item">
                 <label for="id_title" ><strong>{{ form.title.label_tag }}:</strong></label> <span class="form-error"></span><br/>
                 {{ form.title }} {{ form.title.errors }}
             <div class="form-item">
                 <label for="id_title" ><strong>{{ form.title.label_tag }}:</strong></label> <span class="form-error"></span><br/>
                 {{ form.title }} {{ form.title.errors }}


@@ -80,17 +110,17 @@
                     {{ form.title.help_text }}
                 </div>
             </div>
                     {{ form.title.help_text }}
                 </div>
             </div>

-
+            <div id="ask-related-questions"></div>

             <div class="form-item">
                 <div id="wmd-button-bar" class="wmd-panel"></div>
                 {{ form.text }} {{ form.text.errors }}
             <div class="form-item">
                 <div id="wmd-button-bar" class="wmd-panel"></div>
                 {{ form.text }} {{ form.text.errors }}

-

                 <div class="preview-toggle">
                     <table width="100%">
                         <tr>
                             <td>
                                 <span id="pre-collapse" title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span>
                             </td>
                 <div class="preview-toggle">
                     <table width="100%">
                         <tr>
                             <td>
                                 <span id="pre-collapse" title="{% trans "Toggle the real time Markdown editor preview" %}">{% trans "toggle preview" %}</span>
                             </td>

+                            <td style="text-align: right;" id="editor-metrics"></td>

                             {% if settings.WIKI_ON %}
                             <td class="tright">
                                 {{ form.wiki }} <span class="help_text" title="{{form.wiki.help_text}}">{{ form.wiki.label_tag }} </span>
                             {% if settings.WIKI_ON %}
                             <td class="tright">
                                 {{ form.wiki }} <span class="help_text" title="{{form.wiki.help_text}}">{{ form.wiki.label_tag }} </span>


@@ -110,10 +140,19 @@
                        <p class="title-desc">
                                {{ form.tags.help_text }}
                        </p>
                        <p class="title-desc">
                                {{ form.tags.help_text }}
                        </p>

-            {% if not request.user.is_authenticated %}
-            <input name="ask" type="submit" value="{% trans "Login/signup to post your question" %}" class="submit" />
+                       
+            {% if form.recaptcha %}
+            <div class="question-captcha" style="float: left">
+               {{ form.recaptcha.errors }}
+               {{ form.recaptcha }}
+            </div>
+            <div class="clear"></div>
+            {% endif %}
+                       
+            {% if not request.user.is_authenticated %}                                                                        
+            <input name="ask" type="button" value="{% trans "Login/signup to post your question" %}" class="submit" onclick="submitClicked(event, this.form)"/>

                        {% else %}
                        {% else %}

-            <input name="ask" type="submit" value="{% trans "Ask your question" %}" class="submit" />
+            <input name="ask" type="button" value="{% trans "Ask your question" %}" class="submit" onclick="submitClicked(event, this.form)"/>

             {% endif %}
         </form>
     </div>
             {% endif %}
         </form>
     </div>