diff options
author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-10-17 12:28:53 -0600 |
---|---|---|
committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-10-17 12:28:53 -0600 |
commit | 2ccd4b776a478b4e80d148bd1f3d3a8c83cda2b6 (patch) | |
tree | 06199b13f27f8a80b840264f9e84567510c124bb /templates/user_stats.html | |
parent | 3f42d059adaa0ae6813dc32a10e32b8ddd99d31e (diff) | |
parent | 5d7cc5c76655e504cf79832acc418d994104c40b (diff) | |
download | askbot-2ccd4b776a478b4e80d148bd1f3d3a8c83cda2b6.tar.gz askbot-2ccd4b776a478b4e80d148bd1f3d3a8c83cda2b6.tar.bz2 askbot-2ccd4b776a478b4e80d148bd1f3d3a8c83cda2b6.zip |
Merge branch 'master' of git://github.com/cnprog/CNPROG into chinito/master
Conflicts:
templates/user_stats.html
Diffstat (limited to 'templates/user_stats.html')
-rw-r--r-- | templates/user_stats.html | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/templates/user_stats.html b/templates/user_stats.html index bc49222f..b9c33e9f 100644 --- a/templates/user_stats.html +++ b/templates/user_stats.html @@ -22,12 +22,8 @@ </span> </a> <div class="answer-link"> - <a href="{% url question answered_question.id %}{{answered_question.title|slugify}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> - {% if answered_question.comment_count %} - <span> - {% blocktrans with answered_question.comment_count as comment_count %}the answer has been commented {{ comment_count }} times{% endblocktrans %} - </span> - {% endif %} + <a href="/questions/{{answered_question.id}}/{{answered_question.title}}#{{answered_question.answer_id}}">{{answered_question.title}}</a> {% if answered_question.comment_count %}<span + title="{% blocktrans with answered_question.comment_count as count %}the answer has been commented {{count}} times{% endblocktrans %}">({{answered_question.comment_count}})</span>{% endif %} </div> </div> {% endfor %} |