X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/7142b5ffe2992a172fc0627445b286c66c6f204e..80f9b0badde3924575c4097bf914afef3fce72e7:/forum/skins/default/templates/question.html

diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index 7fdbafb..2172da9 100644
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -11,16 +11,23 @@
 {% block metadescription %}{{ question.meta_description }}{% endblock %}
 {% block metakeywords %}{{question.tagname_meta_generator}}{% endblock %}
 {% block meta %}
-        <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}" />
+        <link rel="canonical" href="{{settings.APP_BASE_URL}}{{question.get_absolute_url}}" />
         <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ question.get_absolute_url }}?type=rss">
 {% endblock %}
 {% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}
 {% block forejs %}
         {% if not question.nis.closed %}
         <script type='text/javascript' src='{% media  "/media/js/osqa.question.js" %}'></script>
+        <script type='text/javascript' src='{% media  "/media/js/jquery.caret.js" %}'></script>
         <script type='text/javascript' src='{% media  "/media/js/wmd/showdown.js" %}'></script>
         <script type='text/javascript' src='{% media  "/media/js/wmd/wmd.js" %}'></script>
         <link rel="stylesheet" type="text/css" href="{% media  "/media/js/wmd/wmd.css" %}" />
+
+        {% if embed_youtube_videos %}
+        <script type='text/javascript' src='{% media  "/media/js/viewbox_min.js" %}'></script>
+        <script type='text/javascript' src='{% media  "/media/js/youtube.js" %}'></script>
+        <link rel="stylesheet" type="text/css" href="{% media  "/media/js/viewbox.css" %}" />
+        {% endif %}
         {% endif %}
 
         <script type="text/javascript">
@@ -107,7 +114,7 @@
                             </div>
                             <div id="question-tags" class="tags-container tags">
                                 {% for tag in question.tagname_list %}
-                                    <a href="{% url tag_questions tag|urlencode %}" class="post-tag"
+                                    <a href="{% url tag_questions tag|urlencode %}" class="post-tag tag-link-{{ tag }}"
                                         title="{% blocktrans with tag as tagname %}see questions tagged '{{ tagname }}'{% endblocktrans %}" rel="tag">{{ tag }}</a>
                                 {% endfor %}
                             </div>
@@ -146,7 +153,7 @@
   
                 {% for answer in answers.paginator.page %}
                     <a name="{{ answer.id }}"></a>
-                    <div id="answer-container-{{ answer.id }}" class="answer {% post_classes answer %}">
+                    <div id="answer-container-{{ answer.id }}" class="answer {% post_classes answer %}{% ifequal answer.id focused_answer_id %} focusedAnswer{% endifequal %}">
                         <table style="width:100%;">
                             <tr>
                                 <td style="width:30px;vertical-align:top">
@@ -179,6 +186,7 @@
                 </div>
             {% endif %}
         <form id="fmanswer" action="{% url answer question.id %}" method="post">
+            {% csrf_token %}
             <div style="clear:both">
             </div>
             
@@ -239,8 +247,17 @@
                         </table>  
                     </div>
                     {{ answer.text.errors }}
-                    <div id="previewer" class="wmd-preview"></div>                    
+                    <div id="previewer" class="wmd-preview"></div>
                 </div>
+
+	            {% if answer.recaptcha %}
+	            <div class="question-captcha" style="float: left;">
+	            	{{ answer.recaptcha.errors }}
+	            	{{ answer.recaptcha }}
+	            </div>
+	            <div class="clear"></div>
+	            {% endif %}
+                
                 <p><span class="form-error"></span></p>
                 <input type="button"
                     {% if user.is_anonymous %}
@@ -275,8 +292,9 @@
     </p>
     <p class="tags" >
         {% for tag in question.tags.all %}
-        	<a href="{% url tag_questions tag.name|urlencode %}" 
-			title="{% trans "see questions tagged"%}'{{tag.name}}'{% trans "using tags" %}" 
+        	<a href="{% url tag_questions tag.name|urlencode %}"
+            class="tag-link-{{ tag.name }}"
+			title="{% trans "see questions tagged"%}'{{tag.name}}'{% trans "using tags" %}"
 			rel="tag">{{ tag.name }}</a> <span class="tag-number">&#215;{{ tag.used_count|intcomma }}</span><br/>
         {% endfor %}
     </p>