diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 20:28:49 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 20:28:49 -0500 |
| commit | 16e941c68ddb2d37d7e94d0c60da7e9d3dba65a0 (patch) | |
| tree | 0dc941580251a06870b9ceee159b7685c8a02795 /templates/devel | |
| parent | f9ae4f860ccf57e84032d7be9426331a9e06e979 (diff) | |
| parent | fbbcc8534a25d3e78ef3a319c8aeb127bc5085f0 (diff) | |
Merge tag 'release_2012-04-26'parabolaweb-2012-12-12
CSS and display related tweaks
Conflicts:
public/views.py
requirements.txt
requirements_prod.txt
templates/public/download.html
Diffstat (limited to 'templates/devel')
| -rw-r--r-- | templates/devel/clock.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/devel/clock.html b/templates/devel/clock.html index f906800a..0cad9d1b 100644 --- a/templates/devel/clock.html +++ b/templates/devel/clock.html @@ -32,7 +32,7 @@ <td><a href="mailto:{{ dev.email }}">{{ dev.get_full_name }}</a></td> <td>{{ dev.username }}</td> <td>{{ dev.userprofile.alias }}</td> - <td>{{ dev.userprofile.location }}</td> + <td>{% if dev.userprofile.country %}<img src="{{ dev.userprofile.country.flag }}" alt="{{ dev.userprofile.country.name }}"/> {% endif %}{{ dev.userprofile.location }}</td> <td>{{ dev.userprofile.time_zone }}</td> <td>{{ utc_now|timezone:dev.userprofile.time_zone|date:"Y-m-d H:i T" }}</td> </tr> |