From 12828a385049e4c6ed3f298b20900d2e6e3070d8 Mon Sep 17 00:00:00 2001
From: calvin <calvin@e7d03fd6-7b0d-0410-9947-9c21f3af8025>
Date: Mon, 30 Dec 2002 23:55:24 +0000
Subject: [PATCH] add linebreaks in html output

git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@688 e7d03fd6-7b0d-0410-9947-9c21f3af8025
---
 ChangeLog                   |  2 +
 lconline/lc_cgi.html        | 78 ++++++++++++++++++---------------
 lconline/leer.html          |  2 +
 linkcheck/log/HtmlLogger.py | 87 ++++++++++++++++++++-----------------
 po/de.po                    |  6 ++-
 po/fr.po                    |  6 ++-
 po/nl.po                    |  6 ++-
 7 files changed, 108 insertions(+), 79 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index e325b53b..0fa0a5ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
     Changed files: linkcheck/parser/{Makefile, htmllex.c}
   * put shared code of cgi scripts in lc_cgi.py
     Changed files: lc.cgi, lc.fcgi, lc.sz_fcgi, linkcheck/lc_cgi.py
+  * put some linebreaks and target="top" into HTML output
+    Changed files: linkcheck/logging/HtmlLogger.py
 
 1.8.1
   * Add missing () to function call in proxy handling code
diff --git a/lconline/lc_cgi.html b/lconline/lc_cgi.html
index f1f1d064..f5aaf896 100644
--- a/lconline/lc_cgi.html
+++ b/lconline/lc_cgi.html
@@ -1,10 +1,19 @@
 <html><head>
 <title>LinkChecker Online</title>
+<style type="text/css">
+<!--
+ h2 { font-family: Verdana,sans-serif; font-size: 22pt;
+ font-style: bold; font-weight: bold }
+ body { font-family: Arial,sans-serif; font-size: 11pt }
+ td { font-family:Arial,sans-serif; font-size:11pt }
+ code { font-family: Courier }
+ a:hover { color: #34a4ef }
+ //-->
+</style>
 </head>
 <body text="#192c83" bgcolor="#fff7e5" link="#191c83" vlink="#191c83"
  alink="#191c83">
 
-<font face="Lucida,Verdana,Arial,sans-serif">
 <center><h2>LinkChecker Online</h2>
 (powered by <a href="http://linkchecker.sourceforge.net/"
 target="_top">LinkChecker</a>)
@@ -13,43 +22,42 @@ target="_top">LinkChecker</a>)
 <blockquote>
 <form method="POST" action="/cgi-bin/lconline/lc.cgi" target="links">
 <table border="0" cellpadding="2" cellspacing="0" summary="">
-<tr><td colspan="2" bgcolor="#fff7e5">
-<font face="Lucida,Verdana,Arial,sans-serif">URL:
-<input size="70" name="url" value="http://">
-<input type="submit" value="Go!"></font></td></tr>
-<td><font face="Lucida,Verdana,Arial,sans-serif">Recursion Level:
-<select name="level">
-<option value="0">0</option>
-<option value="1" selected>1</option>
-<option value="2">2</option>
-<option value="3">3</option>
-</select>
-</font></td>
-<td><font face="Lucida,Verdana,Arial,sans-serif">
-Check anchors in HTML: <input type="checkbox" name="anchors" checked>
-</font></td></tr>
-<tr><td>
-<font face="Lucida,Verdana,Arial,sans-serif">
-Log only errors: <input type="checkbox" name="errors">
-</font></td>
-<td><font face="Lucida,Verdana,Arial,sans-serif">
-Check only intern links: <input type="checkbox" name="intern" checked>
-</font></td>
+<tr height="50">
+<td>Url:</td>
+<td colspan="4"><input size="70" name="url" value="http://">
+  <input type="submit" value="Go!">
+</td>
+</tr>
+<td rowspan="3" valign="top">Options:</td>
+<td>Recursion Level:</td>
+<td><select name="level">
+  <option value="0">0</option>
+  <option value="1" selected>1</option>
+  <option value="2">2</option>
+  <option value="3">3</option>
+  </select>
+</td>
+<td>Check anchors in HTML:</td>
+<td><input type="checkbox" name="anchors" checked></td>
 </tr>
 <tr>
