[Repoze-checkins] r1195 - repoze.debug/trunk/repoze/debug/static

[Paul Everitt]

Author: Paul Everitt <paul at agendaless.com>
Date: Mon Jun 30 10:34:55 2008
New Revision: 1195

Log:
Changed default listing to be flat instead of hierarchical.  I'll mostly ignore the hierarchical listing until other stuff is worked out.

Modified:
   repoze.debug/trunk/repoze/debug/static/debugui-entryviewer.xsl
   repoze.debug/trunk/repoze/debug/static/debugui-html.css
   repoze.debug/trunk/repoze/debug/static/debugui-html.xsl

Modified: repoze.debug/trunk/repoze/debug/static/debugui-entryviewer.xsl
==============================================================================
--- repoze.debug/trunk/repoze/debug/static/debugui-entryviewer.xsl	(original)
+++ repoze.debug/trunk/repoze/debug/static/debugui-entryviewer.xsl	Mon Jun 30 10:34:55 2008
@@ -118,7 +118,7 @@
         </xsl:for-each>
         <xsl:choose>
             <xsl:when test="node()">
-                <xsl:text>&gt;</xsl:text>
+                <xsl:text>&gt;</xsl:text><xsl:if test="/*=parent::*"><div>&#xA;</div></xsl:if>
                 <xsl:apply-templates mode="xmlverb">
 
                     <xsl:with-param name="indent-elements" select="$indent-elements"/>
@@ -130,7 +130,6 @@
                     <xsl:value-of select="$indent"/>
                 </xsl:if>
                 <xsl:text>&lt;/</xsl:text>
-
                 <xsl:if test="$ns-prefix != ''">
                     <span class="xmlverb-element-nsprefix">
                         <xsl:value-of select="$ns-prefix"/>
@@ -141,10 +140,10 @@
                     <xsl:value-of select="local-name()"/>
 
                 </span>
-                <xsl:text>&gt;</xsl:text>
+                <xsl:text>&gt;</xsl:text><div>&#xA;</div>
             </xsl:when>
             <xsl:otherwise>
-                <xsl:text> /&gt;</xsl:text>
+                <xsl:text> /&gt;</xsl:text><div>&#xA;</div>
             </xsl:otherwise>
         </xsl:choose>
         <xsl:if test="not(parent::*)">

Modified: repoze.debug/trunk/repoze/debug/static/debugui-html.css
==============================================================================
--- repoze.debug/trunk/repoze/debug/static/debugui-html.css	(original)
+++ repoze.debug/trunk/repoze/debug/static/debugui-html.css	Mon Jun 30 10:34:55 2008
@@ -20,23 +20,23 @@
 #selected-entry {
     margin-left: 260px;
 }
-.tree-entry, .tree-item-entry {
+.tree-group, .tree-item-entry {
     margin-bottom: 0.6em;
 }
 .tree-item {
     margin-left: 0.8em;
 }
-.tree-entry > div > a {
+.tree-group > div > a {
     font-weight:bold;
 }
-.tree-entry a, .tree-item a {
+.tree-group a, .tree-item-entry a {
     text-decoration: none;
     color: black;
     background-color:silver;
     padding-top: 0.2em;
     padding-bottom: 0.2em;
 }
-.tree-entry a:hover, .tree-item a:hover {
+.tree-group a:hover, .tree-item-entry a:hover {
     color:black;
     border:dashed gray 1px;
 }
\ No newline at end of file

Modified: repoze.debug/trunk/repoze/debug/static/debugui-html.xsl
==============================================================================
--- repoze.debug/trunk/repoze/debug/static/debugui-html.xsl	(original)
+++ repoze.debug/trunk/repoze/debug/static/debugui-html.xsl	Mon Jun 30 10:34:55 2008
@@ -4,26 +4,51 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
     <xsl:key name="getsubentry" match="atom:entry" use="atom:content/rz:entry/rz:request/@tid"/>
     <xsl:output method="html" indent="yes"/>
-    <xsl:template match="/atom:feed">
+    <xsl:param name="items-style">flat</xsl:param>
+    <xsl:template match="/">
+        <xsl:choose>
+            <xsl:when test="$items-style='tree'">
+                <!-- Hierarchical listing -->
+                <xsl:apply-templates select="atom:feed" mode="tree"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <!-- Flat listing, no hierarchy -->
+                <xsl:apply-templates select="atom:feed" mode="flat"/>                
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+    <xsl:template match="/atom:feed" mode="flat">
+        <div>
+            <xsl:apply-templates select="atom:entry" mode="item"/>
+        </div>
+    </xsl:template>
+    <xsl:template match="atom:entry" mode="item">
+        <!-- Used by both flat and tree modes -->
+        <div class="tree-item-entry">
+            <a href="{atom:id}">
+                <xsl:value-of select="atom:title"/>
+            </a>
+        </div>
+    </xsl:template>
+    <!-- 
+    
+    Tree representation, ignore for now.
+    
+    -->
+    <xsl:template match="/atom:feed" mode="tree">
         <div>
             <xsl:apply-templates select="atom:entry[atom:content/rz:entry/rz:response/@tid]"
-                mode="entry"/>
+                mode="tree-group"/>
         </div>
     </xsl:template>
-    <xsl:template match="atom:entry" mode="entry">
+    <xsl:template match="atom:entry" mode="tree-group">
         <!-- The parent request is the one with a @tid on the response -->
-        <div class="tree-entry">
+        <div class="tree-group">
             <xsl:apply-templates select="." mode="item"/>
             <xsl:variable name="thistid" select="atom:content/rz:entry/rz:response/@tid"/>
-            <div class="tree-item"><xsl:apply-templates select="key('getsubentry', $thistid)" mode="item"/></div>
-        </div>
-    </xsl:template>
-    <xsl:template match="atom:entry" mode="item">
-        <!-- The parent request is the one with a @tid on the response -->
-            <div class="tree-item-entry">
-                <a href="{atom:id}">
-                    <xsl:value-of select="atom:title"/>
-                </a>
+            <div class="tree-item">
+                <xsl:apply-templates select="key('getsubentry', $thistid)" mode="item"/>
+            </div>
         </div>
     </xsl:template>
 </xsl:stylesheet>