[Zope-Checkins] (for Philipp von Weitershausen) CVS: Zope3/src/zope/app/browser/skins/zopetop - standardmacros.py:1.7 view_macros.pt:1.3 widget_macros.pt:1.3

Sat Dec 6 12:34:02 EST 2003

(I accidentally caused misdirectino of a few checkin messages, so i'm
forwarding them back to teh right place...  klm.)

From: Philipp von Weitershausen <cvs-admin at zope.org>
Sender: cvs-admin at zope.org
Subject: CVS: Zope3/src/zope/app/browser/skins/zopetop - standardmacros.py:1.7 view_macros.pt:1.3 widget_macros.pt:1.3
Date: Sat, 6 Dec 2003 12:03:33 -0500
Update of /cvs-repository/Zope3/src/zope/app/browser/skins/zopetop
In directory cvs.zope.org:/tmp/cvs-serv2934/zopetop

Modified Files:
standardmacros.py view_macros.pt widget_macros.pt
Log Message:
Separated the XML Javascript tree out into its own template and macros.
This clears the way for your own navigation trees, for example static ones
(e.g. using my soon-to-be-publicly-released statictree product).

Also, made the tree work for the ZopeTop skin again. Rotterdam and ZopeTop
share the same code now, so code duplication was reduced.


=== Zope3/src/zope/app/browser/skins/zopetop/standardmacros.py 1.6 => 1.7 ===

--- Zope3/src/zope/app/browser/skins/zopetop/standardmacros.py:1.6 Thu Aug 7 13:31:31 2003
+++ Zope3/src/zope/app/browser/skins/zopetop/standardmacros.py Sat Dec 6 12:03:32 2003
@@ -21,4 +21,5 @@
      StandardMacros as BaseMacros
 
 class StandardMacros(BaseMacros):
- macro_pages = ('view_macros', 'widget_macros', 'dialog_macros')
+ macro_pages = ('view_macros', 'widget_macros', 'dialog_macros',
+ 'navigation_macros')


=== Zope3/src/zope/app/browser/skins/zopetop/view_macros.pt 1.2 => 1.3 ===
--- Zope3/src/zope/app/browser/skins/zopetop/view_macros.pt:1.2 Fri Aug 15 20:43:07 2003
+++ Zope3/src/zope/app/browser/skins/zopetop/view_macros.pt Sat Dec 6 12:03:32 2003
@@ -4,30 +4,23 @@
   lang="en"
   i18n:domain="zope">
 <head metal:define-macro="head">
-<title
- metal:define-slot="title"
- tal:content="options/getTitle|view/getTitle|context/getTitle|default"
- >Zope</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link href="zopetop.css" rel="stylesheet" type="text/css"
+ <title metal:define-slot="title"
+ tal:content="options/getTitle|view/getTitle|context/getTitle|default">
+ Zope
+ </title>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <link href="zopetop.css" rel="stylesheet" type="text/css"
         tal:attributes="href context/++resource++zopetop.css" />
-<script type="text/javascript" src="pdlib.js"
- tal:attributes="src context/++resource++pdlib.js"></script>
-<script type="text/javascript" src="xmltree.js"
- tal:attributes="src string:${context/++resource++xmltree.js}"></script>
+ <script type="text/javascript" src="pdlib.js"
+ tal:attributes="src context/++resource++pdlib.js"></script>
 
-<style type="text/css">
-</style>
-
-<div metal:define-slot="headers">
-</div>
+ <metal:tree use-macro="context/@@standard_macros/navigation_tree_js" />
 
+ <div metal:define-slot="headers">
+ </div>
 
 </head>
-<body onload="loadtree('');"
- tal:define="rooturl request/URL/1;
- thisbaseurl request/URL/-1"
- tal:attributes="onload string:loadtree('${rooturl}/', '${thisbaseurl}/')">
+<body onload="" tal:attributes="onload body_onload">
 
 <div class="top">
   <a href="#" tal:attributes="href string:${request/URL/1}/@@manage">


=== Zope3/src/zope/app/browser/skins/zopetop/widget_macros.pt 1.2 => 1.3 ===
--- Zope3/src/zope/app/browser/skins/zopetop/widget_macros.pt:1.2 Fri Aug 15 20:43:07 2003
+++ Zope3/src/zope/app/browser/skins/zopetop/widget_macros.pt Sat Dec 6 12:03:32 2003
@@ -15,15 +15,7 @@
 </div>
 
 <div class="box" id="navigationTree" metal:define-macro="navigation_box">
-
- <h5 i18n:translate="">Navigation</h5>
-
- <div xmlns="http://www.zope.org/zope3xmltree"
- id="navtreecontents"
- class="body"
- onclick="treeclicked(event);" i18n:translate="">Loading...
- </div>
-
+ <metal:tree use-macro="context/@@standard_macros/navigation_tree_box" />
 </div>
 
 <div class="box" id="commonTasks"


