seba
/
k4ever
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of someserver.de:k4ever 

Conflicts:
	k4ever/k4ever.db
This commit is contained in:
seba 2010-12-01 23:57:01 +01:00
parent 60fe5ca2d2 3bfcd4ead7
commit 6206ef90b5
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
k4ever/k4ever.db
View File

Binary file not shown.

2
k4ever/main/templates/base.html
View File

@ -17,7 +17,7 @@
<h1>Kasse</h1> <h1>Kasse</h1>
{% if user.is_authenticated %} {% if user.is_authenticated %}
{% include "main/navigation-login.html" %} {% include "main/navigation-login.html" %}
<span class="balance">Kontostand: {{ user.get_profile.balance }} €</span> <span class="balance">Kontostand: {{ user.get_profile.balance|floatformat:2 }} €</span>
{% else %} {% else %}
{% include "main/navigation.html" %} {% include "main/navigation.html" %}
{% endif %} {% endif %}