Added the title and bottom in the correct fashion. This is inline with the i-scream

layout and style.

diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi
index abfc71940fc44cb53dc9e028d0c2ac2a04852db7..d3ca45366881446ae76c37990f9d6dc30e4ae8e6 100755 (executable)
--- a/cgi-bin/cvslog.cgi
+++ b/cgi-bin/cvslog.cgi
@@ -33,7 +33,10 @@ my($cvs2clpath) = "/home/sites/www.i-scream.org.uk/bin/cvs2cl.pl";
 my($cvs2clargs) = "--stdout -r -b -t -w -U $cvsroot/CVSROOT/users -l \"-d'\>$firstdate'\" -g \"-d$cvsroot\" -g \"-Q\"";
 my($updatecmd) = "/home/sites/www.i-scream.org.uk/bin/fullcvsupdate.sh $modulelist";
 my($logcmd) = "cd /home/sites/www.i-scream.org.uk/cvsscripttemp && $cvs2clpath $cvs2clargs";
-my($leftinc) = "/home/sites/www.i-scream.org.uk/web/left.inc";
+
+my ($left) = "../left.inc" ;
+my ($title) = "../title.inc";
+my ($bottom) = "../bottom.inc";
 
 print "Content-type: text/html\n\n";
 
@@ -51,19 +54,19 @@ print <<"END";
 <table border="0" cellpadding="2" cellspacing="2">
  <tr>
   <td valign="top">
-
 END
-print `$leftinc`;
-print <<"END";
 
+&print_html($left);
+
+print <<"END";
   </td>
   <td valign="top">
+END
 
+&print_html($title);
 
-<a href="http://www.i-scream.org.uk"><img border="0" src="../i-scream.gif"></a>
-
+print <<"END";
 <h2>$heading</h2>
-
 END
 
 print `$updatecmd`;
@@ -103,6 +106,8 @@ foreach my $module (@modules) {
     print "</table><p>\n\n";
 }
 
+&print_html($bottom);
+
 print <<"END";
 
   </td>
@@ -130,3 +135,9 @@ sub HTML_encode ($){
     $encoded =~ s/>/&gt;/g;
     return $encoded;
 }
+
+# Print a file without escaping HTML: -
+sub print_html ($) {
+    my ($filename) = @_;
+    print `cat $filename 2>&1`;
+}