From 8ed508fd5f7a9d633756b8afa44019552badba6e Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 31 Mar 2015 07:26:58 +0000
Subject: [PATCH] Improvment displaying of the file size for attached files

git-svn-id: https://svn.libreccm.org/ccm/trunk@3293 8810af33-2d31-482b-a856-94f89814c4df
---
 .../content-items/assets/file-attachments.xsl | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/file-attachments.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/file-attachments.xsl
index 704bd5461..7735afe7b 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/file-attachments.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/assets/file-attachments.xsl
@@ -106,18 +106,31 @@
     <xsl:template match="file-attachment//file-size">
         <xsl:param name="file-size" as="xs:integer" tunnel="yes"/>
         
+        <xsl:variable name="format" 
+                      select="if(./@format)
+                              then ./@format
+                              else '0.00'"/>
+        
         <xsl:choose>
             <xsl:when test="./@unit = 'MB'">
-                <xsl:value-of select="concat($file-size div 1000000, ' MB')"/>
+                <xsl:value-of select="concat(format-number($file-size div 1000000, 
+                                                           $format), 
+                                                           ' MB')"/>
             </xsl:when>
             <xsl:when test="./@unit = 'kB'">
-                <xsl:value-of select="concat($file-size div 1000, ' kB')"/>
+                <xsl:value-of select="concat(format-number($file-size div 1000, 
+                                                           $format), 
+                                                           ' kB')"/>
             </xsl:when>
             <xsl:when test="./@unit = 'KiB'">
-                <xsl:value-of select="concat($file-size div 1024, ' KiB')"/>
+                <xsl:value-of select="concat(format-number($file-size div 1024, 
+                                                           $format), 
+                                                           ' KiB')"/>
             </xsl:when>
             <xsl:when test="./@unit = 'MiB'">
-                <xsl:value-of select="concat($file-size div  1048576, ' MiB')"/>
+                <xsl:value-of select="concat(format-number($file-size div  1048576, 
+                                                           $format), 
+                                                           ' MiB')"/>
             </xsl:when>
             <xsl:otherwise>
                 <xsl:value-of select="concat ($file-size, ' bytes')"/>