-<td><font face="Lucida,Verdana,Arial,sans-serif">
-Output language: <select name="language">
-<option value="C" selected>English</option>
-<option value="de">Deutsch</option>
-<option value="fr">Fran&ccedil;ais</option>
-<option value="nl">Nederlands</option>
-</select>
-</font></td>
-<td><font face="Lucida,Verdana,Arial,sans-serif">
-Check strict intern links: <input type="checkbox" name="strict">
-</font></td>
+<td>Log only errors:</td>
+<td><input type="checkbox" name="errors"></td>
+<td>Check only intern links:</td>
+<td><input type="checkbox" name="intern" checked></td>
+</tr>
+<tr>
+<td>Output language:</td>
+<td><select name="language">
+  <option value="C" selected>English</option>
+  <option value="de">Deutsch</option>
+  <option value="fr">Fran&ccedil;ais</option>
+  <option value="nl">Nederlands</option>
+  </select>
+</td>
+<td>Check strict intern links:</td>
+<td><input type="checkbox" name="strict"></td>
 </tr>
 </table>
 </blockquote>
-</font>
 </body></html>
diff --git a/lconline/leer.html b/lconline/leer.html
index fbfdfc78..8d4db267 100644
--- a/lconline/leer.html
+++ b/lconline/leer.html
@@ -3,5 +3,7 @@
 </head>
 <body text="#192c83" bgcolor="#fff7e5" link="#191c83" vlink="#191c83"
  alink="#191c83">
+<div style="font-family:Arial,sans-serif;">
 No links checked, dude!
+</div>
 </body></html>
diff --git a/linkcheck/log/HtmlLogger.py b/linkcheck/log/HtmlLogger.py
index f59713ff..b7c3745b 100644
--- a/linkcheck/log/HtmlLogger.py
+++ b/linkcheck/log/HtmlLogger.py
@@ -18,7 +18,7 @@ from StandardLogger import StandardLogger
 from linkcheck.log import strtime
 import time, linkcheck, linkcheck.Config
 
-HTML_HEADER = """<!DOCTYPE html PUBLIC "-//W3C//DTD html 4.0//EN">
+HTML_HEADER = """<!DOCTYPE html PUBLIC "-//W3C//DTD html 4.01//EN">
 <html><head><title>%s</title>
 <style type="text/css">\n<!--
  h2 { font-family: Verdana,sans-serif; font-size: 22pt;
@@ -54,75 +54,80 @@ class HtmlLogger (StandardLogger):
             self.fd.write("<center><h2>"+linkcheck.Config.App+"</h2></center>"+
               "<br><blockquote>"+linkcheck.Config.Freeware+"<br><br>"+
               (linkcheck._("Start checking at %s\n") % strtime(self.starttime))+
-	      "<br><br>")
+	      "<br>")
         self.fd.flush()
 
     def newUrl (self, urlData):
         if self.fd is None: return
-        self.fd.write('<table align=left border=0 cellspacing=0'
-              ' cellpadding=1 bgcolor='+self.colorborder+' summary=Border'
-              '><tr><td><table align=left border=0 cellspacing=0'
-              ' cellpadding=3 summary="checked link" bgcolor='+
-	      self.colorbackground+">")
+        self.fd.write("<br clear=all><br>\n"+
+             "<table align=left border=0 cellspacing=0 cellpadding=1\n"+
+             " bgcolor="+self.colorborder+" summary=Border>\n"+
+             "<tr>\n"+
+             "<td>\n"+
+             "<table align=left border=0 cellspacing=0 cellpadding=3\n"+
+             " summary=\"checked link\" bgcolor="+self.colorbackground+">\n")
         if self.logfield("url"):
