diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-09-05 23:26:23 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-09-05 23:26:23 -0600 |
| commit | eb1cd2f220b1d75d4576920177b5dcb996ba6437 (patch) | |
| tree | 5ae096ad2872aa39c1726c8c08c6282cfff6f24e /templates | |
| parent | 0ec8ac06b3179fd5da2d925192e3703776323923 (diff) | |
| parent | 74d818c51c42ae0b3111462b201d25e29a2f1197 (diff) | |
| download | askbot-eb1cd2f220b1d75d4576920177b5dcb996ba6437.tar.gz askbot-eb1cd2f220b1d75d4576920177b5dcb996ba6437.tar.bz2 askbot-eb1cd2f220b1d75d4576920177b5dcb996ba6437.zip | |
Merge branch 'master' into experimental
Conflicts:
templates/question.html
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/question.html | 12 | ||||
| -rw-r--r-- | templates/user_reputation.html | 2 | ||||
| -rw-r--r-- | templates/user_votes.html | 4 | ||||
| -rw-r--r-- | templates/users_questions.html | 2 |
4 files changed, 5 insertions, 15 deletions
diff --git a/templates/question.html b/templates/question.html index a32d3613..ee45649d 100644 --- a/templates/question.html +++ b/templates/question.html @@ -240,8 +240,6 @@ </table> </div> - - </div> </td> @@ -415,14 +413,6 @@ </table> </div> - <div id="comment-{{ answer.id }}" class="post-comments" > - <input id="can-post-comments-answer-{{answer.id}}" type="hidden" value="{{ request.user|can_add_comments }}"/> - <a id="comments-link-answer-{{answer.id}}" class="comments-link"> - {% if answer.comment_count %}{% trans "comments" %} - <strong>({{answer.comment_count}})</strong>{% else %}{% trans "add comment" %}{% endif %}</a> - <div id="comments-answer-{{answer.id}}" class="comments-container"> - <div class="comments"/></div> - </div> </div> @@ -508,7 +498,7 @@ <div class="questions-related"> {% for question in similar_questions %} <p> - <a href="{% url questions %}{{question.id}}/{{ question.get_question_title }}">{{ question.get_question_title }}</a> + <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a> </p> {% endfor %} </div> diff --git a/templates/user_reputation.html b/templates/user_reputation.html index 270bb37d..5b0e542b 100644 --- a/templates/user_reputation.html +++ b/templates/user_reputation.html @@ -33,7 +33,7 @@ <div style="float:left;width:20px;color:red">{{ rep.negative }}</div> </div> - <a href="{% url questions %}{{ rep.question_id }}/{{ rep.title }}">{{ rep.title }}</a> <span class="small">({{ rep.reputed_at }})</span> + <a href="{% url questions %}{{ rep.question_id }}/{{ rep.title|slugify }}">{{ rep.title }}</a> <span class="small">({{ rep.reputed_at }})</span> </p> {% endfor %} </div> diff --git a/templates/user_votes.html b/templates/user_votes.html index 45134ac9..afe5827f 100644 --- a/templates/user_votes.html +++ b/templates/user_votes.html @@ -18,9 +18,9 @@ </div> <div style="float:left;overflow:hidden;width:750px"> {% ifequal vote.answer_id 0 %} - <span class="question-title-link"><a href="{% url questions %}{{ vote.question_id }}/{{ vote.title }}">{{ vote.title }}</a></span> + <span class="question-title-link"><a href="{% url questions %}{{ vote.question_id }}/{{ vote.title|slugify }}">{{ vote.title }}</a></span> {% else %} - <span class="answer-title-link" ><a href="{% url questions %}{{ vote.question_id }}/{{ vote.title }}#{{ vote.answer_id }}">{{ vote.title }}</a></span> + <span class="answer-title-link" ><a href="{% url questions %}{{ vote.question_id }}/{{ vote.title|slugify }}#{{ vote.answer_id }}">{{ vote.title }}</a></span> {% endifequal %} <div style="height:5px"></div> </div> diff --git a/templates/users_questions.html b/templates/users_questions.html index 551b2905..7a00d82d 100644 --- a/templates/users_questions.html +++ b/templates/users_questions.html @@ -45,7 +45,7 @@ </a> <div class="summary"> <h3> - <a title="{{question.summary}}" href="{{question.get_absolute_url}}">{{question.title}}</a> + <a title="{{question.summary}}" href="{% url question question.id%}{{question.title|slugify}}">{{question.title}}</a> </h3> <div class="tags"> {% convert2tagname_list question %} |