Merge remote branch 'origin/master'

This commit is contained in:
Roberto Rosario
2011-02-07 18:18:31 -04:00
5 changed files with 66 additions and 32 deletions
+4 -2
View File
@@ -28,8 +28,10 @@
{% if user.is_anonymous %}
{% trans 'Anonymous' %}
{% else %}
{{ user }}
<a href="{% url password_change_view %}">({% trans 'New password' %})</a>
{{ user.get_full_name|default:user }}
{% if user.has_usable_password %}
<a href="{% url password_change_view %}">({% trans 'New password' %})</a>
{% endif %}
{% endif %}
</li>
{% if user.is_staff %}