X-Git-Url: https://git.hcoop.net/hcoop/portal.git/blobdiff_plain/848cdc06ba6b02a574d37badfd42dd085eeab4fe..f2bab7c8c21cd0dde8c63b8450ce628ff654cb80:/apps.mlt

diff --git a/apps.mlt b/apps.mlt
index d2a7e92..2488349 100644
--- a/apps.mlt
+++ b/apps.mlt
@@ -1,7 +1,7 @@
 <% @header [("title", ["Membership applications"])];
 
 val you = Init.getUserId ();
-val board = Group.inGroupName "board";
+val board = Group.reallyInGroupName "board";
 val root = Group.inGroupNum 0;
 
 ref showNormal = true;
@@ -13,7 +13,7 @@ if $"show" <> "" then
 	val appl = App.lookupApp (#app user) %>
 
 	<table class="blanks">
-	<tr> <td>Received:</td> <td><% #applied appl %></td> </tr>
+	<tr> <td>Received:</td> <td><% #applied appl %> (<% Util.diffFromNow (#applied appl) %> ago)</td> </tr>
 	<tr> <td>Approved by:</td> <td><%
 		ref first = true;
 		ref found = false;
@@ -32,6 +32,7 @@ if $"show" <> "" then
 		end %> <% if (iff board then not found else false) then %><a href="apps?vote=<% #id appl %>">[Vote]</a><% end %></td> </tr>
 	<tr> <td>Username:</td> <td><% #name appl %></td> </tr>
 	<tr> <td>Real name:</td> <td><% Web.html (#rname appl) %></td> </tr>
+	<tr> <td>E-mail:</td> <td><a href="mailto:<% #email appl %>"><% #email appl %></a></td> </tr>
 	<tr> <td>Forward e-mail?</td> <td><% if #forward appl then %>yes<% else %>no<% end %></td> </tr>
 	<tr> <td>Proposed uses:</td> <td><% Web.htmlNl (#uses appl) %></td> </tr>
 	<tr> <td>Other information:</td> <td><% Web.htmlNl (#other appl) %></td> </tr>
@@ -67,7 +68,7 @@ elseif $"approve" <> "" then
 	%><h3>Approve application for <% #name appl %></h3>
 	<form action="apps" method="post">
 	<input type="hidden" name="approve2" value="<% $"approve" %>">
-	<b>Message</b>:<br>
+	<b>Message</b> (will be added at the end of <tt>~hcoop/portal/welcome.txt</tt>, so you might want to include some introductory text):<br>
 	<textarea name="msg" rows="5" cols="80" wrap="soft"></textarea><br>
 	<input type="submit" value="Submit">
 	</form><%
@@ -83,10 +84,10 @@ elseif $"cmd" = "approved" then
 
 	%><h3>Pending applications</h3><%
 
-	foreach appl in App.listApps App.ACCEPTED do %>
+	foreach appl in App.listApps [App.ACCEPTED, App.BEING_ADDED] do %>
 		<br><hr><br>
 		<table class="blanks">
-		<tr> <td>Received:</td> <td><% #applied appl %></td> </tr>
+		<tr> <td>Received:</td> <td><% #applied appl %> (<% Util.diffFromNow (#applied appl) %> ago)</td> </tr>
 		<tr> <td>Approved by:</td> <td><%
 			ref first = true;
 			ref found = false;
@@ -103,13 +104,11 @@ elseif $"cmd" = "approved" then
 	<tr> <td>E-mail address:</td> <td><a href="mailto:<% #email appl %>"><% #email appl %></a></td> </tr>
 	<% switch #paypal appl of
 	  SOME s => %><tr> <td>PayPal:</td> <td><a href="mailto:<% s %>"><% s %></a></td> </tr>
-	<% end;
-	switch #checkout appl of
-	  SOME s => %><tr> <td>Google Checkout:</td> <td><a href="mailto:<% s %>"><% s %></a></td> </tr>
 	<% end %>
 	<tr> <td>Forward e-mail?</td> <td><% if #forward appl then %>yes<% else %>no<% end %></td> </tr>
 	<tr> <td>Proposed uses:</td> <td><% Web.htmlNl (#uses appl) %></td> </tr>
 	<tr> <td>Other information:</td> <td><% Web.htmlNl (#other appl) %></td> </tr>
+	<% if #status appl = App.BEING_ADDED then %><tr> <td colspan="2" align="left"><font color="red"><b>WARNING: Someone already followed the add link for this application.  Maybe he forgot to finish.</b></font></td></tr><% end %>
 	</table>
 
 	<% if root then %>
@@ -121,10 +120,10 @@ elseif $"add" <> "" then
 	showNormal := false;
 	val id = Web.stoi ($"add");
 	val appl = App.lookupApp id;
-	App.add id %>
+	App.preAdd id %>
 
-First, run this on deleuze:
-<blockquote><tt>magic-create-user-wrapper <% #name appl %> "<% #rname appl %>"<% if #forward appl then %> "<% #email appl %>"<% end %></tt></blockquote>
+First, run this on gibran:
+<blockquote><tt>new-user <% #name appl %> "<% #rname appl %>"<% if #forward appl then %> "<% #email appl %>"<% end %></tt></blockquote>
 
 <form action="users" method="post">
 <input type="hidden" name="app" value="<% #id appl %>">
@@ -160,10 +159,10 @@ end %>
 <% if showNormal then %>
 <h3>Pending applications</h3>
 
-<% foreach appl in App.listApps App.PENDING do %>
+<% foreach appl in App.listApps [App.PENDING] do %>
 	<br><hr><br>
 	<table class="blanks">
-	<tr> <td>Received:</td> <td><% #applied appl %></td> </tr>
+	<tr> <td>Received:</td> <td><% #applied appl %> (<% Util.diffFromNow (#applied appl) %> ago)</td></tr>
 	<tr> <td>Approved by:</td> <td><%
 		ref first = true;
 		ref found = false;
@@ -185,9 +184,6 @@ end %>
 	<tr> <td>E-mail address:</td> <td><a href="mailto:<% #email appl %>"><% #email appl %></a></td> </tr>
 	<% switch #paypal appl of
 	  SOME s => %><tr> <td>PayPal:</td> <td><a href="mailto:<% s %>"><% s %></a></td> </tr>
-	<% end;
-	switch #checkout appl of
-	  SOME s => %><tr> <td>Google Checkout:</td> <td><a href="mailto:<% s %>"><% s %></a></td> </tr>
 	<% end %>
 	<tr> <td>Forward e-mail?</td> <td><% if #forward appl then %>yes<% else %>no<% end %></td> </tr>
 	<tr> <td>Proposed uses:</td> <td><% Web.htmlNl (#uses appl) %></td> </tr>
@@ -195,10 +191,10 @@ end %>
 	</table>
 
 	<% if board then %>
-	<% if length votes >= 2 then %><a href="apps?approve=<% #id appl %>">Approve this member.</a><br><% end %>
+	<% if length votes >= 3 then %><a href="apps?approve=<% #id appl %>">Approve this member.</a><br><% end %>
 	<a href="apps?deny=<% #id appl %>">Deny this application.</a>
 	<% end %>
-<% end
+<% end 
 end %>
 
-<% @footer[] %>
\ No newline at end of file
+<% @footer[] %>