use common message instead of msg

use common error template

diff --git a/site/cgi-bin/interest.pl b/site/cgi-bin/interest.pl
index ac82cd2b6107dfeefc17766c13e3400f22bac5c2..39f314deae1effb4857f362d42c6c1c71b1b8e6d 100755 (executable)
--- a/site/cgi-bin/interest.pl
+++ b/site/cgi-bin/interest.pl
@@ -65,15 +65,15 @@ $mailer->send(to=>$sendto, from=>$SHOP_FROM, subject=>$subject,
 BSE::Template->show_page('interest/confirm', $cfg, \%acts);
 
 sub error_page {
-  my ($id, $msg, $template) = @_;
+  my ($id, $error, $template) = @_;
 
-  $msg = $cfg->entry(messages=>$id, $msg) if $id;
-  $template ||= 'interest/error';
+  $error = $cfg->entry(messages=>$id, $error) if $id;
+  $template ||= 'error';
   my %acts;
   %acts =
     (
      BSE::Util::Tags->basic(\%acts, $cgi, $cfg),
-     msg => sub { CGI::escapeHTML($msg) },
+     error => sub { CGI::escapeHTML($error) },
     );
   BSE::Template->show_page($template, $cfg, \%acts);
   exit;

diff --git a/site/templates/interest/askagain_base.tmpl b/site/templates/interest/askagain_base.tmpl
index f58c090e2adfccf20946a53cfd90f5ab23bdb53f..fa072c988fb59d1f252dd02b689ad53b4878c0ce 100644 (file)
--- a/site/templates/interest/askagain_base.tmpl
+++ b/site/templates/interest/askagain_base.tmpl
@@ -6,7 +6,7 @@
     <table width="350">
       <tr> 
       <th colspan="2" align="center"> 
-        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="3"><b><:msg:></b></font></p>
+        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="3"><b><:message:></b></font></p>
       </th>
     </tr>
     <tr>

diff --git a/site/templates/interest/error_base.tmpl b/site/templates/interest/error_base.tmpl
deleted file mode 100644 (file)
index a923262..0000000
--- a/site/templates/interest/error_base.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-<:wrap base.tmpl:>
-<div align=center>
-  <table width="350">
-    <tr> 
-      <th colspan="2" align="center"> 
-        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="3"><b>Error</b></font></p>
-      </th>
-    </tr>
-    <tr> 
-      <td colspan="2"> 
-        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2">There was 
-          an error when registering your interest:</font></p>
-        <p><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><:msg:></font></p>
-      </td>
-    </tr>
-  </table>
-</div>
\ No newline at end of file