X-Git-Url: https://git.hcoop.net/hcoop/portal.git/blobdiff_plain/15730af7bc8c0e3691da1a303b08a87b59b4d4c0..220735007a2888e918244b1e2aadfbfbcb18cb4c:/list.mlt

diff --git a/list.mlt b/list.mlt
index 9927b9a..5cd5ce5 100644
--- a/list.mlt
+++ b/list.mlt
@@ -22,17 +22,17 @@ 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>List name:</td> <td><% #data req %></td> </tr>
 <tr> <td>Reason:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
 </table>
 
 <% if admin then
-	val (user, dom) = MailingList.listWebHost (#data req) %>
+	val vitals = MailingList.listWebHost (#data req) %>
 	<br>
 	<a href="list?mod=<% #id req %>">[Modify]</a>
 	<a href="list?del=<% #id req %>">[Delete]</a><br>
-	To set up, run: <tt>listnew <% user %>&nbsp;<% dom %>&nbsp;<% name %>&nbsp;<% Util.randomPassword () %></tt>
+	To set up, run: <tt>listnew <% #user vitals %>&nbsp;<% #dom vitals %>&nbsp;<% #vhost vitals %>&nbsp;<% name %>&nbsp;<% Util.randomPassword () %></tt>
 <% end %>
 
 <%	end
@@ -44,7 +44,7 @@ elseif $"cmd" = "list" then
 <br><hr><br>
 <table class="blanks">
 <tr> <td>By:</td> <td colspan="2"><a href="user?id=<% #usr req %>"><% name %></a></td> </tr>
-<tr> <td>Time:</td> <td colspan="2"><% #stamp req %></td> </tr>
+<tr> <td>Time:</td> <td colspan="2"><% #stamp req %> (<% Util.diffFromNow (#stamp req) %> ago)</td> </tr>
 <tr> <td>List name:</td> <td><% #data req %></td> </tr>
 <tr> <td>Reason:</td> <td colspan="2"><% Web.html (#msg req) %></td> </tr>
 </table>
@@ -68,7 +68,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 = MailingList.NEW then %> selected<% end %>>New</option>
 	<option value="1"<% if #status req = MailingList.INSTALLED then %> selected<% end %>>Installed</option>
@@ -87,10 +87,8 @@ elseif $"mod" <> "" then
 	val oldStatus = #status req;
 	val newStatus = MailingList.statusFromInt (Web.stoi ($"status"));
 	MailingList.modify {req with data = $"dom", msg = $"msg", status = newStatus};
-	if oldStatus <> newStatus then
-		if not (MailingList.notifyMod (oldStatus, newStatus, Init.getUserName(), id)) then
-			%><h3>Error sending e-mail notification</h3><%
-		end
+	if not (MailingList.notifyMod (oldStatus, newStatus, Init.getUserName(), id)) then
+		%><h3>Error sending e-mail notification</h3><%
 	end
 	%><h3>Request modified</h3>
 	Back to: <a href="list?cmd=open">open requests</a>, <a href="list?cmd=list">all requests</a>
@@ -116,11 +114,11 @@ elseif $"mod" <> "" then
 
 <p>Enter here the e-mail address you would like for your list.  Please keep in mind that the part of your list address before the "@" must be unique across all mailing lists we run.  We may reject applications with overly general names here, especially names of current users or UNIX usernames that are likely to be chosen by future members.  The "Reason" field is optional.</p>
 
-<p>If you want to use the Mailman web interface on your new list, and you want this to appear on a different web virtual host than hcoop.net, then you should follow <a href="http://wiki2.hcoop.net/MemberManual/Email/MailingLists">these instructions</a> after the list has been made.</p>
+<p>If you want to use the Mailman web interface on your new list, and you want this to appear on a different web virtual host than hcoop.net, then you should follow <a href="http://wiki.hcoop.net/MemberManual/Email/MailingLists">these instructions</a> <b>before</b> requesting the list. You should only need to follow the instructions once per domain.</p>
 
 <form action="list" method="post">
 <table class="blanks">
-<tr> <td>List name:</td> <td><input name="req"></td> </tr>
+<tr> <td>List name:</td> <td><input name="req" required="required"></td> </tr>
 <tr> <td>Reason:</td> <td><textarea name="msg" rows="5" cols="80" wrap="soft"></textarea></td> </tr>
 <tr> <td><input type="submit" value="Request"></td> </tr>
 </table>