Merge pull request #2 from udacity/update_django

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

diff --git a/forum/skins/default/templates/feedback.html b/forum/skins/default/templates/feedback.html
index f4a4781a9374a4f047be2254347c7615f8ff9e25..ce51d02131c4b745119438421c14e702bf1b4a06 100644 (file)
--- a/forum/skins/default/templates/feedback.html
+++ b/forum/skins/default/templates/feedback.html
@@ -11,7 +11,7 @@
 {% trans "Give us your feedback!" %}
 </div>
 <div class="content">
-    <form method="post" action="{% url feedback %}" accept-charset="utf-8">
+    <form method="post" action="{% url "feedback" %}" accept-charset="utf-8">
         {% csrf_token %}
         {% if user.is_authenticated %}
             <p class="message">
@@ -27,24 +27,40 @@
             Please type and send us your message below.
             {% endblocktrans %}
             </p>
-            <div class="form-row"><label>{{form.name.label}}</label><br/>{{form.name}}</div>
+            <div class="form-row"><label for="id_name">{{form.name.label}}</label><br/>{{form.name}}</div>
             <div class="form-row">
-                <label>{{form.email.label}} 
+                <label for="id_email">{{form.email.label}}
                     {% if form.errors.email %}
-                        <span class='red'>(please enter a valid email)</span>
+                        <strong>(please enter a valid email)</strong>
                     {% endif %}
                 </label><br/>{{form.email}}
             </div>
         {% endif %}
         <div class="form-row">
-            <label>{{form.message.label}}
+            <label for="id_message">{{form.message.label}}
             {% if form.errors.message %}
-            <span class="red">{% trans "(this field is required)" %}</span>
-            </label>
+            <strong>{% trans "(this field is required)" %}</strong>
             {% endif %}
+            </label>
             <br/>
             {{form.message}}
         </div>
+
+        {% if form.recaptcha %}
+        <div class="form-row">
+            <label for="recaptcha_response_field">Are you a human?
+            {% if form.errors.recaptcha %}
+            <strong>{% trans "(wrong captcha)" %}</strong>
+            {% endif %}
+            </label>
+            <br/>
+            <div style="float: left;">
+            {{ form.recaptcha }}
+            </div>
+            <div class="clear"></div>
+        </div>
+        {% endif %}
+
         {{form.next}}
         <div class="submit-row">
             <input type="submit" class="submit" value="{% trans "Send Feedback" %}"/>