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

Jan-Wijbrand Kolman jw@infrae.com
Wed, 4 Dec 2002 11:54:38 -0500


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

Modified Files:
	configure.zcml template.pt 
Log Message:
bug fix in script declaration, resolving CVS conflicts, up2date config

=== ZopeProducts/RotterdamSprint/configure.zcml 1.9 => 1.10 ===
--- ZopeProducts/RotterdamSprint/configure.zcml:1.9	Wed Dec  4 11:34:38 2002
+++ ZopeProducts/RotterdamSprint/configure.zcml	Wed Dec  4 11:54:37 2002
@@ -12,7 +12,6 @@
 <browser:resource 
     name="xmltree.js" file="xmltree.js" layer="rotterdam" />
 
-
 <browser:view 
     name="template"
     permission="Zope.View"
@@ -24,19 +23,22 @@
    permission="Zope.View"
    factory=".XmlObjectView.">
    <browser:page name="children.xml" attribute="children" />
-  </browser:view>
+</browser:view>
 
 <!-- below overrides the standard_macros by Rotterdam Skin -->
-<browser:view name="standard_macros"
-              permission="Zope.View"
-              factory=".StandardMacros."
-              layer="rotterdam"
-              allowed_interface="Zope.App.ZMI.StandardMacros.IStandardMacros" />
+<browser:view
+    name="standard_macros"
+    permission="Zope.View"
+    factory=".StandardMacros."
+    layer="rotterdam"
+    allowed_interface="Zope.App.ZMI.StandardMacros.IStandardMacros" />
+
+<browser:view 
+    name="skin_macros"
+    permission="Zope.View"
+    layer="rotterdam"
+    template="template.pt" />
 
-<browser:view name="skin_macros"
-              permission="Zope.View"
-              layer="rotterdam"
-              template="template.pt" />
 
 <!-- lets include rotterdam versions of ZMI views -->
 <browser:view


=== ZopeProducts/RotterdamSprint/template.pt 1.10 => 1.11 ===
--- ZopeProducts/RotterdamSprint/template.pt:1.10	Wed Dec  4 11:34:38 2002
+++ ZopeProducts/RotterdamSprint/template.pt	Wed Dec  4 11:54:37 2002
@@ -16,13 +16,12 @@
 
     <metal:block define-slot="ecmascript_slot" />
 
-<script type="text/javascript" src="xmltree.js" 
-        tal:attributes="src string: ${context/++resource++xmltree.js}"></script>
+    <script type="text/javascript" src="xmltree.js" 
+      tal:attributes="src string:${context/++resource++xmltree.js}" />
 
   </head>
   <body tal:attributes="onload string:loadtree('${request/URL/1}/');;" 
         onload="loadtree('');">
-
     <div id="global">
       Global elements
     </div>
@@ -32,18 +31,20 @@
     </div>
   
     <div id="breadcrumbs">
-        You are here:&nbsp;
-        <metal:block use-macro="views/standard_macros/breadcrumbs">
+      You are here:&nbsp;
+      <metal:block use-macro="views/standard_macros/breadcrumbs">
         Breadcrumb navigation
-        </metal:block>
+      </metal:block>
     </div>
 
     <div id="navigators">
-
       <div class="box" id="navigationTree">
         <h3>Navigation</h3>
-        <div id="navtreecontents" class="body" onclick="togglenodes(event);" onmousemove="togglecursor(event);">
-
+        <div 
+          id="navtreecontents" 
+          class="body" 
+          onclick="togglenodes(event);" 
+          onmousemove="togglecursor(event);">
         </div>
       </div>
 
@@ -59,52 +60,49 @@
 
         </div>
       </div>
-
     </div>
 
-
     <div id="content">
-      <div class="itemViews" metal:define-macro="zmi_tabs">
+      <div class="itemViews"
+        metal:define-macro="zmi_tabs">
         <tal:block repeat="view views/standard_macros/getZMIViews">
-          <a href="" tal:attributes="href view/action" tal:content="view/title">
+          <a href="" 
+            tal:attributes="href view/action" 
+            tal:content="view/title">
             label
           </a>
         </tal:block>
       </div>
 
       <metal:block define-slot="body">
-      <div class="item">
-
-        <table class="listing">
-          <thead>
-            <th>Test</th><th>Another</th>
-          </thead>
-
-          <tbody>
-            <tr>
-              <td>content</td>
-              <td>thingy</td>
-            </tr>
-
-            <tr class="even">
-              <td>more</td>
-              <td>data</td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
+        <div class="item">
+          <table class="listing">
+            <thead>
+              <th>Test</th><th>Another</th>
+            </thead>
+
+            <tbody>
+              <tr>
+                <td>content</td>
+                <td>thingy</td>
+              </tr>
+
+              <tr class="even">
+                <td>more</td>
+                <td>data</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </metal:block>
 
       <div id="messages">
         Status and error messages
-<div id="logger"></div>
+        <div id="logger"></div>
       </div>
-      </metal:block>
     </div>
 
-    
-    
     <div id="helpers">
-    
       <div class="box" id="itemHelp">
         <h3>Item Help</h3>
         <div class="body">
@@ -114,15 +112,11 @@
           <div class="content even">
             and some more
           </div>
-
         </div>
       </div>
-
     </div>
 
-
     <div id="inspectors">
-
       <div class="box" id="metadata">
         <h3>Metadata</h3>
         <div class="body">
@@ -132,15 +126,10 @@
           <div class="content even">
             and some more
           </div>
-
         </div>
       </div>
-
     </div>
 
-
-
   </body>
 </html>
-</metal:block>
-
+</metal:block>
\ No newline at end of file