wip

[nj-awaymsg.git] / mason / main

diff --git a/mason/main b/mason/main
index 07a5efebf1b8ebcdca80f4713348cd88ad75c99a..43ef45a058a29088207fe6563fb2064bdf0e0774 100755 (executable)
--- 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
@@ -60,22 +60,17 @@ $sth->execute();
 % 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>
+
+<&| txtable, tx => $row &>
 %    $sthi->execute($row->{'textid'});
 %    while (my $rowi= $sthi->fetchrow_hashref()) {
 <tr><td>Used for:</td><td><% $rowi->{'emailaddr'} |h %></td></tr>
 %    }
-<tr><td>Subject:</td>
-  <td><code><% $row->{'subject'} |h %></code></td></tr>
-</table>
-<p>
+</&>
 <pre>
 <% $row->{'text'} |h %>
 </pre>
+
 <input type="submit" name="t<% $row->{'textid'} %>"
    value="Edit or configure this message">
 % }