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/badges.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/badges.html')
| -rw-r--r-- | templates/badges.html | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/templates/badges.html b/templates/badges.html index 4a1ba091..1902a3b0 100644 --- a/templates/badges.html +++ b/templates/badges.html @@ -19,7 +19,9 @@ <div class="badges" id="main-body" style="width:100%"> <p> {% trans "Community gives you awards for your questions, answers and votes." %}<br/> - {% trans "Below is the list of available badges and number of times each type of badge has been awarded." %} + {% blocktrans %}Below is the list of available badges and number + of times each type of badge has been awarded. Give us feedback at {{feedback_faq_url}}. + {% endblocktrans %} </p> <div id="medalList"> {% for badge in badges %} @@ -32,7 +34,7 @@ {% endfor %} </div> <div style="float:left;width:180px;"> - <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">●</span> {{ badge.name }}</a><strong> ✕ {{ badge.awarded_count|intcomma }}</strong> + <a href="{{badge.get_absolute_url}}" title="{{ badge.get_type_display }} : {{ badge.description }}" class="medal"><span class="badge{{ badge.type }}">●</span> {{ badge.name }}</a><strong> × {{ badge.awarded_count|intcomma }}</strong> </div> <p style="float:left;width:350px;"> {{ badge.description }} |