-	    self.fd.write("<tr><td bgcolor="+self.colorurl+">"+linkcheck._("URL")+
-              "</td><td bgcolor="+self.colorurl+">"+urlData.urlName)
+	    self.fd.write("<tr>\n"+
+             "<td bgcolor="+self.colorurl+">"+linkcheck._("URL")+"</td>\n"+
+             "<td bgcolor="+self.colorurl+">"+urlData.urlName)
             if urlData.cached:
-                self.fd.write(linkcheck._(" (cached)\n"))
-            self.fd.write("</td></tr>\n")
+                self.fd.write(linkcheck._(" (cached)"))
+            self.fd.write("</td>\n</tr>\n")
         if urlData.name and self.logfield("name"):
-            self.fd.write("<tr><td>"+linkcheck._("Name")+"</td><td>"+
-                          urlData.name+"</td></tr>\n")
+            self.fd.write("<tr>\n<td>"+linkcheck._("Name")+"</td>\n<td>"+
+                          urlData.name+"</td>\n</tr>\n")
         if urlData.parentName and self.logfield("parenturl"):
-            self.fd.write("<tr><td>"+linkcheck._("Parent URL")+"</td><td>"+
-			  '<a href="'+urlData.parentName+'">'+
-                          urlData.parentName+"</a>")
+            self.fd.write("<tr>\n<td>"+linkcheck._("Parent URL")+
+               '</td>\n<td><a target="top" href="'+urlData.parentName+'">'+
+               urlData.parentName+"</a>")
             if urlData.line:
                 self.fd.write(linkcheck._(", line %d")%urlData.line)
             if urlData.column:
                 self.fd.write(linkcheck._(", col %d")%urlData.column)
-            self.fd.write("</td></tr>\n")
+            self.fd.write("</td>\n</tr>\n")
         if urlData.baseRef and self.logfield("base"):
-            self.fd.write("<tr><td>"+linkcheck._("Base")+"</td><td>"+
-	                  urlData.baseRef+"</td></tr>\n")
+            self.fd.write("<tr>\n<td>"+linkcheck._("Base")+"</td>\n<td>"+
+	                  urlData.baseRef+"</td>\n</tr>\n")
         if urlData.url and self.logfield("realurl"):
-            self.fd.write("<tr><td>"+linkcheck._("Real URL")+"</td><td>"+
-	                  '<a href="'+urlData.url+
-			  '">'+urlData.url+"</a></td></tr>\n")
+            self.fd.write("<tr>\n<td>"+linkcheck._("Real URL")+"</td>\n<td>"+
+	                  '<a target="top" href="'+urlData.url+
+			  '">'+urlData.url+"</a></td>\n</tr>\n")
         if urlData.dltime>=0 and self.logfield("dltime"):
-            self.fd.write("<tr><td>"+linkcheck._("D/L Time")+"</td><td>"+
+            self.fd.write("<tr>\n<td>"+linkcheck._("D/L Time")+"</td>\n<td>"+
 	                  (linkcheck._("%.3f seconds") % urlData.dltime)+
-			  "</td></tr>\n")
+			  "</td>\n</tr>\n")
         if urlData.dlsize>=0 and self.logfield("dlsize"):
-            self.fd.write("<tr><td>"+linkcheck._("D/L Size")+"</td><td>"+
+            self.fd.write("<tr>\n<td>"+linkcheck._("D/L Size")+"</td>\n<td>"+
 	                  StringUtil.strsize(urlData.dlsize)+
-			  "</td></tr>\n")
+			  "</td>\n</tr>\n")
         if urlData.checktime and self.logfield("checktime"):
-            self.fd.write("<tr><td>"+linkcheck._("Check Time")+
-	                  "</td><td>"+
+            self.fd.write("<tr>\n<td>"+linkcheck._("Check Time")+
+	                  "</td>\n<td>"+
 			  (linkcheck._("%.3f seconds") % urlData.checktime)+
-			  "</td></tr>\n")
+			  "</td>\n</tr>\n")
         if urlData.infoString and self.logfield("info"):
-            self.fd.write("<tr><td>"+linkcheck._("Info")+"</td><td>"+
+            self.fd.write("<tr>\n<td>"+linkcheck._("Info")+"</td>\n<td>"+
 	                  linkcheck.StringUtil.htmlify(urlData.infoString)+
-			  "</td></tr>\n")
+			  "</td>\n</tr>\n")
         if urlData.warningString:
             #self.warnings += 1
             if self.logfield("warning"):
