Show current disk use and quota in MiB

diff --git a/quota.mlt b/quota.mlt
index f99441a..281933a 100644 (file)
--- a/quota.mlt
+++ b/quota.mlt
@@ -144,9 +144,9 @@ elseif $"mod" <> "" then
 <form method="post">
 
 <table>
-<tr> <th>Volume</th> <th>Used (kB)</th> <th>Quota now (kB)</th> <th>Requested quota (kB)</th> </tr>
+  <tr> <th>Volume</th> <th>Used</th> <th>Current Quota</th> <th>Requested Quota (kB)</th> </tr>
 <% foreach vol in Quotas.getQuotas (Init.getUserName ()) do %>
-   <tr> <td><% #vol vol %></td> <td><% #used vol %></td> <td><% #quota vol %></td>
+   <tr> <td><% #vol vol %></td> <td><% #used vol %> kB (<% (#used vol) / 1024 %> MiB)</td> <td><% #quota vol %> kB (<% (# quota vol) / 1024 %> MiB)</td>
    <td><input name="<% #vol vol %>" value="<% #quota vol %>"></td> </tr>
 <% end %>
 </table>

diff --git a/quotas.mlt b/quotas.mlt
index 5f841bf..eb9e743 100644 (file)
--- a/quotas.mlt
+++ b/quotas.mlt
@@ -1,11 +1,10 @@
 <% @header [("title", ["Disk usage stats"])] %>
 
-<table>
-<tr> <td align="right"><b>User</b></td> <td><b>kB used</b></td> </tr>
-<tr><td>&nbsp;</td></tr>
+<table class="data">
+<tr> <td style="text-align: right"><b>Member</b></td> <td><b>Space Used (kB)</b></td> </tr>
 
 <% foreach du in Stats.getDiskUsage () do %>
-       <tr><td align="right"><%
+       <tr><td style="text-align: right"><%
        val id = Init.userNameToId (#uname du);
        switch id of
                  SOME id => %><a href="user?id=<% id %>"><%
@@ -14,7 +13,7 @@
        switch id of
                  SOME id => %></a><%
        end
-%></td> <td><% #kbs du %></td> </tr>
+%></td> <td style="text-align: right"><% #kbs du %></td> </tr>
 <% end %>
 
 </table>