]> i-scream Git - www.i-scream.org.git/commitdiff
i-scream / www.i-scream.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8c36085)
Make docs.cgi XHTML 1.1 compliant (and tidied up the layout).
authorTim Bishop <tim@bishnet.net>
Wed, 24 Mar 2004 13:11:42 +0000 (13:11 +0000)
committerTim Bishop <tim@bishnet.net>
Wed, 24 Mar 2004 13:11:42 +0000 (13:11 +0000)
Problem with this doc is it doesn't have a .xhtml extension, so will
always have to be served as text/html - until I come up with a solution.

cgi-bin/docs.cgi patch | blob | history

diff --git a/cgi-bin/docs.cgi b/cgi-bin/docs.cgi
index 402c9e505ba29cb49bd023f9ed76ce1ed741b7ca..bdcd3f9721a02bd3b757ddde93c58248f82bf44a 100755 (executable)
--- a/cgi-bin/docs.cgi
+++ b/cgi-bin/docs.cgi
@@ -6,10 +6,14 @@ use CGI;
 $| = 1;
 
 # Settings
-my ($menu) = "../nwww/menu.inc" ;
-my ($header) = "../nwww/header.inc";
-my ($footer) = "../nwww/footer.inc";
-my ($style) = "../nwww/style.inc";
+my ($incdir) = "../nwww";
+
+# Include files
+my ($doctype) = "$incdir/doctype.inc";
+my ($style) = "$incdir/style.inc";
+my ($header) = "$incdir/header.inc";
+my ($footer) = "$incdir/footer.inc";
+my ($menu) = "$incdir/menu.inc" ;
 
 my ($query) = new CGI;
 
@@ -17,6 +21,7 @@ my ($query) = new CGI;
 # This prevents malicious users using "../" to view files.
 my ($doc) = ($query->param('doc') =~ /^\s*([^\.]*?\.txt)\s*$/);
 
+# This should be application/xhtml+xml
 print "Content-type: text/html\n\n";
 
 unless (defined $doc) {
@@ -34,50 +39,59 @@ $doc = "../htdocs/documentation/".$doc;
 
 my($docname) = $doc =~ /\/([^\/]+)$/;
 
-print <<"END";
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+&print_html($doctype);
 
-<html>
+print <<"END";
 
-<head>
- <title>i-scream plain text documentation viewer</title>
+  <head>
+    <title>
+      i-scream plain text documentation viewer
+    </title>
 END
 
 &print_html($style);
 
 print <<"END";
-</head>
 
-<body>
-
-<div id="container">
-
-<div id="main">
+  </head>
+  <body>
+    <div id="container">
+      <div id="main">
 END
 
 &print_html($header);
 
 print <<"END";
-<div id="contents">
-<h1 class="top">i-scream documentation viewer</h1>
 
-<h2>$docname</h2>
+        <div id="contents">
+          <h1 class="top">
+            i-scream documentation viewer
+          </h1>
+          <h2>
+            $docname
+          </h2>
 END
 
 &print_file($doc);
-print "</div>";
+
+print <<"END";
+
+        </div>
+END
 
 &print_html($footer);
 
-print "</div>";
+print <<"END";
+
+      </div>
+END
 
 &print_html($menu);
 
 print <<"END";
-</div>
 
-</body>
+    </div>
+  </body>
 </html>
 END
 
@@ -101,7 +115,7 @@ my ($punc) = '.:?\-';
 my ($any) = "${ltrs}${gunk}${punc}";
 my ($filename) = @_;
 if(open(FILE, $filename)) {
-    print "<pre>\n";
+    print "          <pre>\n";
     # Use $_ implicitly throughout.
     while (<FILE>) {
         # Must do the next line first!
@@ -112,7 +126,7 @@ if(open(FILE, $filename)) {
         s/\b($urls:[$any]+?)(?=[$punc]*[^$any]|$)/<a href="$1">$1<\/a>/igox;
         print;
     }
-    print "</pre>";
+    print "\n</pre>";
 }
 else {
     print "Failed to open $docname.";
www.i-scream.org