projects / irspy-moved-to-github.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ab0b7da)
Include all statically named components inline, since they were not
authorMike Taylor <mike@indexdata.com>
Thu, 14 Dec 2006 15:39:06 +0000 (15:39 +0000)
committerMike Taylor <mike@indexdata.com>
Thu, 14 Dec 2006 15:39:06 +0000 (15:39 +0000)
used from elsewhere in the system.  This keeps all layout information
in a single file.  Instead of physically including style.mc, the
layout now includes a link to /style.css.

web/htdocs/chrome/layout.mc patch | blob | history

diff --git a/web/htdocs/chrome/layout.mc b/web/htdocs/chrome/layout.mc
index ad7d4c9..c4df59f 100644 (file)
--- a/web/htdocs/chrome/layout.mc
+++ b/web/htdocs/chrome/layout.mc
@@ -1,4 +1,4 @@
-%# $Id: layout.mc,v 1.19 2006-11-29 18:19:17 mike Exp $
+%# $Id: layout.mc,v 1.20 2006-12-14 15:39:06 mike Exp $
 <%args>
 $debug => undef
 $title
@@ -11,18 +11,122 @@ use ZOOM::IRSpy::Web;
 use ZOOM::IRSpy::Utils qw(isodate xml_encode cql_quote cql_target
                           irspy_xpath_context modify_xml_document);
 </%once>
-<& /chrome/head.mc, title => $title &>
+% $r->content_type("text/html; charset=utf-8");
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+ <head>
+  <title>IRSpy: <% xml_encode($title) %></title>
+  <link rel="stylesheet" type="text/css" href="/style.css"/>
+ </head>
+ <body>
   <table border="0" cellpadding="0" cellspacing="0" width="100%">
-<& /chrome/bannerrow.mc, title => $title &>
+   <tr class="banner">
+    <td align="left">
+     <br/>
+     <h1><a class="logo" href="/">IRSpy</a></h1>
+    </td>
+    <td align="right">
+     <br/>
+     <h1 class="title"><% xml_encode($title) %></h1>
+    </td>
+   </tr>
   </table>
   <table border="0" cellpadding="0" cellspacing="0" width="100%">
-<& /chrome/lmenu.mc &>
+   <tr class="panel3">
+    <td align="left">
+     &nbsp; <!-- Force display -->
+     <!-- Lmenu left -->
+    </td>
+    <td>
+     <!-- Lmenu middle -->
+    </td>
+    <td align="right">
+     <!-- Lmenu right -->
+    </td>
+   </tr>
   </table>
   <p></p>
   <table border="0" cellpadding="0" cellspacing="0" width="100%">
    <tr>
     <td valign="top" class="panel1">
-<& /chrome/menu.mc &>
+     <p>
+      <a href="/"><b>Home</b></a><br/>
+      <a href="/all.html">Test&nbsp;all&nbsp;targets</a><br/>
+      <a href="/find.html">Find a target</a><br/>
+      <a href="/edit.html?op=new">Add a target</a><br/>
+      <a href="/stats.html">Statistics</a><br/>
+     </p>
+     <p>
+      <b>Show targets</b>
+      <br/>
+% foreach my $i ('a' .. 'z') {
+      <a href="/find.html?dc.title=^<% $i %>*&amp;_sort=dc.title&amp;_count=9999&amp;_search=Search"><tt><% uc($i) %></tt></a>
+% }
+     </p>
+<%perl>
+my $id = $r->param("id");
+{
+    # Make up ID for newly created records.  It would be more
+    # rigorously correct, but insanely inefficient, to submit the
+    # record to Zebra and then search for it; but since we know the
+    # formula for IDs anyway, we just build one by hand.
+    my $id = $r->param("id");
+    my $host = $r->param("host");
+    my $port = $r->param("port");
+    my $dbname = $r->param("dbname");
+    #warn "id='$id', host='$host', port='$port', dbname='$dbname'";
+    #warn "%ARGS = {\n" . join("", map { "\t'$_' => '" . $ARGS{$_} . ",'\n" } sort keys %ARGS) . "}\n";
+    if ((!defined $id || $id eq "") &&
+       defined $host && defined $port && defined $dbname) {
+       $id = "$host:$port/$dbname";
+       #warn "id set to '$id'";
+    }
+}
+</%perl>
+% if (defined $id && $r->param("op") ne "copy") {
+     <div class="panel2">
+      <b>This Target</b>
+      <br/>
+      <a href="<% xml_encode("/full.html?id=" . uri_escape($id)) %>">Show details</a>
+      <br/>
+      <a href="<% xml_encode("/edit.html?op=edit&id=" . uri_escape($id)) %>">Edit details</a>
+      <br/>
+      <a href="<% xml_encode("/edit.html?op=copy&id=" . uri_escape($id)) %>">Copy target</a>
+      <p>
+       <a href="<% xml_encode("/check.html?id=" . uri_escape($id)) . "&amp;test=Quick" %>">Quick Test</a>
+       <br/>
+       <a href="<% xml_encode("/check.html?id=" . uri_escape($id)) . "&amp;test=Main" %>">Full Test</a>
+      </p>
+      <p>
+       <a href="<% xml_encode("/raw.html?id=" . uri_escape($id)) %>">XML</a>
+      </p>
+<%doc><!-- Maybe this would be too heavyweight -->
+      <br/>
+% my $host = "bagel.indexdata.dk";
+% my $port = 210;
+      <a href="/find.html?net.host=<% $host %>&net.port=<% $port %>&_search=Search"
+       >All databases on this server</a>
+</%doc>
+     </div>
+% }
+     <p>
+      <b>Documentation</b>
+      <br/>
+      <a href="/doc.html">Contents</a>
+     </p>
+     <p>&nbsp;</p>
+     <p>
+      <a href="http://validator.w3.org/check?uri=referer"><img
+        src="/valid-xhtml10.png"
+        alt="Valid XHTML 1.0 Strict" height="31" width="88" /></a>
+      <br/>
+      <a href="http://jigsaw.w3.org/css-validator/"><img
+       src="/vcss.png"
+       alt="Valid CSS!" height="31" width="88" /></a>
+     </p>
     </td>
     <td class="spacer">&nbsp;</td>
     <td valign="top">
@@ -30,4 +134,14 @@ use ZOOM::IRSpy::Utils qw(isodate xml_encode cql_quote cql_target
     </td>
    </tr>
   </table>
-<& /chrome/tail.mc &>
+  <p/>
+  <hr/>
+  <div class="right">
+   <small>
+    Powered by <a style="text-decoration: none"
+       href="http://indexdata.com/"
+       >Index&nbsp;Data</a>
+   </small>
+  </div>
+ </body>
+</html>
Registry of IR servers with automatic testing