X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=nj-awaymsg.git;a=blobdiff_plain;f=mason%2Fmain;h=ac49c50ccbfa35592dd2fa359a02eceff88a63f1;hp=e8c29e6fd7c864ec49941a2fc02e56d33ad10162;hb=84779d17f630c021da997ea4627d396b78c85d9e;hpb=8b294424211f992a399bc48919b4f868c23530b9

diff --git a/mason/main b/mason/main
index e8c29e6..ac49c50 100755
--- a/mason/main
+++ b/mason/main
@@ -12,8 +12,8 @@ my ($sth,$row,$sthi,$rowi);
 <%perl>
 $sth = $dbh->prepare(<<END);
     SELECT *
-     FROM        addresses
-       LEFT JOIN config    USING (emailaddr)
+     FROM        config
+       LEFT JOIN addresses USING (emailaddr)
        LEFT JOIN texts     USING (textid)
      ORDER BY emailaddr
 END
@@ -24,20 +24,12 @@ $sth->execute();
 <td>Address</td>
 <td>Status</td>
 <td>Which message?</td>
-<td>Expiry date</td>
 </tr><tr>
 % while (my $row= $sth->fetchrow_hashref()) {
 <tr>
 <td><% $row->{'emailaddr'} |h %></td>
 %     if (defined $row->{'textid'}) {
-%         my $expires = expires2timet($row->{'expires'});
-%	  if (defined($expires) && $expires < time) {
-<td>expired</td>
-%         } else {
-<td>active</td>
-%         }
 <td><% $row->{'desc'} |h %></td>
-<td><% expirestime2show($expires) |h %></td>
 %     } else {
 <td>inactive</td>
 <td></td>
@@ -58,17 +50,23 @@ END
 $sth->execute();
 </%perl>
 % while (my $row= $sth->fetchrow_hashref()) {
+<form action="edit" method="get">
 <h3>Message "<% $row->{'desc'} |h %>"</h3>
-<table>
-<tr><td>Short name:</td><td><% $row->{'desc'} |h %></td></tr>
-<tr><td>Expires:</td><td><%
-  expirestime2show(expires2timet($row->{'expires'}))
-                                              |h %></td></tr>
-<tr><td>Subject:</td>
-  <td><code><% $row->{'subject'} |h %></code></td></tr>
-</table>
-<p>
+
+<&| txtable, tx => $row &>
+%    $sthi->execute($row->{'textid'});
+%    while (my $rowi= $sthi->fetchrow_hashref()) {
+<tr><td>Used for:</td><td><% $rowi->{'emailaddr'} |h %></td></tr>
+%    }
+</&>
 <pre>
 <% $row->{'text'} |h %>
 </pre>
+
+<input type="submit" name="t<% $row->{'textid'} %>"
+   value="Edit or configure this message">
 % }
+<h3>Add new message</h3>
+<input type="submit" name="create"
+   value="Start adding new message">
+</form>