diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2014-09-03 22:54:18 +0700 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2014-09-03 22:54:18 +0700 |
| commit | 8981aa8ca09ca575cb9a4b92fc89a4e49e3288b9 (patch) | |
| tree | 4660ef07c2c49b5a99ca6965fc221cbe0b32e596 | |
| parent | db27ed730000516b98edc3df149abe129dab6dcc (diff) | |
| download | askbot-8981aa8ca09ca575cb9a4b92fc89a4e49e3288b9.tar.gz askbot-8981aa8ca09ca575cb9a4b92fc89a4e49e3288b9.tar.bz2 askbot-8981aa8ca09ca575cb9a4b92fc89a4e49e3288b9.zip | |
restore karma and badges display in user cards on Q&A content
| -rw-r--r-- | askbot/templates/macros.html | 4 | ||||
| -rw-r--r-- | askbot/templates/widgets/user_card.html | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/askbot/templates/macros.html b/askbot/templates/macros.html index 19aab815..5647d8d6 100644 --- a/askbot/templates/macros.html +++ b/askbot/templates/macros.html @@ -57,7 +57,7 @@ <img alt="{% trans %}anonymous user{% endtrans %}" src="{{ '/images/anon.png'|media }} " class="gravatar" width="32" height="32" /> <p>{{ revision.author.get_anonymous_name() }}</p> {% else %} - {{ user_card(revision.author, karma_mode=karma_mode, badges_mode=badges_mode) }} + {{ user_card(revision.author) }} {% endif %} {% if settings.GROUPS_ENABLED %} {{ user_primary_group(revision.author) }} @@ -626,7 +626,7 @@ for the purposes of the AJAX comment editor #} {{ user_country_name_and_flag(user) }} {%- endmacro -%} -{% macro user_card(user, karma_mode=None, badges_mode=None) %} +{% macro user_card(user) %} {% include "widgets/user_card.html" %} {% endmacro %} diff --git a/askbot/templates/widgets/user_card.html b/askbot/templates/widgets/user_card.html index af8555c0..04c66d99 100644 --- a/askbot/templates/widgets/user_card.html +++ b/askbot/templates/widgets/user_card.html @@ -11,11 +11,11 @@ <br/> - {% if karma_mode == 'public' %} + {% if settings.KARMA_MODE == 'public' %} <span class="reputation-score">{{ user.reputation }}</span> {% endif %} - {% if badges_mode == 'public' %} + {% if settings.BADGES_MODE == 'public' %} <span class="badges" title="{{ user.get_badge_summary() }}"> {% if user.gold %} <span class='badge1'>●</span><span class="badgecount">{{ user.gold }}</span> |