X-Git-Url: http://git.hcoop.net/hcoop/portal.git/blobdiff_plain/ddc53b567f705a72730b21c2e7f02faba478f80a..588a1662c076994dc4321f86da2619933b3a1e13:/quota.mlt

diff --git a/quota.mlt b/quota.mlt
index 64b99d8..2b80f1c 100644
--- a/quota.mlt
+++ b/quota.mlt
@@ -51,7 +51,7 @@ elseif $"cmd" = "open" then
 <br><hr><br>
 <table class="blanks">
 <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
-<tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
+<tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
 <tr> <td>Request:</td> <td><% Web.htmlNl (#data req) %></td> </tr>
 <tr> <td>Reason:</td> <td><% Web.html (#msg req) %></td> </tr>
 </table>
@@ -71,7 +71,7 @@ elseif $"cmd" = "list" then
 <br><hr><br>
 <table class="blanks">
 <tr> <td>By:</td> <td><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
-<tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
+<tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
 <tr> <td>Request:</td> <td><% Web.htmlNl (#data req) %></td> </tr>
 <tr> <td>Reason:</td> <td><% Web.html (#msg req) %></td> </tr>
 </table>
@@ -95,7 +95,7 @@ elseif $"mod" <> "" then
 <input type="hidden" name="save" value="<% id %>">
 <table class="blanks">
 <tr> <td>Requestor:</td> <td><a href="user?id=<% #usr req %>"><% #name user %></a></td> </tr>
-<tr> <td>Time:</td> <td><% #stamp req %></td> </tr>
+<tr> <td>Time:</td> <td><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
 <tr> <td>Status:</td> <td><select name="status">
 	<option value="0"<% if #status req = Quota.NEW then %> selected<% end %>>New</option>
 	<option value="1"<% if #status req = Quota.INSTALLED then %> selected<% end %>>Installed</option>
@@ -114,10 +114,8 @@ elseif $"mod" <> "" then
 	val oldStatus = #status req;
 	val newStatus = Quota.statusFromInt (Web.stoi ($"status"));
 	Quota.modify {req with data = $"req", msg = $"msg", status = newStatus};
-	if oldStatus <> newStatus then
-		if not (Quota.notifyMod (oldStatus, newStatus, Init.getUserName(), id)) then
-			%><h3>Error sending e-mail notification</h3><%
-		end
+	if not (Quota.notifyMod (oldStatus, newStatus, Init.getUserName(), id)) then
+		%><h3>Error sending e-mail notification</h3><%
 	end
 	%><h3>Request modified</h3>
 	Back to: <a href="?cmd=open">open requests</a>, <a href="?cmd=list">all requests</a>
@@ -146,10 +144,10 @@ 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>
-   <td><input name="<% #vol vol %>" value="<% #quota vol %>"></td> </tr>
+   <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 %>" pattern="\\d+"></td> </tr>
 <% end %>
 </table>