Accepting incoming merge of the jambazov feature branch. Mostly includes new bug...

[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 4873d145f87d66083b2b0c597f2da866f3f29546..c6c4cdeb136b4b277aa96c8d62329b8b2036eea8 100644 (file)
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -11,7 +11,7 @@
 {% block metadescription %}{{ question.meta_description }}{% endblock %}\r
 {% block metakeywords %}{{question.tagname_meta_generator}}{% endblock %}\r
 {% block meta %}\r
 {% block metadescription %}{{ question.meta_description }}{% endblock %}\r
 {% block metakeywords %}{{question.tagname_meta_generator}}{% endblock %}\r
 {% block meta %}\r

-        <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url}}" />\r
+        <link rel="canonical" href="{{settings.APP_BASE_URL}}{{question.get_absolute_url}}" />\r

         <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ question.get_absolute_url }}?type=rss">\r
 {% endblock %}\r
 {% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}\r
         <link rel="alternate" type="application/rss+xml" title="RSS" href="{{ question.get_absolute_url }}?type=rss">\r
 {% endblock %}\r
 {% block title %}{% spaceless %}{{ question.headline }}{% endspaceless %}{% endblock %}\r


@@ -239,13 +239,13 @@
                         </table>  \r
                     </div>\r
                     {{ answer.text.errors }}\r
                         </table>  \r
                     </div>\r
                     {{ answer.text.errors }}\r

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

                 </div>\r
                 </div>\r

-                \r
-                   {% if answer.captcha %}\r
+\r
+                   {% if answer.recaptcha %}\r

                    <div class="question-captcha" style="float: left;">\r
                    <div class="question-captcha" style="float: left;">\r

-                       {{ answer.captcha.errors }}\r
-                       {{ answer.captcha }}\r
+                       {{ answer.recaptcha.errors }}\r
+                       {{ answer.recaptcha }}\r

                    </div>\r
                    <div class="clear"></div>\r
                    {% endif %}\r
                    </div>\r
                    <div class="clear"></div>\r
                    {% endif %}\r