diff options
author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:12:05 -0600 |
---|---|---|
committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:12:05 -0600 |
commit | 8de2b9131ddcef647799cf8e1e79921284523073 (patch) | |
tree | 81e17d84530990e35a0accba3a7886266a601482 /templates/unanswered.html | |
parent | 7e95e6481d1e81e43d4b442cbcf3fe37f20d89cc (diff) | |
parent | 9d1fb9890b97beb55461ca34f9757bc685461130 (diff) | |
download | askbot-8de2b9131ddcef647799cf8e1e79921284523073.tar.gz askbot-8de2b9131ddcef647799cf8e1e79921284523073.tar.bz2 askbot-8de2b9131ddcef647799cf8e1e79921284523073.zip |
Merge branch 'evgenyfadeev/master'
Conflicts:
.gitignore
INSTALL
TODO
cnprog.wsgi
django_authopenid/urls.py
django_authopenid/views.py
drop-all-tables.sh
forum/auth.py
forum/managers.py
forum/models.py
forum/templatetags/extra_tags.py
forum/views.py
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
settings.py
settings_local.py.dist
sql_scripts/update_2009_01_25_001.sql
sql_scripts/update_2009_02_26_001.sql
sql_scripts/update_2009_04_10_001.sql
templates/authopenid/confirm_email.txt
templates/authopenid/sendpw_email.txt
templates/content/js/compress.bat
templates/content/js/flot-build.bat
templates/content/style/style.css
templates/footer.html
templates/question.html
templates/user_reputation.html
templates/user_stats.html
templates/user_votes.html
templates/users_questions.html
urls.py
Diffstat (limited to 'templates/unanswered.html')
-rw-r--r-- | templates/unanswered.html | 66 |
1 files changed, 41 insertions, 25 deletions
diff --git a/templates/unanswered.html b/templates/unanswered.html index a56d3ae3..80a23631 100644 --- a/templates/unanswered.html +++ b/templates/unanswered.html @@ -4,6 +4,7 @@ {% load i18n %} {% load humanize %} {% load extra_filters %} +{% load smart_if %} {% block title %}{% spaceless %}{% trans "Unanswered questions" %}{% endspaceless %}{% endblock %} {% block forejs %} <script type="text/javascript"> @@ -17,65 +18,82 @@ <div class="tabBar"> <span class="headQuestions">{% trans "Unanswered questions" %}</span> <div class="tabsA"> - <a id="latest" href="?sort=latest" class="on" title="{% trans "most recently asked questions" %}">{% trans "newest" %}</a> + <a id="latest" href="{% url unanswered %}?sort=latest" class="on" title="{% trans "most recently asked questions" %}">{% trans "newest" %}</a> </div> </div> - <div id="listA"> {% for question in questions.object_list %} <div class="qstA"> - <h2><a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a></h2> + <h2> + <a href="{{ question.get_absolute_url }}">{{ question.get_question_title }}</a> + </h2> <div class="stat"> <table> - <tr> + <tr> <td><span class="num">{{ question.answer_count|intcomma }}</span> </td> <td><span class="num">{{ question.score|intcomma }}</span> </td> <td><span class="num">{{ question.view_count|cnprog_intword|safe }}</span> </td> - </tr> + </tr> <tr> <td><span class="unit">{% trans "answers" %}</span></td> <td><span class="unit">{% trans "votes" %}</span></td> <td><span class="unit">{% trans "views" %}</span></td> - </tr> + </tr> </table> </div> + <div class="summary"> {{ question.summary }}... </div> - + {% ifequal tab_id 'active'%} - {% if question.wiki %} + {% if question.wiki and settings.WIKI_ON %} <span class="from wiki">{% trans "community wiki" %}</span> <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span> {% else %} <div class="from"> - {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %} + {% comment %}{% gravatar question.last_activity_by 24 %}{% endcomment %} <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span> <span class="score">{% get_score_badge question.last_activity_by %} </span> <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span> </div> {% endif %} {% else %} - {% if question.wiki %} + {% if question.wiki and settings.WIKI_ON %} <span class="from wiki">{% trans "community wiki" %}</span> <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span> {% else %} <div class="from"> - {% comment %}{% gravatar question.author 24 %}{% endcomment %} - <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span> - <span class="score">{% get_score_badge question.author %} </span> - <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span> + {% comment %}{% gravatar question.author 24 %}{% endcomment %} + {% if question.last_activity_at != question.added_at %} + {% if question.author.id != question.last_activity_by.id %} + {% trans "Posted:" %} + <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span> + <span class="score">{% get_score_badge question.author %} </span> + / {% trans "Updated:" %} + <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span> + <span class="score">{% get_score_badge question.last_activity_by %} </span> + <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span> + {% else %} + {% trans "Updated:" %} + <span class="author"><a href="{{ question.last_activity_by.get_profile_url }}">{{ question.last_activity_by }}</a></span> + <span class="score">{% get_score_badge question.last_activity_by %} </span> + <span class="date" title="{{ question.last_activity_at }}">{% diff_date question.last_activity_at %}</span> + {% endif %} + {% else %} + {% trans "Posted:" %} + <span class="author"><a href="{{ question.author.get_profile_url }}">{{ question.author }}</a></span> + <span class="score">{% get_score_badge question.author %} </span> + <span class="date" title="{{ question.added_at }}">{% diff_date question.added_at %}</span> + {% endif %} </div> {% endif %} {% endifequal %} <div class="tags"> - {% for tag in question.tagname_list %} - <a href="{% url forum.views.tag tag|urlencode %}" - title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" - rel="tag">{{ tag }} - </a> - {% endfor %} + {% for tag in question.tagname_list %} + <a href="{% url forum.views.tag tag|urlencode %}" title="{% trans "see questions tagged" %}'{{ tag }}'{% trans "using tags" %}" rel="tag">{{ tag }}</a> + {% endfor %} </div> </div> {% endfor %} @@ -93,10 +111,8 @@ {% block sidebar %} <div class="boxC"> - <p> - {% blocktrans with questions_count|intcomma as num_q %}have {{num_q}} unanswered questions{% endblocktrans %} - <!---<p>问题按 <strong>问题创建时间</strong> 排序。最新加入的问题将显示在最前面。</p>--> - </p> + {% blocktrans with questions_count|intcomma as num_q %}have {{num_q}} unanswered questions{% endblocktrans %} + <!---<p>问题按 <strong>问题创建时间</strong> 排序。最新加入的问题将显示在最前面。</p>--> </div> <div class="boxC"> <h3 class="subtitle">{% trans "Related tags" %}</h3> @@ -104,7 +120,7 @@ <div class="tags"> {% for tag in tags %} <a rel="tag" title="{% trans "see questions tagged"%}'{{ tag.name }}'{% trans "using tags" %}" href="{% url forum.views.tag tag.name|urlencode %}">{{ tag.name }}</a> - <span class="tag-number"> ✕ {{ tag.used_count|intcomma }}</span> + <span class="tag-number"> × {{ tag.used_count|intcomma }}</span> <br/> {% endfor %} <br/> |