[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - talkback_tree.pt:1.2.34.2 viewThreadsAtBottom.pt:1.2.34.1

Thu, 1 Aug 2002 11:26:57 -0400

Update of /cvs-repository/CMF/CMFDefault/skins/zpt_generic
In directory cvs.zope.org:/tmp/cvs-serv3865/CMFDefault/skins/zpt_generic

Modified Files:
      Tag: CMF-1_3-branch
	talkback_tree.pt viewThreadsAtBottom.pt 
Log Message:


  - Fixed discussion tree display not to embed entire HTML document
    (Collector #17, thanks to Jeffrey Shell for the inspiration).


=== CMF/CMFDefault/skins/zpt_generic/talkback_tree.pt 1.2.34.1 => 1.2.34.2 ===
 <html>
-<head>
-  <title tal:content="template/title">The title</title>
-</head>
-<body tal:define="t python:here.setup_talkback_tree(here);
-                  height t/root/height;
-                  purl here/portal_url;
-                 ">
-<table cellspacing="0" border="0">
+<body>
+
+<table cellspacing="0" border="0"
+       metal:define-macro="tree"
+       tal:define="t python:here.setup_talkback_tree(here);
+				   height t/root/height;">
  <tr tal:repeat="row t/rows">
-  <td tal:define="indent python:row.depth - 1"
+  <td colspan="1"
+      tal:define="indent python: row.depth - 1"
       tal:condition="indent"
-      tal:attributes="colspan indent" colspan="1">
-  </td>
-  <td width="16" tal:define="rlink row/branch">
+      tal:attributes="colspan indent" ></td>
+  <td width="16"
+      tal:define="rlink row/branch">
    <a href="#" name=""
       tal:condition="rlink"
       tal:attributes="name row/id;
                       href rlink/link"
-      tal:content="structure rlink/img"
-   ><img src="/p_/pl"
-         tal:attributes="src string:${purl}/p_pl;" /></a>
+      tal:content="structure rlink/img"><img src="/p_/pl"></a>
   </td>
   <td colspan="1" width="99%"
-      tal:attributes="colspan python:height-row.depth"
-      tal:define="obj nocall:row/object;
-                  url obj/absolute_url;
-                 ">
-   <a tal:attributes="href url"
-   ><img border="0" src=""
-         tal:attributes="src string:${purl}/${obj/getIcon}" /></a> 
+      tal:attributes="colspan python: height - row.depth"
+      tal:define="obj nocall: row/object;
+                  url obj/absolute_url">
    <a href=""
       tal:attributes="href url"
-      tal:content="obj/Title">Title</a>,
+   ><img border="0" src=""
+         tal:attributes="src string:${obj/portal_url}/${obj/getIcon}" /></a> 
+   <a href=""
+       tal:attributes="href url"
+       tal:content="obj/Title">Title</a>,
    by <span tal:replace="obj/Creator">Me</span>
    on <span tal:replace="obj/CreationDate">Today</span>
   </td>
  </tr>
 </table>
+
 </body>
 </html>


=== CMF/CMFDefault/skins/zpt_generic/viewThreadsAtBottom.pt 1.2 => 1.2.34.1 ===
 <div tal:condition="here/talkback|nothing">
     <div tal:condition="python: here.talkback.hasReplies(here)">
       <h4>Comments:</h4>
-      <span tal:replace="structure here/talkback_tree"></span>
+      <span metal:use-macro="here/talkback_tree/macros/tree"></span>
 	</div>
 </div>