[Zope3-checkins] CVS: Zope3/src/zope/app/browser/skins/rotterdam -
dialog_macros.pt:1.8.18.1 template.pt:1.43.2.1
Christian Zagrodnick
cvs-admin at zope.org
Sat Dec 6 13:29:49 EST 2003
Update of /cvs-repository/Zope3/src/zope/app/browser/skins/rotterdam
In directory cvs.zope.org:/tmp/cvs-serv16289/src/zope/app/browser/skins/rotterdam
Modified Files:
Tag: gotcha-usage-branch
dialog_macros.pt template.pt
Log Message:
finished the support of 'usage' in page templates (or better views)
- repaired editForm
- added to addForm
- added <usage name=.. /> zcml directive
- directives that rely on usage check for existing usages
- asserting that a usage can only be defined once
- tried use of usage in container/add.pt
=== Zope3/src/zope/app/browser/skins/rotterdam/dialog_macros.pt 1.8 => 1.8.18.1 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/dialog_macros.pt:1.8 Wed Aug 6 10:41:54 2003
+++ Zope3/src/zope/app/browser/skins/rotterdam/dialog_macros.pt Sat Dec 6 13:29:18 2003
@@ -42,6 +42,8 @@
>
<div id="global">
+ <div tal:content="string:Usage:${usage}"></div>
+ <div tal:content="nocall:view"></div>
<img tal:attributes="src context/++resource++zope3logo.gif" />
</div>
=== Zope3/src/zope/app/browser/skins/rotterdam/template.pt 1.43 => 1.43.2.1 ===
--- Zope3/src/zope/app/browser/skins/rotterdam/template.pt:1.43 Sat Dec 6 12:03:32 2003
+++ Zope3/src/zope/app/browser/skins/rotterdam/template.pt Sat Dec 6 13:29:18 2003
@@ -34,6 +34,7 @@
<body onload="" tal:attributes="onload body_onload">
<div id="global">
+ <div tal:content="usage"></div>
<div id="userDetails">
<metal:block define-macro="logged_user">
<span tal:omit-tag="" i18n:translate="">User:</span>
@@ -58,17 +59,20 @@
<div id="navigators">
<!-- Navigation tree box -->
- <metal:tree use-macro="context/@@standard_macros/navigation_tree_box" />
-
- <div class="box" id="commonTasks"
- tal:define="view context/@@commonTasks|nothing"
- tal:condition="view/strip|nothing">
-
- <h4 i18n:translate="">Common Tasks</h4>
- <div class="body">
- <span tal:replace="structure view" />
+ <metal:tree tal:condition="usage/objectview"
+ use-macro="context/@@standard_macros/navigation_tree_box" />
+
+ <tal:usage condition="usage/objectview">
+ <div class="box" id="commonTasks"
+ tal:define="view context/@@commonTasks|nothing"
+ tal:condition="view/strip|nothing">
+
+ <h4 i18n:translate="">Common Tasks</h4>
+ <div class="body">
+ <span tal:replace="structure view" />
+ </div>
</div>
- </div>
+ </tal:usage>
<!-- Tree of the help topics that appears on the help namespace -->
<div class="box" id="help"
@@ -87,11 +91,11 @@
<div id="workspace">
- <div id="breadcrumbs"
- metal:define-macro="breadcrumbs">
- <div tal:omit-tag="" i18n:translate="">Location: </div><tal:block
- repeat="breadcrumb context/@@absolute_url/breadcrumbs">
- <a href=""
+ <div tal:condition="usage/objectview" id="breadcrumbs"
+ metal:define-macro="breadcrumbs"
+ > <div tal:omit-tag="" i18n:translate="">Location: </div><tal:block
+ repeat="breadcrumb context/@@absolute_url/breadcrumbs"
+ ><a href=""
tal:condition="repeat/breadcrumb/start"
tal:attributes="
href string:${breadcrumb/url}/@@SelectedManagementView.html"
@@ -105,7 +109,7 @@
breadcrumb item</a> / </tal:block>
</div>
- <div class="itemViews"
+ <div tal:condition="usage/objectview" class="itemViews"
metal:define-slot="tabs">
<tal:block repeat="view context/@@view_get_menu/zmi_views">
<a href=""
@@ -119,7 +123,7 @@
</div>
<!-- OnlineHelp with popup support -->
- <div id="actions"
+ <div tal:condition="usage/objectview" id="actions"
tal:define="help_actions context/@@view_get_menu/help_actions;
actions context/@@view_get_menu/zmi_actions"
metal:define-slot="tabs">
More information about the Zope3-Checkins
mailing list