-                self.fd.write("<tr>"+self.tablewarning+linkcheck._("Warning")+
-	                  "</td>"+self.tablewarning+
-                          urlData.warningString.replace("\n", "<br>")+
-			  "</td></tr>\n")
+                self.fd.write("<tr>\n"+
+                    self.tablewarning+linkcheck._("Warning")+
+	            "</td>\n"+self.tablewarning+
+                    urlData.warningString.replace("\n", "<br>")+
+                    "</td>\n</tr>\n")
         if self.logfield("result"):
             if urlData.valid:
-                self.fd.write("<tr>"+self.tableok+linkcheck._("Result")+"</td>"+
-                  self.tableok+urlData.validString+"</td></tr>\n")
+                self.fd.write("<tr>\n"+self.tableok+
+                  linkcheck._("Result")+"</td>\n"+
+                  self.tableok+urlData.validString+"</td>\n</tr>\n")
             else:
                 self.errors += 1
-                self.fd.write("<tr>"+self.tableerror+linkcheck._("Result")+
-	                  "</td>"+self.tableerror+
-			  urlData.errorString+"</td></tr>\n")
-        self.fd.write("</table></td></tr></table><br clear=all><br>")
+                self.fd.write("<tr>\n"+self.tableerror+linkcheck._("Result")+
+	                  "</td>\n"+self.tableerror+
+			  urlData.errorString+"</td>\n</tr>\n")
+        self.fd.write("</table></td></tr></table><br clear=all>")
         self.fd.flush()
 
     def endOfOutput (self, linknumber=-1):
diff --git a/po/de.po b/po/de.po
index 65d677a9..867a8643 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Mon Dec 30 23:58:28 2002\n"
+"POT-Creation-Date: Tue Dec 31 00:52:53 2002\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Bastian Kleineidam <calvin@users.sourceforge.net>\n"
 "Language-Team: LANGUAGE <de@li.org>\n"
@@ -320,6 +320,10 @@ msgstr "Ergebnis"
 msgid "Start checking at %s\n"
 msgstr "Beginne Prüfen am %s\n"
 
+#, fuzzy
+msgid " (cached)"
+msgstr " (aus dem Cache)\n"
+
 msgid "Thats it. "
 msgstr "Das wars. "
 
diff --git a/po/fr.po b/po/fr.po
index e387ecad..f9342adf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Mon Dec 30 23:58:28 2002\n"
+"POT-Creation-Date: Tue Dec 31 00:52:53 2002\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <fr@li.org>\n"
@@ -292,6 +292,10 @@ msgstr "R
 msgid "Start checking at %s\n"
 msgstr "Démarrage du controle à %s\n"
 
+#, fuzzy
+msgid " (cached)"
+msgstr " (caché)\n"
+
 msgid "Thats it. "
 msgstr "Terminé. "
 
diff --git a/po/nl.po b/po/nl.po
index d8243b7f..88e5e7a9 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Mon Dec 30 23:58:28 2002\n"
+"POT-Creation-Date: Tue Dec 31 00:52:53 2002\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Hans Bausewein <hans.bausewein@comerwell.xs4all.nl>\n"
 "Language-Team: LANGUAGE <nl@li.org>\n"
@@ -303,6 +303,10 @@ msgstr "Resultaat"
 msgid "Start checking at %s\n"
 msgstr "Begin testen vanaf %s\n"
 
+#, fuzzy
+msgid " (cached)"
+msgstr " (uit de cache)\n"
+
 msgid "Thats it. "
 msgstr "Dat was het. "
 

-URL: - -
Recursion Level: - -	-Check anchors in HTML: -
- -Log only errors: -	-Check only intern links: -
Url:	+ +
Options:	Recursion Level:	+	Check anchors in HTML:
	-Output language: -	-Check strict intern links: -	Log only errors:	Check only intern links:
	Output language:	+	Check strict intern links: