[Checkins] SVN: zope.app.apidoc/trunk/ modernize some of the templates. an increment towards having this work with Chameleon templates.
Gary Poster
gary.poster at canonical.com
Wed Dec 15 17:57:49 EST 2010
Log message for revision 118939:
modernize some of the templates. an increment towards having this work with Chameleon templates.
Changed:
U zope.app.apidoc/trunk/CHANGES.txt
U zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/chapter.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/menu.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/static_menu.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/browser/contents.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/browser/details_macros.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/browser/index.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/browser/menu.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/browser/menu_macros.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/browser/modules.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/browser/prefmenu.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/browser/static_contents.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/browser/static_menu.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/browser/static_modules.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/class_index.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/function_index.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/introspector.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/introspector.txt
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/menu.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/module_index.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/static_menu.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/textfile_index.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/zcmlfile_index.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/iface_macros.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/index.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/menu.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/static_menu.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/menu.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/static_menu.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/index.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/menu.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/static_menu.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/index.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/menu.pt
U zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/static_menu.pt
-=-
Modified: zope.app.apidoc/trunk/CHANGES.txt
===================================================================
--- zope.app.apidoc/trunk/CHANGES.txt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/CHANGES.txt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -5,6 +5,7 @@
3.7.6 (unreleased)
------------------
+- Modernize some of the templates. An increment towards having zope.app.apidoc compatible with Chameleon.
3.7.5 (2010-09-12)
------------------
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/chapter.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/chapter.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/chapter.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/details">
+<html metal:use-macro="context/@@apidoc_macros/details">
<body metal:fill-slot="contents">
<div tal:content="structure view/topicContent" />
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/menu.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/menu.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/menu.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/menu">
+<html metal:use-macro="context/@@apidoc_macros/menu">
<body>
</body>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/static_menu.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/static_menu.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/static_menu.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/static_menu">
+<html metal:use-macro="context/@@apidoc_macros/static_menu">
<body>
</body>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/browser/contents.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/browser/contents.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/browser/contents.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/details"
+<html metal:use-macro="context/@@apidoc_macros/details"
i18n:domain="zope">
<body metal:fill-slot="contents">
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/browser/details_macros.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/browser/details_macros.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/browser/details_macros.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<metal:block define-macro="details"><metal:block define-slot="doctype"><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"></metal:block>
+<metal:block define-macro="details"><metal:block define-slot="doctype"><tal:doctype tal:replace="structure string:<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">" /></metal:block>
<html
xmlns="http://www.w3.org/1999/xhtml"
@@ -24,8 +24,6 @@
tal:attributes="href context/++resource++favicon.png|default" />
</head>
-<head>
-
<body metal:define-slot="contents">
</body>
@@ -41,7 +39,7 @@
tal:attributes="
id string:${elementId}.arrow;
src context/++resource++harrow.png;
- onClick string:javascript:switchDisplay('${elementId}')">
+ onClick string:javascript:switchDisplay('${elementId}')" />
<img src="/@@/varrow.png" border="0" id=".arrow" onClick=""
style="vertical-align: middle"
@@ -49,7 +47,7 @@
tal:attributes="
id string:${elementId}.arrow;
src context/++resource++varrow.png;
- onClick string:javascript:switchDisplay('${elementId}')">
+ onClick string:javascript:switchDisplay('${elementId}')" />
</metal:block>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/browser/index.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/browser/index.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/browser/index.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -6,10 +6,10 @@
</head>
<frameset cols="20%, *">
<frameset rows="140, *">
- <frame name="modules" src="modulelist.html">
- <frame name="menu" src="menu.html">
+ <frame name="modules" src="modulelist.html" />
+ <frame name="menu" src="menu.html" />
</frameset>
- <frame name="main" src="contents.html">
+ <frame name="main" src="contents.html" />
</frameset>
</html>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/browser/menu.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/browser/menu.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/browser/menu.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/menu"
+<html metal:use-macro="context/@@apidoc_macros/menu"
i18n:domain="zope">
<body>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/browser/menu_macros.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/browser/menu_macros.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/browser/menu_macros.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<metal:block define-macro="menu"><metal:block define-slot="doctype"><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"></metal:block>
+<metal:block define-macro="menu"><metal:block define-slot="doctype"><tal:doctype tal:replace="structure string:<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">" /></metal:block>
<html
xmlns="http://www.w3.org/1999/xhtml"
@@ -20,8 +20,6 @@
tal:attributes="href context/++resource++favicon.png|default" />
</head>
-<head>
-
<body class="menu">
<metal:block define-slot="menu-title">
@@ -48,7 +46,7 @@
<td style="width:16px">
<a href=""
- tal:attributes="href
+ tal:attributes="href
string:${request/getURL}?tree-state=${nodeInfo/tree-state}"
tal:condition="node/hasChildren">
<tal:block condition="not:nodeInfo/last-level-node">
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/browser/modules.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/browser/modules.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/browser/modules.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,6 +1,6 @@
-<html metal:use-macro="views/apidoc_macros/details"
+<html metal:use-macro="context/@@apidoc_macros/details"
i18n:domain="zope">
-<body metal:fill-slot="contents"
+<body metal:fill-slot="contents"
style="padding: 0; margin: 0">
<div class="apihead">
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/browser/prefmenu.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/browser/prefmenu.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/browser/prefmenu.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/menu">
+<html metal:use-macro="context/@@apidoc_macros/menu">
<body>
<div class="menu" metal:fill-slot="menu-title" i18n:translate="">
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/browser/static_contents.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/browser/static_contents.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/browser/static_contents.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/details"
+<html metal:use-macro="context/@@apidoc_macros/details"
i18n:domain="zope">
<body metal:fill-slot="contents">
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/browser/static_menu.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/browser/static_menu.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/browser/static_menu.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/static_menu"
+<html metal:use-macro="context/@@apidoc_macros/static_menu"
i18n:domain="zope">
<body>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/browser/static_modules.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/browser/static_modules.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/browser/static_modules.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,6 +1,6 @@
-<html metal:use-macro="views/apidoc_macros/details"
+<html metal:use-macro="context/@@apidoc_macros/details"
i18n:domain="zope">
-<body metal:fill-slot="contents"
+<body metal:fill-slot="contents"
style="padding: 0; margin: 0">
<div class="apihead">
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/class_index.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/class_index.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/class_index.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/details"
+<html metal:use-macro="context/@@apidoc_macros/details"
i18n:domain="zope">
<body metal:fill-slot="contents">
@@ -7,7 +7,7 @@
<span tal:replace="context/getPath">zope.app.Klass</span>
</h1>
- <p metal:use-macro="views/apidoc_macros/breadcrumbs" />
+ <p metal:use-macro="context/@@apidoc_macros/breadcrumbs" />
<div class="indent">
<div class="documentation" i18n:translate=""
@@ -69,7 +69,7 @@
<div tal:condition="init">
<b><code
tal:content="string:__init__${init/signature}" />
- </b><br>
+ </b><br />
<div class="inline documentation" tal:content="structure init/doc">
method desc
</div>
@@ -143,7 +143,7 @@
<li tal:repeat="method view/getMethods">
<b><code
tal:content="string:${method/name}${method/signature}" />
- </b><br>
+ </b><br />
<div class="inline documentation" tal:content="structure method/doc">
method desc
</div>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/function_index.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/function_index.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/function_index.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/details"
+<html metal:use-macro="context/@@apidoc_macros/details"
i18n:domain="zope">
<body metal:fill-slot="contents">
@@ -7,7 +7,7 @@
<span tal:replace="context/getPath">zope.app.function</span>
</h1>
- <p metal:use-macro="views/apidoc_macros/breadcrumbs" />
+ <p metal:use-macro="context/@@apidoc_macros/breadcrumbs" />
<h2 class="details-section" i18n:translate="">Signature</h2>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/introspector.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/introspector.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/introspector.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -164,7 +164,7 @@
<li tal:repeat="method view/getMethods">
<b><code
tal:content="string:${method/name}${method/signature}" />
- </b><br>
+ </b><br />
<div class="inline documentation" tal:content="structure method/doc">
method desc
</div>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/introspector.txt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/introspector.txt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/introspector.txt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -103,7 +103,7 @@
<ul class="attr-list">
<li>
<b><code>get(name, default=None)</code>
- </b><br>
+ </b><br />
<div class="inline documentation"><p>Return ... </div>
<span class="small">
<i>Interface:</i>
@@ -197,7 +197,7 @@
<div class="indent">
<div>
<b><code>__init__(dict=None, **kwargs)</code>
- </b><br>
+ </b><br />
<div class="inline documentation"></div>
</div>
</div>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/menu.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/menu.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/menu.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/menu"
+<html metal:use-macro="context/@@apidoc_macros/menu"
i18n:domain="zope">
<body>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/module_index.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/module_index.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/module_index.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/details"
+<html metal:use-macro="context/@@apidoc_macros/details"
i18n:domain="zope">
<body metal:fill-slot="contents"
tal:define="rootURL view/getAPIDocRootURL">
@@ -25,7 +25,7 @@
</span>
</h1>
- <p metal:use-macro="views/apidoc_macros/breadcrumbs" />
+ <p metal:use-macro="context/@@apidoc_macros/breadcrumbs" />
<div class="highlight documentation"
tal:define="doc view/getDoc"
@@ -118,7 +118,7 @@
<li tal:repeat="function functions">
<b><code
tal:content="string:${function/name}${function/signature}" />
- </b><br>
+ </b><br />
<div class="inline documentation" tal:content="structure function/doc">
function desc
</div>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/static_menu.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/static_menu.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/static_menu.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/static_menu"
+<html metal:use-macro="context/@@apidoc_macros/static_menu"
i18n:domain="zope">
<body>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/textfile_index.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/textfile_index.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/textfile_index.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/details">
+<html metal:use-macro="context/@@apidoc_macros/details">
<head>
<base href=""
metal:fill-slot="headers"
@@ -12,7 +12,7 @@
<span tal:replace="context/zope:name">README.txt</span>
</h1>
- <p metal:use-macro="views/apidoc_macros/breadcrumbs" />
+ <p metal:use-macro="context/@@apidoc_macros/breadcrumbs" />
<div class="documentation"
tal:content="structure view/renderedContent">
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/zcmlfile_index.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/zcmlfile_index.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/zcmlfile_index.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/details">
+<html metal:use-macro="context/@@apidoc_macros/details">
<head>
<base href=""
metal:fill-slot="headers"
@@ -57,7 +57,7 @@
<span tal:replace="context/zope:name">configure.zcml</span>
</h1>
- <p metal:use-macro="views/apidoc_macros/breadcrumbs" />
+ <p metal:use-macro="context/@@apidoc_macros/breadcrumbs" />
<div tal:replace="structure context/rootElement/@@display" />
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/iface_macros.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/iface_macros.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/iface_macros.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -30,7 +30,7 @@
<metal:block define-macro="method">
<b><code
tal:content="string:${method/name}${method/signature}" />
- </b><br>
+ </b><br />
<div class="inline-documentation" tal:content="structure method/doc">
method desc
</div>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/index.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/index.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/index.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -8,7 +8,7 @@
<span tal:replace="view/getId">zope.app.interfaces.IInterface</span>
</h1>
- <p metal:use-macro="views/apidoc_macros/breadcrumbs" />
+ <p metal:use-macro="context/@@apidoc_macros/breadcrumbs" />
<h3 tal:condition="view/getTypes">
Type:
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/menu.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/menu.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/menu.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/menu"
+<html metal:use-macro="context/@@apidoc_macros/menu"
i18n:domain="zope">
<body>
@@ -12,7 +12,7 @@
<input type="checkbox" name="name_only" value="on" checked="checked" />
<tal:block i18n:translate="">name only search</tal:block>
<br />
- <input type="text" name="search_str"
+ <input type="text" name="search_str"
style="font-size: 80%; width=95%"
tal:attributes="value request/search_str|nothing" />
<input type="submit" name="SUBMIT" value="Find"
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/static_menu.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/static_menu.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/ifacemodule/static_menu.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/static_menu"
+<html metal:use-macro="context/@@apidoc_macros/static_menu"
i18n:domain="zope">
<body>
@@ -15,12 +15,12 @@
<tal:block i18n:translate="">name only search</tal:block>
-->
<br />
- <input type="text" name="search_str"
+ <input type="text" name="search_str"
style="font-size: 80%; width=95%"
- tal:attributes="value request/search_str|nothing"
+ tal:attributes="value request/search_str|nothing"
onKeyup="javascript:simplegetSearchResult(document.searchform.search_str.value)" />
- <!--
- <input type="button" name="Find" value="Find"
+ <!--
+ <input type="button" name="Find" value="Find"
onClick="javascript:getSearchResult(document.searchform.search_str.value)"
i18n:attributes="value find-button" style="font-size: 80%"/>
-->
@@ -28,7 +28,7 @@
<div>
<span i18n:translate="">Search results:</span><br /><br />
- </div>
+ </div>
<div tal:define="ifaces view/findAllInterfaces"
tal:condition="ifaces" id="resultlist">
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/menu.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/menu.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/menu.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,5 +1,5 @@
-<html metal:use-macro="views/apidoc_macros/menu">
+<html metal:use-macro="context/@@apidoc_macros/menu">
<body>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/static_menu.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/static_menu.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/typemodule/static_menu.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,5 +1,5 @@
-<html metal:use-macro="views/apidoc_macros/static_menu">
+<html metal:use-macro="context/@@apidoc_macros/static_menu">
<body>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/index.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/index.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/index.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/details"
+<html metal:use-macro="context/@@apidoc_macros/details"
i18n:domain="zope">
<body metal:fill-slot="contents"
tal:define="iface view/getInterface;
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/menu.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/menu.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/menu.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,5 +1,5 @@
-<html metal:use-macro="views/apidoc_macros/menu">
+<html metal:use-macro="context/@@apidoc_macros/menu">
<body>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/static_menu.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/static_menu.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/utilitymodule/static_menu.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,5 +1,5 @@
-<html metal:use-macro="views/apidoc_macros/static_menu">
+<html metal:use-macro="context/@@apidoc_macros/static_menu">
<body>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/index.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/index.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/index.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/details"
+<html metal:use-macro="context/@@apidoc_macros/details"
i18n:domain="zope">
<body metal:fill-slot="contents"
tal:define="schema view/getSchema;
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/menu.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/menu.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/menu.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/menu"
+<html metal:use-macro="context/@@apidoc_macros/menu"
i18n:domain="zope">
<body>
Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/static_menu.pt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/static_menu.pt 2010-12-15 16:52:00 UTC (rev 118938)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/zcmlmodule/static_menu.pt 2010-12-15 22:57:48 UTC (rev 118939)
@@ -1,4 +1,4 @@
-<html metal:use-macro="views/apidoc_macros/static_menu"
+<html metal:use-macro="context/@@apidoc_macros/static_menu"
i18n:domain="zope">
<body>
More information about the checkins
mailing list