[Zope3-checkins] CVS: Zope3/src/zope/app/workflow/stateful/browser - configure.zcml:1.1.2.1 contentworkflow_registry.pt:1.1.2.1 definition_edit.pt:1.1.2.1 instance_manage.pt:1.1.2.1

[Martijn Faassen]

Update of /cvs-repository/Zope3/src/zope/app/workflow/stateful/browser
In directory cvs.zope.org:/tmp/cvs-serv20906/src/zope/app/workflow/stateful/browser

Modified Files:
      Tag: faassen-interfaces-branch
	configure.zcml contentworkflow_registry.pt definition_edit.pt 
	instance_manage.pt 
Log Message:
Sync up with changes in HEAD (so I can generate up to date patch file).


=== Zope3/src/zope/app/workflow/stateful/browser/configure.zcml 1.1 => 1.1.2.1 ===
--- Zope3/src/zope/app/workflow/stateful/browser/configure.zcml:1.1	Sat Apr 24 19:18:24 2004
+++ Zope3/src/zope/app/workflow/stateful/browser/configure.zcml	Tue May 11 05:10:32 2004
@@ -118,12 +118,13 @@
 
 
 <!-- ContentWorkflowsUtility -->
-  <menuItem
-      menu="add_component"
-      for="zope.app.container.interfaces.IAdding"
-      action="ContentWorkflowsManager"
+  <addMenuItem
       title="Content Workflows Manager"
-      description="An utility to manage content and workflow interaction." />
+      description="An utility to manage content and workflow interaction."
+      class=
+          "zope.app.workflow.stateful.contentworkflow.ContentWorkflowsManager"
+      permission="zope.ManageServices"
+      />
 
   <page
       name="index.html"


=== Zope3/src/zope/app/workflow/stateful/browser/contentworkflow_registry.pt 1.1 => 1.1.2.1 ===
--- Zope3/src/zope/app/workflow/stateful/browser/contentworkflow_registry.pt:1.1	Sat Apr 24 19:18:24 2004
+++ Zope3/src/zope/app/workflow/stateful/browser/contentworkflow_registry.pt	Tue May 11 05:10:32 2004
@@ -53,10 +53,15 @@
     </div>
 
     <h3 i18n:translate="">Add new Mapping</h3>
-    <div class="row" 
-         tal:content="structure view/iface_widget/row" />
-    <div class="row" 
-         tal:content="structure view/name_widget/row" />
+    
+    <div class="row" tal:define="widget nocall:view/iface_widget">
+      <metal:block use-macro="context/@@form_macros/widget_row" />
+    </div>
+    
+    <div class="row" tal:define="widget nocall:view/name_widget">
+      <metal:block use-macro="context/@@form_macros/widget_row" />
+    </div>
+    
     <div class="row">
       <div class="controls"> 
          <input type="submit" value="Add Mappings" name="ADD"


=== Zope3/src/zope/app/workflow/stateful/browser/definition_edit.pt 1.1 => 1.1.2.1 ===
--- Zope3/src/zope/app/workflow/stateful/browser/definition_edit.pt:1.1	Sat Apr 24 19:18:24 2004
+++ Zope3/src/zope/app/workflow/stateful/browser/definition_edit.pt	Tue May 11 05:10:32 2004
@@ -14,8 +14,11 @@
 
   <form action="./@@edit.html" method="POST">
     <h3>Set Workflow-Relevant Data Schema</h3>
-    <div class="row"
-         tal:content="structure view/relevantDataSchema_widget/row" />
+
+    <div class="row" tal:define="widget nocall:view/relevantDataSchema_widget">
+      <metal:block use-macro="context/@@form_macros/widget_row" />
+    </div>
+
     <div class="row">
       <div class="controls" style="width: 100%">
         <input type="submit" value="Refresh"
@@ -28,22 +31,19 @@
                condition="widgets">
       <h3 i18n:translate="">Map permissions to Schema fields</h3>
 
-      <tal:block repeat="widget widgets">
-        <h5 tal:content="string:${widget/fieldTitle} (${widget/fieldName})">
+      <tal:block repeat="pwidget widgets">
+        <h5 tal:content="string:${pwidget/fieldTitle} (${pwidget/fieldName})">
           FieldName (Field Title)
         </h5>
-        <div class="row" tal:replace="structure widget/getter/row">
-          <div class="label" i18n:translate="">Get Permission</div>
-          <div class="field">
 
-          </div>
+        <div class="row" tal:define="widget nocall:pwidget/getter">
+          <metal:block use-macro="context/@@form_macros/widget_row" />
         </div>
-        <div class="row" tal:replace="structure widget/setter/row">
-          <div class="label" i18n:translate="">Set Permission</div>
-          <div class="field">
 
-          </div>
+        <div class="row" tal:define="widget nocall:pwidget/setter">
+          <metal:block use-macro="context/@@form_macros/widget_row" />
         </div>
+
       </tal:block>
       <div class="row">
         <div class="controls" style="width: 100%">
@@ -59,4 +59,4 @@
 
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>


=== Zope3/src/zope/app/workflow/stateful/browser/instance_manage.pt 1.1 => 1.1.2.1 ===
--- Zope3/src/zope/app/workflow/stateful/browser/instance_manage.pt:1.1	Sat Apr 24 19:18:24 2004
+++ Zope3/src/zope/app/workflow/stateful/browser/instance_manage.pt	Tue May 11 05:10:32 2004
@@ -66,11 +66,8 @@
      tal:content="status" />
 
   <form name="." method="POST"> 
-    <div class="row" tal:repeat="widget view/widgets"
-        tal:content="structure widget/row">
-      <div class="label" i18n:translate="">Name</div>
-      <div class="field"><input type="text" style="width:100%" /></div>
-    </div>
+    
+    <div metal:use-macro="context/@@form_macros/widget_rows" />
 
     <div class="row">
       <div class="controls">