commit 7598cd7337480f9c495f50a59f2aa0b6345d2d80 Author: Olga Brani Date: Thu Jan 10 13:25:17 2013 +0200 Resource usage fixes diff --git a/snf-astakos-app/astakos/im/templates/im/resource_usage.html b/snf-astakos-app/astakos/im/templates/im/resource_usage.html index 4e738d2..fe02a75 100644 --- a/snf-astakos-app/astakos/im/templates/im/resource_usage.html +++ b/snf-astakos-app/astakos/im/templates/im/resource_usage.html @@ -21,10 +21,10 @@

{% if rdata.unit == 'bytes' %} - {{ rdata.currValue|sizeof_fmt }} + {{ rdata.currValue }} out of - {{ rdata.maxValue|sizeof_fmt }} + {{ rdata.maxValue }} {% else %} @@ -35,13 +35,8 @@ {{ rdata.maxValue }} {{ rdata.unit }} - {% endif %} - {% if rdata.is_abbreviation %} - {{ rdata.verbose_name|upper }} - {% else %} - {{ rdata.verbose_name }} - {% endif %} - {% if rdata.maxValue|floatformat:"0" != "1" and not rdata.unit %}s {% endif %} + {% endif %} + {% if rdata.is_abbreviation %}{{ rdata.verbose_name|upper }}{% else %}{{ rdata.verbose_name }}{% endif %}{% if rdata.maxValue|floatformat:"0" != "1" and not rdata.unit %}s {% endif %}