join: update library paths, install to new location

[hcoop/portal.git] / quota.mlt

diff --git a/quota.mlt b/quota.mlt
index a10311c..f99441a 100644 (file)
--- 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>
@@ -141,6 +139,8 @@ elseif $"mod" <> "" then
 
 <h3>Request a disk quota change</h3>
 
+<p>Remember that a high quota does not by itself use up any resources.  Quotas are solely a check on unintentional overusage.  We don't yet have any concrete policies to charge members based on disk usage, and, if we do implement such policies, you'll be charged only on actual disk usage, not quota.</p>
+
 <form method="post">
 
 <table>