diff options
| -rw-r--r-- | askbot/deps/livesettings/views.py | 4 | ||||
| -rw-r--r-- | askbot/skins/default/templates/questions.html | 52 |
2 files changed, 52 insertions, 4 deletions
diff --git a/askbot/deps/livesettings/views.py b/askbot/deps/livesettings/views.py index 000a7bbd..bfc59d85 100644 --- a/askbot/deps/livesettings/views.py +++ b/askbot/deps/livesettings/views.py @@ -10,7 +10,7 @@ import logging log = logging.getLogger('configuration.views') -def group_settings(request, group, template='askbot.deps.livesettings/group_settings.html'): +def group_settings(request, group, template='livesettings/group_settings.html'): # Determine what set of settings this editor is used for use_db, overrides = get_overrides(); @@ -62,7 +62,7 @@ def site_settings(request): mgr = ConfigurationSettings() default_group= mgr.groups()[0].key return HttpResponseRedirect(reverse('group_settings', args=[default_group])) - #return group_settings(request, group=None, template='askbot.deps.livesettings/site_settings.html') + #return group_settings(request, group=None, template='livesettings/site_settings.html') def export_as_python(request): """Export site settings as a dictionary of dictionaries""" diff --git a/askbot/skins/default/templates/questions.html b/askbot/skins/default/templates/questions.html index 4db8cca8..a0a5265b 100644 --- a/askbot/skins/default/templates/questions.html +++ b/askbot/skins/default/templates/questions.html @@ -174,13 +174,61 @@ {% endif %} <div id="listA"> {% get_current_language as LANGUAGE_CODE %} -{% cache 600 questions search_tags scope sort query context.page context.page_size LANGUAGE_CODE %} +{% cache 0 questions search_tags scope sort query context.page context.page_size LANGUAGE_CODE %} {% comment %} {% include "question_list.html" %} {% endcomment %} {% for question in questions.object_list %} <div class="short-summary"> - {% question_counter_widget question %} + <div class="counts"> + <div class="votes" + style="background:{{settings.COLORS_VOTE_COUNTER_MIN_BG}};color:{{settings.COLORS_VOTE_COUNTER_MIN_FG}}" + title="{% trans "Please decide if you like this question or not by voting" %}"> + {% spaceless %} + <div class="item-count"> + {{question.score|humanize_counter}} + </div> + <div> + {% blocktrans count question.score as cnt %} + vote + {% plural %} + votes + {% endblocktrans %} + </div> + {% endspaceless %} + </div > + {% comment %} + <div {% if question.answer_accepted %}title="{% trans "this answer has been accepted to be correct" %}"{% endif %} class="status {% if question.answer_accepted %}answered-accepted{% endif %} {% ifequal question.answer_count 0 %}unanswered{% endifequal %}{% ifnotequal question.answer_count 0 %}answered{% endifnotequal %}"> + {% endcomment %} + {% if question.answer_accepted %} + <div class="votes" style="background:{{settings.COLORS_ANSWER_COUNTER_ACCEPTED_BG}};color:{{settings.COLORS_ANSWER_COUNTER_ACCEPTED_FG}}"> + {% else %} + <div class="votes" style="background:{{settings.COLORS_ANSWER_COUNTER_MIN_BG}};color:{{settings.COLORS_ANSWER_COUNTER_MIN_FG}}"> + {% endif %} + <div class="item-count">{{question.answer_count|humanize_counter}}</div> + {% spaceless %} + <div> + {% blocktrans count question.answer_count as cnt %} + answer + {% plural %} + answers + {% endblocktrans %} + </div> + {% endspaceless %} + </div> + <div class="views" style="background:{{settings.COLORS_VIEW_COUNTER_MIN_BG}};color:{{settings.COLORS_VIEW_COUNTER_MIN_FG}}"> + {% spaceless %} + <div class="item-count">{{question.view_count|humanize_counter}}</div> + <div> + {% blocktrans count question.view_count as cnt %} + view + {% plural %} + views + {% endblocktrans %} + </div> + {% endspaceless %} + </div> + </div> <h2><a title="{{question.summary}}" href="{% url question id=question.id %}{{question.title|slugify}}">{{question.title}}</a></h2> <div class="userinfo"> <span class="relativetime" title="{{question.last_activity_at}}">{% diff_date question.last_activity_at %}</span> |