diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-08-18 10:39:01 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-08-18 10:39:01 +0200 |
| commit | 9d4561febd0489eb8cab1fc3654614b1a5ed17ac (patch) | |
| tree | b83ce52d6ae533c17049720d8463cabdd71de3e9 /templates | |
| parent | 36dad4f8b67948daef92257cea362c5d772279e3 (diff) | |
use userdisplay for user display
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base.html | 3 | ||||
| -rw-r--r-- | templates/tree.html | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/templates/base.html b/templates/base.html index 5c4a1c3..110d7b8 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,3 +1,4 @@ +{% load userdisplay %} <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> <head> @@ -75,7 +76,7 @@ {% if user.is_authenticated %} <ul class="menubar"> <li> - <a href="#">{{profile.display_name}}</a> + <a href="#">{{user|userdisplay}}</a> <ul> <li><a href="/user/home">Dashboard</a></li> <li><a href="/accounts/logout">Logout</a></li> diff --git a/templates/tree.html b/templates/tree.html index 01969ab..78fc0e2 100644 --- a/templates/tree.html +++ b/templates/tree.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load userdisplay %} {% block js %} <script type="text/javascript"> $(function() { @@ -38,8 +39,8 @@ $(function() { <li id="left"> <ul id="sidemenu"> {% if user.is_authenticated %} - <li><a class="gravatar" href="#" title="{{profile.email}}"></a></li> - <li><a href="/user/home"><span class="ui-icon ui-icon-home"></span>{{profile.display_name}}</a></li> + <li><a class="gravatar" href="#" title="{{user.email}}"></a></li> + <li><a href="/user/home"><span class="ui-icon ui-icon-home"></span>{{user|userdisplay}}</a></li> {% endif %} <li style="border-top: 1px solid black; width: 100%; margin-top: 5px;"> </li> {% if name %} |