Migrate to Django 1.6

[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 ec5b1a8e80d6ac2fd5fb38cd541f9bdc9a1beff9..0c7b25544a3d6e05fc09a354a712a973ad621ec7 100644 (file)
--- a/forum/skins/default/templates/ask.html
+++ b/forum/skins/default/templates/ask.html
@@ -22,7 +22,7 @@
             $('#editor').TextAreaResizer();
 
             //toggle preview of editor
             $('#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);


@@ -34,9 +34,9 @@
             });
 
             //Tags autocomplete action
             });
 
             //Tags autocomplete action

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

                 minChars: 1,
                 minChars: 1,

-                       matchContains: true,
+                matchContains: true,

                 max: 10,
                 multiple: true,
                 multipleSeparator: " ",
                 max: 10,
                 multiple: true,
                 multipleSeparator: " ",


@@ -44,16 +44,6 @@
                 scroll: true,
                 scrollHeight: 300,
 
                 scroll: true,
                 scrollHeight: 300,
 

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

                 formatItem: function(row, i, max, value) {
                     return row[1] + " (" + row[2] + ")";
                 },
                 formatItem: function(row, i, max, value) {
                     return row[1] + " (" + row[2] + ")";
                 },


@@ -83,20 +73,20 @@
         }
         window.addEventListener('beforeunload', beforeUnload, true);
 
         }
         window.addEventListener('beforeunload', beforeUnload, true);
 

-        var related_questions_url = "{% url related_questions %}";
+        var related_questions_url = '{% url "related_questions" %}';

         </script>
         <script src="{% media "/media/js/osqa.ask.js" %}" type="text/javascript"></script>
 {% endblock %}
 
 {% block content %}
 <div id="main-bar" class="headNormal">
         </script>
         <script src="{% media "/media/js/osqa.ask.js" %}" type="text/javascript"></script>
 {% 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">
         <form id="fmask" action="" method="post" accept-charset="utf-8">
             {% csrf_token %}
 </div>
 <div id="main-body" class="ask-body">
     <div id="askform">
         <form id="fmask" action="" method="post" accept-charset="utf-8">
             {% csrf_token %}

-                       {% if not request.user.is_authenticated %}
+            {% if not request.user.is_authenticated %}

             <div class="message">
                 <span class="strong big">{% trans "You are welcome to start submitting your question anonymously." %}</span>
                 <p>{% blocktrans %}
             <div class="message">
                 <span class="strong big">{% trans "You are welcome to start submitting your question anonymously." %}</span>
                 <p>{% blocktrans %}


@@ -109,10 +99,10 @@
                 {% 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 %}
                 {% 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>
+                        <a href="{% url "send_validation_email" %}">{% trans "Send me a validation link." %}</a>

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

-                       {% 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 }}