diff options
author | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-11 02:07:44 -0300 |
---|---|---|
committer | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-11 02:07:44 -0300 |
commit | 3ba8dcf1da127053636b5e4c78eb6e4e523e5aba (patch) | |
tree | b8d7deb8f9e245f8b5f8330860f867803a0e74dd /templates/index.html | |
parent | 306b82e6ef376fd3362dde41e3853dcf5688106d (diff) | |
parent | 1eacc7a42618e84766477fbcc2c32a1da3547115 (diff) | |
download | askbot-3ba8dcf1da127053636b5e4c78eb6e4e523e5aba.tar.gz askbot-3ba8dcf1da127053636b5e4c78eb6e4e523e5aba.tar.bz2 askbot-3ba8dcf1da127053636b5e4c78eb6e4e523e5aba.zip |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG
Conflicts:
forum/views.py
locale/es/LC_MESSAGES/django.mo
settings_local.py
templates/answer_edit_tips.html
templates/book.html
templates/header.html
templates/index.html
templates/question_edit_tips.html
templates/user_stats.html
templates/user_tabs.html
templates/users_questions.html
Diffstat (limited to 'templates/index.html')
-rw-r--r-- | templates/index.html | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/templates/index.html b/templates/index.html index 239b0ff4..b358c384 100644 --- a/templates/index.html +++ b/templates/index.html @@ -32,7 +32,7 @@ {% for question in questions %} <div class="qstA"> <h2> - <a href="{{ question.get_absolute_url }}" title="{{ question.summary }}..."> + <a href="{{ question.get_absolute_url }}" title="{{ question.summary|collapse }}..."> {{ question.get_question_title }} </a> </h2> @@ -51,7 +51,7 @@ </table> </div> <div class="summary"> - {{ question.summary }}... + {{ question.summary}}... </div> {% if question.wiki %} <span class="from wiki">{% trans "community wiki" %}</span> @@ -88,7 +88,7 @@ <div class="boxB"> <h3>{% trans "Recent tags" %}</h3> <div class="body"> - <p class="tagsbox"> + <div class="tags"> {% for tag in tags %} <a rel="tag" title="{% blocktrans with tag.name as tagname %}see questions tagged '{{tagname}}'{% endblocktrans %}" href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a> @@ -97,6 +97,7 @@ <div class="more"><a href="{% url tags %}">{% trans "popular tags" %} »</a> </div> </div> </div> +{% if awards %} <div class="boxB"> <h3>{% trans "Recent awards" %}</h3> <div class="body"> @@ -112,6 +113,7 @@ <div class="more"><a href="{% url badges %}">{% trans "all awards" %} »</a> </div> </div> </div> +{% endif %} <div id="feeds"> <a href="/feeds/rss" title="{% trans "subscribe to last 30 questions by RSS" %}">{% trans "subscribe to the questions feed" %}</a> </div> |