[Zope3-checkins] CVS: Zope3/src/zope/products/apidoc/browser - configure.zcml:1.2 menu_macros.pt:1.2 mi_small.gif:NONE pl_small.gif:NONE

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/products/apidoc/browser
In directory cvs.zope.org:/tmp/cvs-serv30092/browser

Modified Files:
	configure.zcml menu_macros.pt 
Removed Files:
	mi_small.gif pl_small.gif 
Log Message:
updated to be compatible with latest statictree version.


=== Zope3/src/zope/products/apidoc/browser/configure.zcml 1.1 => 1.2 ===
--- Zope3/src/zope/products/apidoc/browser/configure.zcml:1.1	Thu Jan 29 12:51:14 2004
+++ Zope3/src/zope/products/apidoc/browser/configure.zcml	Sun Feb 15 15:24:48 2004
@@ -4,9 +4,6 @@
 
   <resource name="apidoc.css" file="apidoc.css" />
 
-  <resource name="pl_small.gif" file="pl_small.gif" />
-  <resource name="mi_small.gif" file="mi_small.gif" />
-
   <page
       for="*"
       name="apidoc_macros"


=== Zope3/src/zope/products/apidoc/browser/menu_macros.pt 1.1 => 1.2 ===
--- Zope3/src/zope/products/apidoc/browser/menu_macros.pt:1.1	Thu Jan 29 12:51:14 2004
+++ Zope3/src/zope/products/apidoc/browser/menu_macros.pt	Sun Feb 15 15:24:48 2004
@@ -37,41 +37,57 @@
 
   <metal:block define-slot="menu">
 
-    <table cellspacing="0" class="menu" border="0"
+    <table cellspacing="0" cellpadding="0" class="menu" border="0"
            tal:define="root      context/@@static_cookie_tree;
                        result    root/getFlatDicts;
-                       flatdicts python:result[0];
-                       maxdepth  python:result[1];">
+                       nodeDictList   python:result[0];
+                       maxDepth       python:result[1]">
 
-    <tr tal:repeat="dict flatdicts">
-    <tal:block tal:define="node dict/node">
+    <tr tal:repeat="nodeInfo nodeDictList">
+    <tal:block tal:define="node nodeInfo/node">
 
-      <td style="width:16px" tal:repeat="depth python:range(dict['depth'])" />
-
-      <td style="width:10px">
-        <a href=""
-           tal:attributes="href string:?tree-state=${dict/tree-state}"
-           tal:condition="node/hasChildren"><img
-
-               tal:attributes="src context/++resource++pl_small.gif"
-               tal:condition="not:node/expanded" alt="+" border="0" /><img
-
-               tal:attributes="src context/++resource++mi_small.gif"
-               tal:condition="node/expanded" alt="-" border="0" /></a>
-      </td>
-
-      <td colspan="1" class="list-item"
-          tal:attributes="colspan python:maxdepth - dict['depth'] + 1">
-        <a href="" target="main"
-            tal:attributes="href python: view.getMenuLink(node)"
-            tal:content="python: view.getMenuTitle(node)"
-            tal:condition="python: view.getMenuLink(node) is not None">
-          node/id
-        </a>
-        <tal:block 
-            replace="python: view.getMenuTitle(node)"
-            condition="python: view.getMenuLink(node) is None" />
-      </td>
+  <td style="width:16px" tal:repeat="state nodeInfo/row-state">
+    <img tal:attributes="src context/++resource++tree_images/vline.png"
+         tal:condition="state" alt="|" border="0" />
+  </td>
+
+  <td style="width:16px">
+    <a href=""
+       tal:attributes="href string:?tree-state=${nodeInfo/tree-state}"
+       tal:condition="node/hasChildren">
+      <tal:block condition="not:nodeInfo/last-level-node">
+        <img tal:attributes="src context/++resource++tree_images/plus_vline.png"
+             tal:condition="not:node/expanded" alt="+" border="0" />
+        <img tal:attributes="src context/++resource++tree_images/minus_vline.png"
+             tal:condition="node/expanded" alt="-" border="0" />
+      </tal:block>
+      <tal:block condition="nodeInfo/last-level-node">
+        <img tal:attributes="src context/++resource++tree_images/plus.png"
+             tal:condition="not:node/expanded" alt="+" border="0" />
+        <img tal:attributes="src context/++resource++tree_images/minus.png"
+             tal:condition="node/expanded" alt="-" border="0" />
+      </tal:block>
+    </a>
+
+    <tal:block condition="not:node/hasChildren">
+      <img tal:attributes="src context/++resource++tree_images/tline.png"
+           tal:condition="not:nodeInfo/last-level-node" alt="T" border="0" />
+      <img tal:attributes="src context/++resource++tree_images/lline.png"
+           tal:condition="nodeInfo/last-level-node" alt="L" border="0" />
+    </tal:block>
+  </td>
+
+  <td colspan="1" class="list-item"
+      tal:attributes="colspan python:maxDepth-len(nodeInfo['row-state'])+1">
+    &nbsp;<a href="" target="main"
+        tal:attributes="href python: view.getMenuLink(node)"
+        tal:content="python: view.getMenuTitle(node)"
+        tal:condition="python: view.getMenuLink(node) is not None">
+      node/id
+    </a><tal:block 
+        replace="python: view.getMenuTitle(node)"
+        condition="python: view.getMenuLink(node) is None" />
+  </td>
 
     </tal:block>
     </tr>

=== Removed File Zope3/src/zope/products/apidoc/browser/mi_small.gif ===

=== Removed File Zope3/src/zope/products/apidoc/browser/pl_small.gif ===