diff options
-rw-r--r-- | src/log2xml/log2html.xsl | 49 | ||||
-rw-r--r-- | src/log2xml/logfile.css | 44 |
2 files changed, 43 insertions, 50 deletions
diff --git a/src/log2xml/log2html.xsl b/src/log2xml/log2html.xsl index 4a9a6f4527be..cb56a3cb4bf8 100644 --- a/src/log2xml/log2html.xsl +++ b/src/log2xml/log2html.xsl @@ -1,7 +1,9 @@ <?xml version="1.0"?> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - + + <xsl:output method='html' /> + <xsl:template match="logfile"> <html> <head> @@ -9,37 +11,30 @@ <title>Log File</title> </head> <body> - <xsl:apply-templates/> + <ul class='toplevel'> + <xsl:for-each select='line|nest'> + <li> + <xsl:apply-templates select='.'/> + </li> + </xsl:for-each> + </ul> </body> </html> </xsl:template> <xsl:template match="nest"> - <div class='nesting'> - <div class='head'> - <xsl:apply-templates select='head'/> - </div> - <blockquote class='body'> - <xsl:for-each select='line|nest'> - <xsl:if test="position() != last()"> - <div class='line'> - <span class='lineconn' /> - <span class='linebody'> - <xsl:apply-templates select='.'/> - </span> - </div> - </xsl:if> - <xsl:if test="position() = last()"> - <div class='lastline'> - <span class='lineconn' /> - <span class='linebody'> - <xsl:apply-templates select='.'/> - </span> - </div> - </xsl:if> - </xsl:for-each> - </blockquote> - </div> + <xsl:apply-templates select='head'/> + <ul class='nesting'> + <xsl:for-each select='line|nest'> + <xsl:param name="class"><xsl:choose><xsl:when test="position() != last()">line</xsl:when><xsl:otherwise>lastline</xsl:otherwise></xsl:choose></xsl:param> + <li class='{$class}'> + <span class='lineconn' /> + <span class='linebody'> + <xsl:apply-templates select='.'/> + </span> + </li> + </xsl:for-each> + </ul> </xsl:template> <xsl:template match="head|line"> diff --git a/src/log2xml/logfile.css b/src/log2xml/logfile.css index 6ae1b08e2bc5..9b3b56da3071 100644 --- a/src/log2xml/logfile.css +++ b/src/log2xml/logfile.css @@ -4,41 +4,42 @@ body { } -blockquote.body { - padding: 6px 0px; - margin: 0px 0px; +ul.nesting, ul.toplevel { + padding: 0; + margin: 0; } +ul.toplevel { + list-style-type: none; +} -div.line, div.lastline { +ul.nesting li.line, ul.nesting li.lastline { position: relative; + list-style-type: none; } -div.line { - border-left: 0.1em solid #6185a0; +ul.nesting li.line { + padding-left: 1.1em; } -span.lineconn { - position: absolute; - height: 0.5em; - width: 1em; - border-bottom: 0.1em solid #6185a0; +ul.nesting li.lastline { + padding-left: 1.2em; } -div.lastline > span.lineconn { +li.line { border-left: 0.1em solid #6185a0; } -span.linebody { - position: relative; -} - -div.line > span.linebody { - left: 1.1em; +li.line > span.lineconn, li.lastline > span.lineconn { + position: absolute; + height: 0.65em; + left: 0em; + width: 1em; + border-bottom: 0.1em solid #6185a0; } -div.lastline > span.linebody { - left: 1.2em; +li.lastline > span.lineconn { + border-left: 0.1em solid #6185a0; } @@ -49,13 +50,11 @@ em.storeref width: 100%; } - em.storeref:hover { background-color: #eeeeee; } - *.popup { display: none; /* background: url('http://losser.st-lab.cs.uu.nl/~mbravenb/menuback.png') repeat; */ @@ -69,7 +68,6 @@ em.storeref:hover z-index: 100; } - em.storeref:hover span.popup { display: inline; } |