From 41d7d63339df1208dfa12303f1d665bfb37d01c7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 20 Feb 2013 00:54:03 +0100
Subject: [PATCH] Simplify the tree implementation a bit more

---
 src/root/deps.tt             | 12 ++++++------
 src/root/static/css/tree.css | 33 ++++++++++++++-------------------
 src/xsl/log2html.xsl         |  3 +--
 3 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/src/root/deps.tt b/src/root/deps.tt
index 80c2a92f..3cb59770 100644
--- a/src/root/deps.tt
+++ b/src/root/deps.tt
@@ -7,12 +7,12 @@
 [% job = build.job %]
 
 [% BLOCK renderNode %]
-  <li>
+  <li class="treenode">
     [% IF done.${node.path} %]
-      <p><tt>[% node.name %]</tt> (<em>repeated</em>)</p>
+      <span class="treeline"><tt>[% node.name %]</tt> (<em>repeated</em>)</span>
     [% ELSE %]
       [% done.${node.path} = 1 %]
-      <p>
+      <span class="treeline">
         [% IF node.buildStep %]
           <a href="[% c.uri_for('/build' node.buildStep.get_column('build')) %]"><tt>[% node.name %]</tt></a> [%
             IF log_exists(node.buildStep.drvpath);
@@ -21,7 +21,7 @@
         [% ELSE %]
           <tt>[% node.name %]</tt>
         [% END %]
-      </p>
+      </span>
       [% IF node.refs.size > 0 %]
         <ul>
           [% FOREACH ref IN node.refs; INCLUDE renderNode node=ref; END %]
@@ -34,7 +34,7 @@
 <a name="runtime"></a>
 <h2>Runtime dependency graph</h2>
 [% IF available %]
-<ul>
+<ul class="tree">
   [% done={}; FOREACH node IN runtimeGraph; INCLUDE renderNode; END %]
 </ul>
 [% ELSE %]
@@ -44,7 +44,7 @@
 <a name="buildtime"></a>
 <h2>Build-time dependency graph</h2>
 [% IF drvAvailable %]
-<ul>
+<ul class="tree">
   [% INCLUDE renderNode node=buildTimeGraph %]
 </ul>
 [% ELSE %]
diff --git a/src/root/static/css/tree.css b/src/root/static/css/tree.css
index 2d1c3646..71df2f12 100644
--- a/src/root/static/css/tree.css
+++ b/src/root/static/css/tree.css
@@ -4,27 +4,27 @@ ul.tree, ul.subtree {
     list-style-type: none;
 }
 
-/* Indent each tree level. */
-li.tree-line {
+/* Indent each tree level and draw vertical tree lines next to all
+   children except the last. */
+ul.subtree > li {
     position: relative;
     padding-left: 2.0em;
-}
-
-li.tree-line:last-child {
-    padding-left: 2.1em; /* for the 0.1em border-left in the last child */
-}
-
-/* Draw vertical tree lines next to all children except the last. */
-li.tree-line {
     border-left: 0.1em solid #6185a0;
 }
 
-li.tree-line:last-child {
+ul.subtree > li:last-child {
+    padding-left: 2.1em; /* for the 0.1em border-left in the last child */
     border-left: 0;
 }
 
+/* Draw the vertical tree line to the last child. */
+ul.subtree > li:last-child > *:first-child:before {
+    border-left: 0.1em solid #6185a0;
+}
+
 /* Draw horizontal tree lines to all children. */
-span.tree-conn {
+ul.subtree > li > *:first-child:before {
+    content: "";
     position: absolute;
     height: 0.65em;
     left: 0em;
@@ -32,13 +32,8 @@ span.tree-conn {
     border-bottom: 0.1em solid #6185a0;
 }
 
-/* Draw the vertical tree line to the last child. */
-li.tree-line:last-child > span.tree-conn {
-    border-left: 0.1em solid #6185a0;
-}
-
-.tree-toggle {
+/* Ensure that the + and - have the same size. */
+a.tree-toggle {
     text-decoration: none;
     font-family: monospace;
-    font-size: larger;
 }
diff --git a/src/xsl/log2html.xsl b/src/xsl/log2html.xsl
index d8e27f8b..fbd5615f 100644
--- a/src/xsl/log2html.xsl
+++ b/src/xsl/log2html.xsl
@@ -45,8 +45,7 @@
 
       <ul class='subtree' style="{$style}">
         <xsl:for-each select='line|nest'>
-          <li class='tree-line'>
-            <span class='tree-conn' />
+          <li>
             <xsl:apply-templates select='.'/>
           </li>
         </xsl:for-each>