Join script should rule out retired usernames

[bpt/portal.git] / roll.mlt

diff --git a/roll.mlt b/roll.mlt
index 16db145..2d396aa 100644 (file)
--- a/roll.mlt
+++ b/roll.mlt
@@ -14,33 +14,33 @@ if $"cmd" = "respond" then
 
        if code = #code rc then
                Roll.respond (rol, you);
-               %><h3><b>Your response has been saved.  Thank you!</b></h3><%
+               %><h3>Your response has been saved.  Thank you!</h3><%
        else
-               %><h3><b>Incorrect code!</b></h3><%
+               %><h3>Incorrect code!</h3><%
        end
 elseif $"cmd" = "add" then
        Group.requireGroupNum 0;
        val title = $"title";
        val msg = $"msg";
        if title = "" then
-               %><h3><b>Your roll call must have a title.</b></h3><%
+               %><h3>Your roll call must have a title.</h3><%
        else
                val id = Roll.addRollCall (title, msg);
                viewingCall := SOME id;
-               %><h3><b>Roll call added!</b></h3><%
+               %><h3>Roll call added!</h3><%
        end
 
 elseif $"mod" <> "" then
        Group.requireGroupNum 0;
        showNormal := false;
        val rc = Roll.lookupRollCall (Web.stoi ($"mod")) %>
-<h3><b>Modify roll call</b></h3>
+<h3>Modify roll call</h3>
 
 <form action="roll" method="post">
 <input type="hidden" name="id" value="<% $"mod" %>">
-<table>
-<tr> <td align="right"><b>Title</b>:</td> <td><input name="title" value="<% Web.html (#title rc) %>"></td> </tr>
-<tr> <td align="right" valign="top"><b>Message</b>:</td> <td><textarea name="msg" wrap="soft" rows="5" cols="80"><% Web.html (#msg rc) %></textarea></td> </tr>
+<table class="blanks">
+<tr> <td>Title:</td> <td><input name="title" value="<% Web.html (#title rc) %>"></td> </tr>
+<tr> <td>Message:</td> <td><textarea name="msg" wrap="soft" rows="5" cols="80"><% Web.html (#msg rc) %></textarea></td> </tr>
 <tr> <td><input type="submit" name="cmd" value="Save"></td> </tr>
 </table>
 </form>
@@ -52,25 +52,25 @@ elseif $"mod" <> "" then
        val title = $"title";
        val msg = $"msg";
        if title = "" then
-               %><h3><b>Your rol call must have a title.</b></h3><%
+               %><h3>Your rol call must have a title.</h3><%
        else
                Roll.modRollCall {rc with title = title, msg = msg};
                viewingCall := SOME (#id rc);
-               %><h3><b>Roll call saved.</b></h3><%
+               %><h3>Roll call saved.</h3><%
        end
 
 elseif $"del" <> "" then
        Group.requireGroupNum 0;
        showNormal := false;
        val rc = Roll.lookupRollCall (Web.stoi ($"del")) %>
-       <h3><b>Are you sure you want to delete roll call "<a href="roll?view=<% #id rc %>"><% Web.html (#title rc) %></a>"?</b></h3>
+       <h3>Are you sure you want to delete roll call "<a href="roll?view=<% #id rc %>"><% Web.html (#title rc) %></a>"?</h3>
        <a href="roll?del2=<% $"del" %>">Yes, delete <% Web.html (#title rc) %>!</a>
 
 <% elseif $"del2" <> "" then
        Group.requireGroupNum 0;
        val rc = Roll.lookupRollCall (Web.stoi ($"del2"));
        Roll.deleteRollCall (Web.stoi ($"del2")) %>
-       <h3><b><% Web.html (#title rc) %> deleted!</b></h3>
+       <h3><% Web.html (#title rc) %> deleted!</h3>
 
 <% elseif $"cmd" = "mailall" then
        Group.requireGroupNum 0;
@@ -97,19 +97,19 @@ if showNormal then
 
        switch viewingCall of
                  NONE => %>
-<h3><b>Existing roll calls</b></h3>
+<h3>Existing roll calls</h3>
 
 <% foreach rc in Roll.listRollCalls () do %>
 <li> <a href="roll?view=<% #id rc %>"><% Web.html (#title rc) %></a> (<% #started rc %>)</li>
 <% end %>
 
-<h3><b>New roll call</b></h3>
+<h3>New roll call</h3>
 
 <form action="roll" method="post">
 <input type="hidden" name="cmd" value="add">
-<table>
-<tr> <td align="right"><b>Title</b>:</td> <td><input name="title"></td> </tr>
-<tr> <td align="right" valign="top"><b>Message</b>:</td> <td><textarea name="msg" wrap="soft" rows="5" cols="80"></textarea></td> </tr>
+<table class="blanks">
+<tr> <td>Title:</td> <td><input name="title"></td> </tr>
+<tr> <td>Message:</td> <td><textarea name="msg" wrap="soft" rows="5" cols="80"></textarea></td> </tr>
 <tr> <td><input type="submit" value="Create"></td> </tr>
 </table>
 </form>
@@ -118,21 +118,21 @@ if showNormal then
 
 <%             | SOME id =>
        val rc = Roll.lookupRollCall id %>
-       <h3><b>Roll call "<% Web.html (#title rc) %>"</b></h3>
-       <table border="0">
-       <tr> <td align="right"><b>Started:</b></td> <td><% #started rc %></td> </tr>
-       <tr> <td align="right" valign="top"><b>Message:</b></td> <td><% Web.htmlNl (#msg rc) %></td> </tr>
+       <h3>Roll call "<% Web.html (#title rc) %>"</h3>
+       <table border="0" class="blanks">
+       <tr> <td>Started:</td> <td><% #started rc %></td> </tr>
+       <tr> <td>Message:</td> <td><% Web.htmlNl (#msg rc) %></td> </tr>
        </table>
        [ <a href="roll?mod=<% id %>">Modify</a> | <a href="roll?del=<% id %>">Delete</a> ]<br>
 
 <% val (didnt, did) = Roll.listEntries id %>
 
-<h2><b>Didn't respond yet:</b></h2>
+<h2>Didn't respond yet:</h2>
 <% foreach (usr, ent) in didnt do %>
 <li> <a href="user?id=<% #id usr %>"><% Web.html (#name usr) %></a></li>
 <% end %>
 
-<h2><b>Responded:</b></h2>
+<h2>Responded:</h2>
 <% foreach (usr, ent) in did do %>
 <li> <a href="user?id=<% #id usr %>"><% Web.html (#name usr) %></a> (<%
        switch #responded ent of SOME st => st end %>)</li>