Generation of ID from host/port/db moved from layout.mc to menu.mc, and no longer...

[irspy-moved-to-github.git] / web / htdocs / chrome / layout.mc

diff --git a/web/htdocs/chrome/layout.mc b/web/htdocs/chrome/layout.mc
index a5fefe8..83614a0 100644 (file)
--- a/web/htdocs/chrome/layout.mc
+++ b/web/htdocs/chrome/layout.mc
@@ -1,16 +1,16 @@
-%# $Id: layout.mc,v 1.3 2006-09-19 11:13:58 mike Exp $
+%# $Id: layout.mc,v 1.18 2006-11-16 17:02:30 mike Exp $
 <%args>
 $debug => undef
 $title
 $component
 </%args>
 <%once>
-use lib "/usr/local/src/cvs/irspy/lib";
-use ZOOM::IRSpy;
+use URI::Escape;
+use ZOOM;
+use ZOOM::IRSpy::Web;
+use ZOOM::IRSpy::Utils qw(xml_encode cql_quote cql_target
+                          irspy_xpath_context modify_xml_document);
 </%once>
-<%perl>
-my $text = $m->scomp($component, %ARGS);
-</%perl>
 <& /chrome/head.mc, title => $title &>
   <table border="0" cellpadding="0" cellspacing="0" width="100%">
 <& /chrome/bannerrow.mc, title => $title &>
@@ -24,9 +24,10 @@ my $text = $m->scomp($component, %ARGS);
     <td valign="top" class="panel1">
 <& /chrome/menu.mc &>
     </td>
-    <td class="spacer"></td>
+    <td class="spacer">&nbsp;</td>
     <td valign="top">
-     <% $text %>
+<& $component, %ARGS &>
+    </td>
    </tr>
   </table>
 <& /chrome/tail.mc &>