diff options
Diffstat (limited to 'forum/skins/default')
-rw-r--r-- | forum/skins/default/templates/badge.html | 4 | ||||
-rw-r--r-- | forum/skins/default/templates/base.html | 3 | ||||
-rw-r--r-- | forum/skins/default/templates/user.html | 6 | ||||
-rw-r--r-- | forum/skins/default/templates/user_recent.html | 3 |
4 files changed, 7 insertions, 9 deletions
diff --git a/forum/skins/default/templates/badge.html b/forum/skins/default/templates/badge.html index 12a12512..99d74e1b 100644 --- a/forum/skins/default/templates/badge.html +++ b/forum/skins/default/templates/badge.html @@ -1,4 +1,4 @@ -{% extends "base_content.html" %} +{% extends "base.html" %} <!-- template badge.html --> {% load i18n %} {% load extra_tags %} @@ -23,7 +23,7 @@ <div> {% if badge.awarded_count %} <p style="float:left"><span class="count">{{ awards|length|intcomma }}</span> - <strong>{% trans "The users have been awarded with badges:" %}</strong></p> + <strong>{% blocktrans count awards|length as num_awardees %}user received this badge:{% plural %}users received this badge:{% endblocktrans %}</strong></p> {% endif %} </div> <div id="award-list" style="clear:both;margin-left:20px;line-height:25px;"> diff --git a/forum/skins/default/templates/base.html b/forum/skins/default/templates/base.html index ed674fef..a4e4ceed 100644 --- a/forum/skins/default/templates/base.html +++ b/forum/skins/default/templates/base.html @@ -38,6 +38,7 @@ </script> {% endif %} {% if active_tab != "tags" and active_tab != "users" %} + {% comment %}start asking question with title from search query{% endcomment %} <script type="text/javascript"> $(document).ready(function(){ $('#nav_ask').click( @@ -50,6 +51,7 @@ ); }); </script> + {% comment %}focus input on the search bar{% endcomment %} <script type="text/javascript"> $(document).ready(function() { {% if active_tab != "ask" %} @@ -59,7 +61,6 @@ {% endif %} }); </script> - {% endif %} {% block forejs %} {% endblock %} diff --git a/forum/skins/default/templates/user.html b/forum/skins/default/templates/user.html index 8fd9e267..833c2058 100644 --- a/forum/skins/default/templates/user.html +++ b/forum/skins/default/templates/user.html @@ -18,11 +18,7 @@ <script type="text/javascript"> var viewUserID = {{view_user.id}}; $().ready(function(){ - {% ifequal view_user request.user%} - $("#nav_profile").attr('className',"on"); - {% else %} - $("#nav_users").attr('className',"on"); - {% endifequal %} + $("#nav_users").attr('className',"on"); }); </script> {% block userjs %} diff --git a/forum/skins/default/templates/user_recent.html b/forum/skins/default/templates/user_recent.html index 85957599..78347993 100644 --- a/forum/skins/default/templates/user_recent.html +++ b/forum/skins/default/templates/user_recent.html @@ -2,6 +2,7 @@ <!-- user_recent.html --> {% load extra_tags %} {% load humanize %} +{% load i18n %} {% block usercontent %} <div style="padding-top:5px;font-size:13px;"> {% for act in activities %} @@ -12,7 +13,7 @@ </div> <div style="float:left;overflow:hidden;"> {% ifequal act.type_id 7 %} - <a href="{{act.badge.get_absolute_url}}" title="{{ act.badge.get_type_display }} : {% act.badge.description %}" class="medal"><span class="badge{{ act.badge.type }}">●</span> {% trans act.badge.name %}</a> + <a href="{{act.badge.get_absolute_url}}" title="{{ act.badge.get_type_display }} : {% trans act.badge.description %}" class="medal"><span class="badge{{ act.badge.type }}">●</span> {% trans act.badge.name %}</a> {% else %} <span class="post-type-{{ act.type_id }}"><a href="{{ act.title_link }}">{{ act.title }}</a></span> {% if act.summary %}<span class="revision-summary">{{ act.summary }}</span>{% endif %} |