converted Google Analytics code to use asynchronous tracking

[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 37e5fe3f76bb18632cfa07c0991e0bae8c8e9c2f..466df6a4907242f0c6ccf04f83bf3b5125794f30 100644 (file)
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -213,8 +213,8 @@
                         \r
                         </table>  \r
                     </div>\r
                         \r
                         </table>  \r
                     </div>\r

-                    <div id="previewer" class="wmd-preview"></div>\r

                     {{ answer.text.errors }}\r
                     {{ answer.text.errors }}\r

+                    <div id="previewer" class="wmd-preview"></div>                    \r

                 </div>\r
                 <p><span class="form-error"></span></p>\r
                 <input type="submit" \r
                 </div>\r
                 <p><span class="form-error"></span></p>\r
                 <input type="submit" \r


@@ -235,17 +235,17 @@
 {% endblock %}\r
 \r
 {% block sidebar %}\r
 {% endblock %}\r
 \r
 {% block sidebar %}\r

-{% sidebar_upper %}\r

 <div class="boxC" id="subscription_box">\r
     {% include "subscription_status.html" %}\r
 </div>\r
 <div class="boxC" id="subscription_box">\r
     {% include "subscription_status.html" %}\r
 </div>\r

+{% sidebar_upper %}\r

 {% cache 60 questions_tags settings.APP_URL question.id %}\r
 <div class="boxC">\r
     <p>\r
                {% trans "Question tags" %}:\r
     </p>\r
     <p class="tags" >\r
 {% cache 60 questions_tags settings.APP_URL question.id %}\r
 <div class="boxC">\r
     <p>\r
                {% trans "Question tags" %}:\r
     </p>\r
     <p class="tags" >\r

-        {% for tag in tags %}\r
+        {% for tag in question.tags.all %}\r

                <a href="{% url tag_questions tag.name|urlencode %}" \r
                        title="{% trans "see questions tagged"%}'{{tag.name}}'{% trans "using tags" %}" \r
                        rel="tag">{{ tag.name }}</a> <span class="tag-number">&#215;{{ tag.used_count|intcomma }}</span><br/>\r
                <a href="{% url tag_questions tag.name|urlencode %}" \r
                        title="{% trans "see questions tagged"%}'{{tag.name}}'{% trans "using tags" %}" \r
                        rel="tag">{{ tag.name }}</a> <span class="tag-number">&#215;{{ tag.used_count|intcomma }}</span><br/>\r