Don't escape foldername too much

[squasher.git] / templates / index.tpl

diff --git a/templates/index.tpl b/templates/index.tpl
index 3e3407897ff9ba30c93f00854b4540e9591d7805..daa4691d92b7861293b8a112d90ff0a488043a38 100644 (file)
--- a/templates/index.tpl
+++ b/templates/index.tpl
@@ -46,7 +46,7 @@
 {block menu}
 <div class="menu">
        <div class="menuhead">current folder</div>
-       {foreach item=crumb key=cookie from=$base}<a href="?path={$cookie|escape:'url'}">{$crumb|escape}</a>{/foreach}
+       {foreach item=crumb key=cookie from=$base}<a href="?path={$cookie|escape:'urlpathinfo'}">{$crumb|escape}</a>{/foreach}
        {if $user_level > 99 AND count($base)>1 }
                <form name=rmdir method=post>
                <input type=hidden name=tools value=rmdir>
@@ -56,7 +56,7 @@
 </div>
 <div class="menu">
        <div class="menuhead">subfolders</div>
-       {foreach item=folder key=folderpath from=$subfolders}<a href="?path={$folderpath|escape:'url'}">{$folder|escape}</a>{/foreach}
+       {foreach item=folder key=folderpath from=$subfolders}<a href="?path={$folderpath|escape:'urlpathinfo'}">{$folder|escape}</a>{/foreach}
        {if $user_level > 99}
                <form name=mkdir method=post>
                <input type=hidden name=tools value=mkdir>
@@ -68,6 +68,28 @@
 {/block}
 
 {block content}
+
+{function nicesize size=0 totalsize=0}
+{if $size==$totalsize || !$totalsize}
+       {if $size > 1024*1024}
+       {math equation="x/1024/1024" x=$size format="%.2f"} MiB
+       {elseif $size > 1024}
+       {math equation="x/1024" x=$size format="%.2f"} KiB
+       {else}
+       {$size|escape} B
+       {/if}
+{else}
+       {if $totalsize > 1024*1024}
+       {math equation="x/1024/1024" x=$size format="%.2f"} / {math equation="x/1024/1024" x=$totalsize format="%.2f"} MiB
+       {elseif $size > 1024}
+       {math equation="x/1024" x=$size format="%.2f"} / {math equation="x/1024" x=$totalsize format="%.2f"} KiB
+       {else}
+       {$size|escape} / {$totalsize|escape} B
+       {/if}
+       ({math equation="pct*100" pct=$size/$totalsize format="%.0f"}%)
+{/if}
+{/function}
+
 {assign var=mass_delete_size value=count($squashed)}
 {foreach item=item key=id from=$squashed}
 {if $item.squashed}{*These items are in chunks / uploaded by the squasher tool*}
@@ -83,7 +105,7 @@
 
        <div class="added">added: {$item.date|escape}</div>
 
-       <div class="size">size:&nbsp;{if $item.size>(1024*1024)}{math equation="((x / 1024) / 1024) * (y / z)" x=$item.size y=$item.chunks_finished z=$item.chunks format="%.2f"}&nbsp;/&nbsp;{math equation="(x / 1024) / 1024" x=$item.size format="%.2f"}mb{elseif $item.size>(1024)}{math equation="(x / 1024) * (y / z)" x=$item.size y=$item.chunks_finished z=$item.chunks format="%.2f"}&nbsp;/&nbsp;{math equation="(x / 1024)" x=$item.size format="%.2f"}kb{else}{math equation="x * (y / z)" x=$item.size y=$item.chunks_finished z=$item.chunks format="%.0f"}&nbsp;/&nbsp;{$item.size|escape}b{/if}({math equation="(y / x) * 100" x=$item.chunks y=$item.chunks_finished format="%.0f"}%)</div>
+       <div class="size">size: {nicesize size=$item.size*$item.chunks_finished/$item.chunks totalsize=$item.size}</div>
 
        <div class="clear"></div>
 
@@ -118,7 +140,7 @@
 
        <div class="added">added: {$item.date|escape}</div>
 
-       <div class="size">size:&nbsp;{if $item.size>(1024*1024)}{math equation="(x / 1024) / 1024" x=$item.size format="%.2f"}mb{elseif $item.size>(1024)}{math equation="(x / 1024)" x=$item.size format="%.2f"}kb{else}{$item.size|escape}b{/if}</div>
+       <div class="size">size: {nicesize size=$item.size}</div>
 
        <div class="clear"></div>