X-Git-Url: https://git.hcoop.net/hcoop/portal.git/blobdiff_plain/c81f707d50e2f29e2077bdbebcb62fe9fed218b6..573def24c0220a72beff4e3f5739a450d83de170:/apt.mlt

diff --git a/apt.mlt b/apt.mlt
index 6ef3346..d5a3e06 100644
--- a/apt.mlt
+++ b/apt.mlt
@@ -3,7 +3,7 @@
 val admin = Group.inGroupName "server";
 
 val nodeNum = case $"node" of
-		  "" => 2
+		  "" => 4
 		| node => Web.stoi node;
 
 if $"new" <> "" then
@@ -76,7 +76,7 @@ elseif $"cmd" = "open" 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>Node:</td> <td colspan="2"><% Web.html (Init.nodeName (#node req)) %></td> </tr>
 <tr> <td>Packages:</td><%
 	ref first = true;
@@ -106,7 +106,7 @@ elseif $"cmd" = "open" then
 	<br>
 	<a href="apt?mod=<% #id req %>">[Modify]</a>
 	<a href="apt?del=<% #id req %>">[Delete]</a><br>
-	To install, run: <tt>apt-get install<% foreach pkg in pkgs do %>&nbsp;<% pkg %><% end %></tt>
+	To install on a node controlled by Puppet, declare <tt>package { [ <% foreach pkg in pkgs do %>'<% Web.html pkg %>', <% end %> ]: }</tt> in manifest <tt>hcoop::server::<% Web.html (Init.nodeName (#node req)) %></tt>. If the node is not managed by Puppet, run: <tt>apt-get install<% foreach pkg in pkgs do %>&nbsp;<% Web.html pkg %><% end %></tt>.
 <% end %>
 
 <%	end
@@ -118,7 +118,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>Node:</td> <td colspan="2"><% Web.html (Init.nodeName (#node req)) %></td> </tr>
 <tr> <td>Packages:</td><%
 	ref first = true;
@@ -163,7 +163,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>Node:</td> <td><select name="node">
 <% foreach node in Init.listNodes () do %>
 	<option value="<% #id node %>"<% if #id node = #node req then %> selected<% end %>><% Web.html (#name node) %> (<% Web.html (#descr node) %>; Debian <% Web.html (#debian node) %>)</option>
@@ -188,10 +188,8 @@ elseif $"mod" <> "" then
 	val oldStatus = #status req;
 	val newStatus = Apt.statusFromInt (Web.stoi ($"status"));
 	Apt.modify {req with node = node, data = $"pkgs", msg = $"msg", status = newStatus};
-	if oldStatus <> newStatus then
-		if not (Apt.notifyMod {old = oldStatus, new = newStatus, changer = Init.getUserName(), req = id}) then
-			%><h3>Error sending e-mail notification</h3><%
-		end
+	if not (Apt.notifyMod {old = oldStatus, new = newStatus, changer = Init.getUserName(), req = id}) then
+		%><h3>Error sending e-mail notification</h3><%
 	end
 	%><h3>Request modified</h3>
 	Back to: <a href="apt?cmd=open">open requests</a>, <a href="apt?cmd=list">all requests</a>
@@ -215,7 +213,10 @@ elseif $"mod" <> "" then
 
 <h3>Request new installations</h3>
 
-List the package names you'd like, separated by any whitespace characters.
+List the package names you'd like, separated by any whitespace
+characters. If you want the version of a package from <a
+href="http://backports-master.debian.org/">backports</a>, specify that
+in the "Reason" field.
 
 <form action="apt" method="post">
 <table class="blanks">
@@ -224,7 +225,7 @@ List the package names you'd like, separated by any whitespace characters.
 	<option value="<% #id node %>"<% if #id node = nodeNum then %> selected<% end %>><% Web.html (#name node) %> (<% Web.html (#descr node) %>; Debian <% Web.html (#debian node) %>)</option>
 <% end %>
 </select></td></tr>
-<tr> <td>Packages:</td> <td><textarea name="new" rows="10" cols="40" wrap="soft"></textarea></td> </tr>
+<tr> <td>Packages:</td> <td><textarea name="new" rows="10" cols="40" wrap="soft" required="required"></textarea></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>