[Zope3-checkins] CVS: ZopeProducts/RotterdamSprint - configure.zcml:1.9 template.pt:1.10

Wed, 4 Dec 2002 11:34:38 -0500

Update of /cvs-repository/ZopeProducts/RotterdamSprint
In directory cvs.zope.org:/tmp/cvs-serv8292

Modified Files:
	configure.zcml template.pt 
Log Message:
merged conflicts

=== ZopeProducts/RotterdamSprint/configure.zcml 1.8 => 1.9 ===

--- ZopeProducts/RotterdamSprint/configure.zcml:1.8	Wed Dec  4 09:05:12 2002
+++ ZopeProducts/RotterdamSprint/configure.zcml	Wed Dec  4 11:34:38 2002
@@ -9,6 +9,10 @@
 <browser:resource 
     name="zope3.css" file="zope3.css" layer="rotterdam" />
 
+<browser:resource 
+    name="xmltree.js" file="xmltree.js" layer="rotterdam" />
+
+
 <browser:view 
     name="template"
     permission="Zope.View"


=== ZopeProducts/RotterdamSprint/template.pt 1.9 => 1.10 ===
--- ZopeProducts/RotterdamSprint/template.pt:1.9	Wed Dec  4 10:22:40 2002
+++ ZopeProducts/RotterdamSprint/template.pt	Wed Dec  4 11:34:38 2002
@@ -16,10 +16,12 @@
 
     <metal:block define-slot="ecmascript_slot" />
 
-    <script type="text/javascript" src="xmltree.js"></script>
+<script type="text/javascript" src="xmltree.js" 
+        tal:attributes="src string: ${context/++resource++xmltree.js}"></script>
 
   </head>
-  <body onload="loadtree();">
+  <body tal:attributes="onload string:loadtree('${request/URL/1}/');;" 
+        onload="loadtree('');">
 
     <div id="global">
       Global elements
@@ -94,6 +96,7 @@
 
       <div id="messages">
         Status and error messages
+<div id="logger"></div>
       </div>
       </metal:block>
     </div>



