[Zope3-checkins] CVS: Zope3/src/zope/app/browser/workflow/stateful - add.pt:1.5 addstate.pt:1.3 addtransition.pt:1.3 configure.zcml:1.6 content_filter.py:1.4 contentworkflow.py:1.4 contentworkflow_index.pt:1.4 contentworkflow_registry.pt:1.2 definition_edit.pt:1.2 definition_index.pt:1.2 definition_states.pt:1.2 definition_transitions.pt:1.2 filterTest.pt:1.3 filteradapter.py:1.3 instance.py:1.7 instance_manage.pt:1.5 interfaces.py:1.2 published_content.pt:1.3 testobject.zcml:1.3

Stephan Richter srichter at cosmos.phy.tufts.edu
Thu Aug 7 14:42:06 EDT 2003


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

Modified Files:
	add.pt addstate.pt addtransition.pt configure.zcml 
	content_filter.py contentworkflow.py contentworkflow_index.pt 
	contentworkflow_registry.pt definition_edit.pt 
	definition_index.pt definition_states.pt 
	definition_transitions.pt filterTest.pt filteradapter.py 
	instance.py instance_manage.pt interfaces.py 
	published_content.pt testobject.zcml 
Log Message:
Internationalized the rest of zope/app/browser.

I also took the chance to clean up some old code and remove a lot of cruft.
(This is the reason I decided to do it instead of letting a less 
experienced developer do it.)

I now consider I18n of the Zope core done. What does this mean to you?

1. All code you check into the CVS must be internationalized. That means:

   (a) Python and PT code must be properly tagged.

   (b) zope.pot must be updated. This can be done with::

       [zope/app/translation_files]$ python extract.py

       Note: You do not need to merge the new POT file with the catalogs.

2. Any code snippet that has no I18n is considered a bug! Therefore, please
   take care and do the I18n and make code so when you see missing spots.

Finally I would like to mention that some forms might experience some 
hickups, as I changed and moved around a lot of templates and was not able
to verify them all by hand. Please let me know, if something that used to 
work is not working anymore.


=== Zope3/src/zope/app/browser/workflow/stateful/add.pt 1.4 => 1.5 ===
--- Zope3/src/zope/app/browser/workflow/stateful/add.pt:1.4	Mon Jun 30 13:10:58 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/add.pt	Thu Aug  7 13:41:51 2003
@@ -1,73 +1,75 @@
 <html metal:use-macro="views/standard_macros/dialog">
 <body>
-
 <div metal:fill-slot="body">
-<form action="action.html" method="post">
-<table class="TypeListing" cellpadding="3">
 
-  <caption>Add Content</caption>
+  <form action="action.html" method="post">
+    <table class="TypeListing" cellpadding="3">
+
+      <caption i18n:translate="">Add Content</caption>
+
+        <tbody tal:repeat="info view/addingInfo">
 
-    <tbody tal:repeat="info view/addingInfo">
+        <tr>
 
-    <tr>
+          <td class="Selector">
+            <input type="radio" name="type_name"
+                   tal:attributes="value info/action; id info/action" />
+          </td>
+
+          <td class="TypeName">
+            <label style="font-weight: bold;"
+                   tal:attributes="for info/action">
+              <span tal:replace="info/title" >Folder</span>
+            </label>
+            <div class="TypeDescription" tal:content="info/description">
+              Folders are generic containers for content, including other
+              folders.
+            </div>
+          </td>
+        </tr>
+
+      </tbody>
+
+      <tbody tal:condition="nothing">
+
+        <tr>
+
+          <td class="Selector">
+            <input type="radio" name="type_name" value="" />
+                   
+          </td>
+
+          <td class="TypeName">
+            <img alt="Folder" src="../../ZMI/www/document_icon.gif" />
+            Document
+          </td>
+
+        </tr>
+
+        <tr>
+          <td class="Selector"><br /></td>
+          <td class="TypeDescription">
+              Documents are simple textual content.
+          </td>
+        </tr>
+
+      </tbody>
+
+      <tr>
+        <td><br /></td>
+        <td>
+            <input type="text" name="id"
+                   tal:condition="view/namesAccepted"
+                   tal:attributes="value request/id | nothing"
+            />
+            <input type="submit" value="Add" 
+                   i18n:attributes="value add-button"/>
+        </td>
+      </tr>
 
-      <td class="Selector">
-        <input type="radio" name="type_name"
-               tal:attributes="value info/action; id info/action" />
-      </td>
-
-      <td class="TypeName">
-        <label style="font-weight: bold;"
-               tal:attributes="for info/action">
-          <span tal:replace="info/title" >Folder</span>
-        </label>
-        <div class="TypeDescription" tal:content="info/description">
-          Folders are generic containers for content, including other
-          folders.
-        </div>
-      </td>
-    </tr>
-
-  </tbody>
-
-  <tbody tal:condition="nothing">
-
-    <tr>
-
-      <td class="Selector">
-        <input type="radio" name="type_name" value="" />
-               
-      </td>
-
-      <td class="TypeName">
-        <img alt="Folder" src="../../ZMI/www/document_icon.gif" />
-        Document
-      </td>
-
-    </tr>
-
-    <tr>
-      <td class="Selector"><br /></td>
-      <td class="TypeDescription">
-          Documents are simple textual content.
-      </td>
-    </tr>
-
-  </tbody>
-
-  <tr>
-    <td><br /></td>
-    <td>
-        <input type="text" name="id"
-               tal:condition="view/namesAccepted"
-               tal:attributes="value request/id | nothing"
-        />
-        <input type="submit" value=" Add " />
-    </td>
-  </tr>
+    </table>
+  </form>
 
-</table>
-</form>
 </div>
 </body>
 </html>


=== Zope3/src/zope/app/browser/workflow/stateful/addstate.pt 1.2 => 1.3 ===
--- Zope3/src/zope/app/browser/workflow/stateful/addstate.pt:1.2	Wed Jun 25 14:43:12 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/addstate.pt	Thu Aug  7 13:41:51 2003
@@ -1,31 +1,29 @@
 <html metal:use-macro="views/standard_macros/page">
 <head>
-  <title>Add State</title>
+  <title metal:fill-slot="title" i18n:translate="">Add State</title>
 </head>
+
 <body>
- 
-  <div metal:fill-slot="body">
- 
-    <form action="." method="post" enctype="multipart/form-data">
- 
-      <table>
-        <tbody>
- 
-          <tr>
-            <th>Id:</th>
-            <td>
-              <input type="text" name="id" size="40" value="" />
-            </td>
-          </tr>
- 
-        </tbody>
-      </table>
- 
-      <input type="submit" name="action.html:method" value="Add" />
- 
-    </form>
- 
-  </div>
- 
+<div metal:fill-slot="body">
+
+  <form action="." method="post" enctype="multipart/form-data">
+
+    <div class="row">
+      <div class="label" i18n:translate="">Id</div>
+      <div class="field">
+        <input type="text" name="id" size="40" value="" />
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="controls">
+        <input type="submit" name="action.html:method" value="Add"
+            i18n:attributes="value add-button"/>
+      </div>
+    </div>
+
+  </form>
+
+</div> 
 </body>
 </html>


=== Zope3/src/zope/app/browser/workflow/stateful/addtransition.pt 1.2 => 1.3 ===
--- Zope3/src/zope/app/browser/workflow/stateful/addtransition.pt:1.2	Wed Jun 25 14:43:12 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/addtransition.pt	Thu Aug  7 13:41:51 2003
@@ -1,65 +1,64 @@
 <html metal:use-macro="views/standard_macros/page">
 <head>
-  <title>Add Transition</title>
+  <title metal:fill-slot="title" i18n:translate="">Add Transition</title>
 </head>
+
 <body>
+<div metal:fill-slot="body">
  
-  <div metal:fill-slot="body">
- 
-    <form action="." method="post" enctype="multipart/form-data">
- 
-      <table>
-        <tbody tal:define="states view/getStateNames">
- 
-          <tr>
-            <th>Id:</th>
-            <td>
-              <input type="text" name="id" size="40" value="" />
-            </td>
-          </tr>
-
-          <tr>
-            <th>Source State:</th>
-            <td>
-              <select name="source">
-                <option tal:repeat="state states"
-                        tal:content="state" />
-              </select>
-            </td>
-          </tr>
- 
-          <tr>
-            <th>Destination State:</th>
-            <td>
-              <select name="destination">
-                <option tal:repeat="state states"
-                        tal:content="state" />
-              </select>
-            </td>
-          </tr>
-
-          <tr>
-            <th>Condition:</th>
-            <td>
-              <input type="text" name="condition" size="40" value="" />
-            </td>
-          </tr>
-
-          <tr>
-            <th>Permission:</th>
-            <td>
-              <input type="text" name="permission" size="40" value="" />
-            </td>
-          </tr>
+  <form action="." method="post" enctype="multipart/form-data">
 
-        </tbody>
-      </table>
- 
-      <input type="submit" name="action.html:method" value="Add" />
- 
-    </form>
- 
-  </div>
+    <div class="row">
+      <div class="label" i18n:translate="">Id</div>
+      <div class="field">
+        <input type="text" name="id" size="40" value="" />
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="label" i18n:translate="">Source Satte</div>
+      <div class="field">
+        <select name="source">
+          <option tal:repeat="state states"
+                  tal:content="state" />
+        </select>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="label" i18n:translate="">Destination Satte</div>
+      <div class="field">
+        <select name="destination">
+          <option tal:repeat="state states"
+                  tal:content="state" />
+        </select>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="label" i18n:translate="">Condition</div>
+      <div class="field">
+        <input type="text" name="condition" size="40" value="" />
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="label" i18n:translate="">Permission</div>
+      <div class="field">
+        <!-- XXX: This should be really a Permission widget --> 
+        <input type="text" name="permission" size="40" value="" />
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="controls">
+        <input type="submit" name="action.html:method" value="Add"
+            i18n:attributes="value add-button"/>
+      </div>
+    </div>
+
+  </form>
  
+</div> 
 </body>
 </html>


=== Zope3/src/zope/app/browser/workflow/stateful/configure.zcml 1.5 => 1.6 ===
--- Zope3/src/zope/app/browser/workflow/stateful/configure.zcml:1.5	Sun Aug  3 13:50:07 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/configure.zcml	Thu Aug  7 13:41:51 2003
@@ -1,193 +1,174 @@
 <configure
-   xmlns="http://namespaces.zope.org/zope"
-   xmlns:browser="http://namespaces.zope.org/browser"
-   i18n_domain='zope'
-   >
-
+   xmlns:zope="http://namespaces.zope.org/zope"
+   xmlns="http://namespaces.zope.org/browser">
 
 <!-- Stateful Workflow Process Definition -->
 
-<browser:menuItem
-  menu="add_component"
-  for="zope.app.interfaces.container.IAdding"
-  action="StatefulProcessDefinition"
-  title="Stateful Process Definition"
-  description="A stateful workflow process definition" />
-
-
-<browser:pages
-    for="zope.app.interfaces.workflow.stateful.IStatefulProcessDefinition"
-    class=
-  "zope.app.browser.workflow.stateful.definition.StatefulProcessDefinitionView"
-  permission="zope.ManageServices">
-
-  <browser:page name="index.html" template="definition_index.pt"/>
-
-</browser:pages>
-
-<browser:editform
-  schema="zope.app.interfaces.workflow.stateful.IStatefulProcessDefinition"
-  name="edit.html"
-  template="definition_edit.pt"
-  class=".definition.RelevantDataSchemaEdit"
-  menu="zmi_views" title="Relevant Data Schema"
-  permission="zope.workflow.ManageProcessDefinitions"
-  />
-
-<browser:menuItems
-    for="zope.app.interfaces.workflow.stateful.IStatefulProcessDefinition"
-    menu="zmi_actions">
-  
-  <browser:menuItem 
-      title="Manage States" action="states/contents.html" />
-  <browser:menuItem 
-      title="Manage Transitions" action="transitions/contents.html" />
+  <menuItem
+      menu="add_component"
+      for="zope.app.interfaces.container.IAdding"
+      action="StatefulProcessDefinition"
+      title="Stateful Process Definition"
+      description="A stateful workflow process definition" />
+
+  <page
+      for="zope.app.interfaces.workflow.stateful.IStatefulProcessDefinition"
+      name="index.html" 
+      class=".definition.StatefulProcessDefinitionView"
+      permission="zope.ManageServices"
+      template="definition_index.pt" />
+
+  <editform
+      schema="zope.app.interfaces.workflow.stateful.IStatefulProcessDefinition"
+      name="edit.html"
+      template="definition_edit.pt"
+      class=".definition.RelevantDataSchemaEdit"
+      menu="zmi_views" title="Relevant Data Schema"
+      permission="zope.workflow.ManageProcessDefinitions"/>
+
+  <menuItems
+      for="zope.app.interfaces.workflow.stateful.IStatefulProcessDefinition"
+      menu="zmi_actions">
+    
+    <menuItem 
+        title="Manage States" action="states/contents.html" />
+    <menuItem 
+        title="Manage Transitions" action="transitions/contents.html" />
 
-</browser:menuItems>
+  </menuItems>
 
 
 <!-- States/Transitions Container Adding Menus -->
-<browser:menu id="add_stateful_states" title="State Items" />
-<browser:menu id="add_stateful_transitions" title="Transition Items" />
+  <menu id="add_stateful_states" title="State Items" />
+  <menu id="add_stateful_transitions" title="Transition Items" />
 
 
 <!-- States Container -->
 
-<browser:view
-    for="zope.app.interfaces.workflow.stateful.IStatefulStatesContainer"
-    name="+"
-    menu="zmi_actions" title="Add"
-    class=".definition.StatesContainerAdding"
-    permission="zope.workflow.ManageProcessDefinitions"
-    allowed_attributes="addingInfo"
-    >
-
-    <browser:page name="index.html"  template="add.pt" />
-    <browser:page name="action.html" attribute="action" />
-
-</browser:view>
+  <view
+      for="zope.app.interfaces.workflow.stateful.IStatefulStatesContainer"
+      name="+"
+      menu="zmi_actions" title="Add"
+      class=".definition.StatesContainerAdding"
+      permission="zope.workflow.ManageProcessDefinitions"
+      allowed_attributes="addingInfo">
+  
+    <page name="index.html"  template="add.pt" />
+    <page name="action.html" attribute="action" />
+  
+  </view>
 
 
 <!-- State -->
-<!-- nothing to edit yet
-<browser:editform
-  schema="zope.app.interfaces.workflow.stateful.IState"
-  name="edit.html"
-  menu="zmi_views"
-  label="Edit a State"
-  permission="zope.workflow.ManageProcessDefinitions"
-  />
--->
-
-<browser:addform
-  name="AddState"
-  menu="add_stateful_states" title="Stateful State"
-  schema="zope.app.interfaces.workflow.stateful.IState"
-  class=".definition.StateAddFormHelper"
-  permission="zope.workflow.ManageProcessDefinitions"
-  content_factory="zope.app.workflow.stateful.definition.State"
-  arguments=""
-  fields=""
-  />
+  <!-- nothing to edit yet
+  <editform
+      schema="zope.app.interfaces.workflow.stateful.IState"
+      name="edit.html"
+      menu="zmi_views"
+      label="Edit a State"
+      permission="zope.workflow.ManageProcessDefinitions" />
+  -->
+
+  <addform
+      name="AddState"
+      menu="add_stateful_states" title="Stateful State"
+      schema="zope.app.interfaces.workflow.stateful.IState"
+      class=".definition.StateAddFormHelper"
+      permission="zope.workflow.ManageProcessDefinitions"
+      content_factory="zope.app.workflow.stateful.definition.State"
+      arguments=""
+      fields="" />
 
 
 <!-- Transitions Container -->
 
-<browser:view
-    for="zope.app.interfaces.workflow.stateful.IStatefulTransitionsContainer"
-    name="+"
-    menu="zmi_actions" title="Add"
-    class=".definition.TransitionsContainerAdding"
-    permission="zope.workflow.ManageProcessDefinitions"
-    allowed_attributes="addingInfo">
+  <view
+      for="zope.app.interfaces.workflow.stateful.IStatefulTransitionsContainer"
+      name="+"
+      menu="zmi_actions" title="Add"
+      class=".definition.TransitionsContainerAdding"
+      permission="zope.workflow.ManageProcessDefinitions"
+      allowed_attributes="addingInfo">
 
-    <browser:page name="index.html"  template="add.pt" />
-    <browser:page name="action.html" attribute="action" />
+    <page name="index.html"  template="add.pt" />
+    <page name="action.html" attribute="action" />
 
-</browser:view>
+  </view>
 
 
 
 <!-- Transition -->
-<browser:editform
-  schema="zope.app.interfaces.workflow.stateful.ITransition"
-  name="edit.html"
-  menu="zmi_views"
-  label="Edit a Transition"
-  permission="zope.workflow.ManageProcessDefinitions"
-  />
-
-<browser:addform
-  name="AddTransition"
-  menu="add_stateful_transitions" title="Stateful Transition"
-  schema="zope.app.interfaces.workflow.stateful.ITransition"
-  permission="zope.workflow.ManageProcessDefinitions"
-  content_factory="zope.app.workflow.stateful.definition.Transition"
-  arguments="sourceState destinationState"
-  keyword_arguments="condition script permission triggerMode"
-  fields="sourceState destinationState condition script permission triggerMode"
-  />
+  <editform
+      schema="zope.app.interfaces.workflow.stateful.ITransition"
+      name="edit.html"
+      menu="zmi_views"
+      label="Edit a Transition"
+      permission="zope.workflow.ManageProcessDefinitions" />
+  
+  <addform
+      name="AddTransition"
+      menu="add_stateful_transitions" title="Stateful Transition"
+      schema="zope.app.interfaces.workflow.stateful.ITransition"
+      permission="zope.workflow.ManageProcessDefinitions"
+      content_factory="zope.app.workflow.stateful.definition.Transition"
+      arguments="sourceState destinationState"
+      keyword_arguments="condition script permission triggerMode"
+      fields="sourceState destinationState condition script 
+              permission triggerMode"/>
 
 
 <!-- ContentWorkflowsUtility -->
-<browser:menuItem
-  menu="add_component"
-  for="zope.app.interfaces.container.IAdding"
-  action="ContentWorkflowsManager"
-  title="Content Workflows Manager"
-  description="An utility to manage content and workflow interaction." 
-  />
-
-<browser:pages
-  for="zope.app.interfaces.workflow.stateful.IContentWorkflowsManager"
-  class=".contentworkflow.ContentWorkflowsManagerView"
-  permission="zope.ManageServices">
-
-  <browser:page name="index.html" template="contentworkflow_index.pt" 
-       menu="zmi_views" title="Overview"/>
-
-</browser:pages>
-
-<browser:pages
-  for="zope.app.interfaces.workflow.stateful.IContentWorkflowsManager"
-  class=".contentworkflow.ManageContentProcessRegistry"
-  permission="zope.ManageServices">
-
-  <browser:page name="registry.html" template="contentworkflow_registry.pt" 
-       menu="zmi_views" title="Content/Process Registry"/>
-
-</browser:pages>
+  <menuItem
+      menu="add_component"
+      for="zope.app.interfaces.container.IAdding"
+      action="ContentWorkflowsManager"
+      title="Content Workflows Manager"
+      description="An utility to manage content and workflow interaction." />
+
+  <page
+      name="index.html" 
+      for="zope.app.interfaces.workflow.stateful.IContentWorkflowsManager"
+      class=".contentworkflow.ContentWorkflowsManagerView"
+      permission="zope.ManageServices"
+      template="contentworkflow_index.pt" 
+      menu="zmi_views" title="Overview"/>
+
+  <page
+      name="registry.html" 
+      for="zope.app.interfaces.workflow.stateful.IContentWorkflowsManager"
+      class=".contentworkflow.ManageContentProcessRegistry"
+      permission="zope.ManageServices"
+      template="contentworkflow_registry.pt" 
+      menu="zmi_views" title="Content/Process Registry"/>
 
 
 <!-- ProcessInstanceContainerAdaptable -->
-<browser:pages
-  for="zope.app.interfaces.workflow.IProcessInstanceContainerAdaptable"
-  permission="zope.workflow.UseProcessInstances"
-  class="zope.app.browser.workflow.stateful.instance.ManagementView">
-
-  <browser:page name="workflows.html" template="instance_manage.pt"
-                menu="zmi_views" title="Workflows"/>
-  <browser:page name="fireTransition.html" attribute="fireTransition" />
-</browser:pages>
-
-
-<browser:pages
-  for="zope.app.interfaces.container.IContentContainer"
-  permission="zope.View"
-  class="zope.app.browser.workflow.stateful.content_filter.FilterList">
-
-  <browser:page name="published_content.html" attribute="published_content" />
-</browser:pages>
-
+  <pages
+      for="zope.app.interfaces.workflow.IProcessInstanceContainerAdaptable"
+      permission="zope.workflow.UseProcessInstances"
+      class=".instance.ManagementView">
+
+    <page name="workflows.html" template="instance_manage.pt"
+          menu="zmi_views" title="Workflows"/>
+    <page name="fireTransition.html" attribute="fireTransition" />
+  </pages>
+
+
+  <page
+      for="zope.app.interfaces.container.IContentContainer"
+      permission="zope.View"
+      class="zope.app.browser.workflow.stateful.content_filter.FilterList"
+      name="published_content.html" 
+      attribute="published_content" />
 
 <!-- uhm ... this seems to be too generic in its definition
      and not really nice as well. -->
-<adapter
-    factory=".filteradapter.FilterAdapter"
-    provides=".interfaces.IContentFilterAdapter"
-    for="zope.app.interfaces.annotation.IAttributeAnnotatable"
-    permission="zope.View" />       <!-- XXX is this permission right? -->
+  <zope:adapter
+      factory=".filteradapter.FilterAdapter"
+      provides=".interfaces.IContentFilterAdapter"
+      for="zope.app.interfaces.annotation.IAttributeAnnotatable"
+      permission="zope.View" /> <!-- XXX is this permission right? -->
 
-<!--include file="testobject.zcml"/-->
+  <!--include file="testobject.zcml"/-->
 
 </configure>


=== Zope3/src/zope/app/browser/workflow/stateful/content_filter.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/browser/workflow/stateful/content_filter.py:1.3	Tue Jul 15 10:16:34 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/content_filter.py	Thu Aug  7 13:41:51 2003
@@ -15,14 +15,14 @@
  
 $Id$
 """
-__metaclass__ = type
-
-from zope.component import queryAdapter
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.app.interfaces.workflow import IProcessInstanceContainerAdaptable
 from zope.app.interfaces.workflow import IProcessInstanceContainer
 from zope.app.browser.container.contents import Contents
- 
+from zope.component import queryAdapter
+
+__metaclass__ = type
+
 class FilterList(Contents):
 
     __used_for__ = IProcessInstanceContainerAdaptable


=== Zope3/src/zope/app/browser/workflow/stateful/contentworkflow.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/browser/workflow/stateful/contentworkflow.py:1.3	Tue Jul 29 20:00:16 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/contentworkflow.py	Thu Aug  7 13:41:51 2003
@@ -11,15 +11,14 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""ContentWorkflow Utility views
+"""ContentWorkflow Manager views
  
 $Id$
 """
-__metaclass__ = type
- 
 from zope.app.browser.component.interfacewidget import \
      interfaceToName, nameToInterface
 from zope.app.component.interfacefield import InterfaceField
+from zope.app.i18n import ZopeMessageIDFactory as _
 from zope.app.form.utility import setUpWidgets
 from zope.app.services.servicenames import Workflows
 from zope.component import getService
@@ -28,7 +27,10 @@
 from zope.schema.vocabulary import VocabularyListField
 from zope.security.proxy import trustedRemoveSecurityProxy 
 
-class ContentWorkflowsManagerView(BrowserView):
+__metaclass__ = type
+ 
+
+class ContentWorkflowsManagerView:
  
     def getName(self):
         return """I'm a ContentWorkflows Utility"""
@@ -57,7 +59,6 @@
         super(ManageContentProcessRegistry, self).__init__(*args)
         setUpWidgets(self, IContentProcessMapping)
         self.process_based = int(self.request.get('process_based', '1'))
-        print self.request
 
     def getProcessInterfacesMapping(self):
         mapping = []
@@ -82,7 +83,7 @@
         if 'ADD' in self.request:
             for name in self.name_widget.getData():
                 self.context.register(self.iface_widget.getData(), name)
-            status = 'Mapping(s) added.'
+            status = _('Mapping(s) added.')
         elif 'REMOVE' in self.request:
             mappings = self.request.get('mappings', [])
             for entry in mappings:
@@ -90,7 +91,7 @@
                 name = entry[:split]
                 iface = nameToInterface(self.context, entry[split+1:])
                 self.context.unregister(iface, name)
-            status = 'Mapping(s) removed.'
+            status = _('Mapping(s) removed.')
         elif 'SWITCH' in self.request:
             self.request.response.setCookie('process_based',
                                             self.request.get('other_view'))


=== Zope3/src/zope/app/browser/workflow/stateful/contentworkflow_index.pt 1.3 => 1.4 ===
--- Zope3/src/zope/app/browser/workflow/stateful/contentworkflow_index.pt:1.3	Wed Jun 25 18:14:28 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/contentworkflow_index.pt	Thu Aug  7 13:41:51 2003
@@ -1,35 +1,36 @@
 <html metal:use-macro="views/standard_macros/page">
+ <head>
+  <title metal:fill-slot="title" i18n:translate="">
+    Registration "Service" Control Page
+  </title>
+</head>
+
+<body>
+<div metal:fill-slot="body">
+ 
+  <h1 i18n:translate="">Subscription control</h1>
+
+  <!-- XXX: Too much logic for a template --> 
+  <span tal:condition="request/callSubscribe|nothing" tal:omit-tag="">
+    <span tal:define="dummy context/subscribe" tal:omit-tag=""/>
+  </span>
+  <span tal:condition="request/callUnsubscribe|nothing" tal:omit-tag="">
+    <span tal:define="dummy context/unsubscribe" tal:omit-tag=""/>
+  </span>
+
+  <form action="" method="post">
+    <span tal:condition="context/isSubscribed" tal:omit-tag="">
+      <span i18n:translate="">Subscription state: ON</span>
+      <input type="submit" value="Unsubscribe" name="callUnsubscribe" 
+             i18n:attributes="value unsubscribe-button"/>
+     </span>
+     <span tal:condition="not:context/isSubscribed" tal:omit-tag="">
+       <span i18n:translate="">Subscription state: OFF</span>
+       <input type="submit" value="Subscribe" name="callSubscribe"
+              i18n:attributes="value unsubscribe-button"/>
+     </span>
+  </form>
  
-  <head>
-    <title>Registration "Service" Control Page</title>
-  </head>
- 
-  <body>
- 
-  <div metal:fill-slot="body">
- 
-    <h1>Subscription control</h1>
- 
-    <span tal:condition="request/callSubscribe|nothing" tal:omit-tag="">
-        <span tal:define="dummy context/subscribe" tal:omit-tag=""/>
-    </span>
-    <span tal:condition="request/callUnsubscribe|nothing" tal:omit-tag="">
-        <span tal:define="dummy context/unsubscribe" tal:omit-tag=""/>
-    </span>
- 
-    <form action="" method="post">
-       <span tal:condition="context/isSubscribed" tal:omit-tag="">
-           Subscription state: ON
-           <input type="submit" value="Unsubscribe" name="callUnsubscribe" />
-       </span>
-       <span tal:condition="not:context/isSubscribed" tal:omit-tag="">
-           Subscription state: OFF
-           <input type="submit" value="Subscribe" name="callSubscribe" />
-       </span>
-    </form>
- 
-  </div>
- 
-  </body>
- 
+</div>
+</body>
 </html>


=== Zope3/src/zope/app/browser/workflow/stateful/contentworkflow_registry.pt 1.1 => 1.2 ===
--- Zope3/src/zope/app/browser/workflow/stateful/contentworkflow_registry.pt:1.1	Tue Jul 29 21:51:05 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/contentworkflow_registry.pt	Thu Aug  7 13:41:51 2003
@@ -1,64 +1,70 @@
 <html metal:use-macro="views/standard_macros/page">
+ <head>
+  <title metal:fill-slot="title" i18n:translate="">
+    Process Definition <-> Content Type Registry
+  </title>
+</head>
  
-  <head>
-    <title>Process Definition <-> Content Type Registry</title>
-  </head>
+<body>
+<div metal:fill-slot="body">
  
-  <body><div metal:fill-slot="body">
- 
-    <p tal:define="status view/update"
-       tal:condition="status"
-       tal:content="status" />
+  <p tal:define="status view/update"
+     tal:condition="status"
+     tal:content="status" />
 
-    <p>This screen let's you specify which content types (by interface) can
-       receive which workflows (process definitions).</p>
+  <p i18n:translate="">
+    This screen let's you specify which content types (by interface) can
+    receive which workflows (process definitions).</p>
 
-    <form action="./@@registry.html" method="POST">
-      <h3>Available Mappings</h3>
-       
-      <ul tal:condition="view/process_based">
-        <input type="hidden" name="other_view" value="0"/>
-        <li tal:repeat="process view/getProcessInterfacesMapping">
-          <b tal:content="process/name" /><br/>
-          <tal:block repeat="iface process/ifaces">
-            <input type="checkbox" name="mappings:list"
-              tal:attributes="value string:${process/name}:${iface}">
-            <d tal:replace="iface"/><br/>
-          </tal:block>
-        </li>
-      </ul>
+  <form action="./@@registry.html" method="POST">
+    <h3 i18n:translate="">Available Mappings</h3>
+     
+    <ul tal:condition="view/process_based">
+      <input type="hidden" name="other_view" value="0"/>
+      <li tal:repeat="process view/getProcessInterfacesMapping">
+        <b tal:content="process/name" /><br/>
+        <tal:block repeat="iface process/ifaces">
+          <input type="checkbox" name="mappings:list"
+            tal:attributes="value string:${process/name}:${iface}">
+          <d tal:replace="iface"/><br/>
+        </tal:block>
+      </li>
+    </ul>
 
-      <ul tal:condition="not: view/process_based">
-        <input type="hidden" name="other_view" value="1"/>
-        <li tal:repeat="iface view/getInterfaceProcessesMapping">
-          <b tal:content="iface/iface" /><br/>
-          <tal:block repeat="name iface/names">
-            <input type="checkbox" name="mappings:list"
-              tal:attributes="value string:${name}:${iface/iface}">
-            <d tal:replace="name"/><br/>
-          </tal:block>
-        </li>
-      </ul>
+    <ul tal:condition="not: view/process_based">
+      <input type="hidden" name="other_view" value="1"/>
+      <li tal:repeat="iface view/getInterfaceProcessesMapping">
+        <b tal:content="iface/iface" /><br/>
+        <tal:block repeat="name iface/names">
+          <input type="checkbox" name="mappings:list"
+            tal:attributes="value string:${name}:${iface/iface}">
+          <d tal:replace="name"/><br/>
+        </tal:block>
+      </li>
+    </ul>
 
-      <div class="row">
-        <div class="controls" style="width: 100%"> 
-           <input type="submit" value="Switch View" name="SWITCH" />
-           <input type="submit" value="Remove Mappings" name="REMOVE" />
-         </div>
-      </div>
+    <div class="row">
+      <div class="controls" style="width: 100%"> 
+         <input type="submit" value="Switch View" name="SWITCH" 
+                i18n:attributes="value switch-view-button" />
+         <input type="submit" value="Remove Mappings" name="REMOVE"
+                i18n:attributes="value remove-mappings-button" />
+       </div>
+    </div>
 
-      <h3>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">
-        <div class="controls"> 
-           <input type="submit" value="Add Mappings" name="ADD" />
-         </div>
-      </div>
-    </form>
- 
-  </div></body>
+    <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">
+      <div class="controls"> 
+         <input type="submit" value="Add Mappings" name="ADD"
+                i18n:attributes="value add-mappings-button" />
+       </div>
+    </div>
+  </form>
  
+</div>
+</body> 
 </html>


=== Zope3/src/zope/app/browser/workflow/stateful/definition_edit.pt 1.1 => 1.2 ===
--- Zope3/src/zope/app/browser/workflow/stateful/definition_edit.pt:1.1	Thu Jul 31 11:01:27 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/definition_edit.pt	Thu Aug  7 13:41:51 2003
@@ -1,59 +1,62 @@
 <html metal:use-macro="views/standard_macros/page">
+ <head>
+  <title metal:fill-slot="title" i18n:translate="">
+    Process Definition <-> Content Type Registry
+  </title>
+</head>
+
+<body>
+<div metal:fill-slot="body">
  
-  <head>
-    <title>Process Definition <-> Content Type Registry</title>
-  </head>
- 
-  <body><div metal:fill-slot="body">
- 
-    <p tal:define="status view/update"
-       tal:condition="status"
-       tal:content="status" />
+  <p tal:define="status view/update"
+     tal:condition="status"
+     tal:content="status" />
 
-    <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">
-        <div class="controls" style="width: 100%"> 
-          <input type="submit" value="Refresh" 
-              i18n:attributes="value refresh-button" />
-          <input type="submit" value="Set Schema" name="UPDATE_SUBMIT" />
-         </div>
-      </div>
+  <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">
+      <div class="controls" style="width: 100%"> 
+        <input type="submit" value="Refresh" 
+            i18n:attributes="value refresh-button" />
+        <input type="submit" value="Set Schema" name="UPDATE_SUBMIT" />
+       </div>
+    </div>
+
+    <tal:block define="widgets view/getPermissionWidgets"
+               condition="widgets">
+      <h3 i18n:translate="">Map permissions to Schema fields</h3>
 
-      <tal:block define="widgets view/getPermissionWidgets"
-                 condition="widgets">
-        <h3>Map permissions to Schema fields</h3>
+      <tal:block repeat="widget widgets">
+        <h5 tal:content="string:${widget/fieldName} (${widget/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">
   
-        <tal:block repeat="widget widgets">
-          <h5 tal:content="string:${widget/fieldName} (${widget/fieldName})">
-            FieldName (Field Title)
-          </h5>
-          <div class="row" tal:replace="structure widget/getter/row">
-            <div class="label">Get Permission</div>
-            <div class="field">
-    
-            </div>
           </div>
-          <div class="row" tal:replace="structure widget/setter/row">
-            <div class="label">Set Permission</div>
-            <div class="field">
-    
-            </div>
+        </div>
+        <div class="row" tal:replace="structure widget/setter/row">
+          <div class="label" i18n:translate="">Set Permission</div>
+          <div class="field">
+  
           </div>
-        </tal:block>
-        <div class="row">
-          <div class="controls" style="width: 100%"> 
-            <input type="submit" value="Refresh" 
-                i18n:attributes="value refresh-button" />
-            <input type="submit" value="Change" name="CHANGE" />
-           </div>
         </div>
       </tal:block>
+      <div class="row">
+        <div class="controls" style="width: 100%"> 
+          <input type="submit" value="Refresh" 
+                 i18n:attributes="value refresh-button" />
+          <input type="submit" value="Change" name="CHANGE"
+                 i18n:attributes="value change-button" />
+         </div>
+      </div>
+    </tal:block>
 
-    </form>
- 
-  </div></body>
+  </form>
  
+</div>
+</body> 
 </html>


=== Zope3/src/zope/app/browser/workflow/stateful/definition_index.pt 1.1 => 1.2 ===
--- Zope3/src/zope/app/browser/workflow/stateful/definition_index.pt:1.1	Thu May  8 13:27:17 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/definition_index.pt	Thu Aug  7 13:41:51 2003
@@ -1,14 +1,18 @@
 <html metal:use-macro="views/standard_macros/page">
-<head>
-  <title>ProcessDefinition</title>
+ <head>
+  <title metal:fill-slot="title" i18n:translate="">
+    Process Definition
+  </title>
 </head>
+
 <body>
- 
-  <div metal:fill-slot="body">
+<div metal:fill-slot="body">
 
-  <p>ProcessDefinition: <tal:block tal:replace="view/getName" /></p>
- 
-  </div>
+  <p i18n:translate="">
+    Process Definition: 
+    <tal:block tal:replace="view/getName" i18n:name="name"/>
+  </p>
  
+</div> 
 </body>
 </html>


=== Zope3/src/zope/app/browser/workflow/stateful/definition_states.pt 1.1 => 1.2 ===
--- Zope3/src/zope/app/browser/workflow/stateful/definition_states.pt:1.1	Thu May  8 13:27:17 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/definition_states.pt	Thu Aug  7 13:41:51 2003
@@ -1,14 +1,14 @@
 <html metal:use-macro="views/standard_macros/page">
 <head>
-  <title>ProcessDefinition States</title>
+  <title metal:fill-slot="title" i18n:translate="">
+    Process Definition States
+  </title>
 </head>
 <body>
- 
-  <div metal:fill-slot="body">
+<div metal:fill-slot="body">
 
-  states
- 
-  </div>
+  <p i18n:translate="">States</p>
  
+</div> 
 </body>
 </html>


=== Zope3/src/zope/app/browser/workflow/stateful/definition_transitions.pt 1.1 => 1.2 ===
--- Zope3/src/zope/app/browser/workflow/stateful/definition_transitions.pt:1.1	Thu May  8 13:27:17 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/definition_transitions.pt	Thu Aug  7 13:41:51 2003
@@ -1,14 +1,14 @@
 <html metal:use-macro="views/standard_macros/page">
 <head>
-  <title>ProcessDefinition Transitions</title>
+  <title metal:fill-slot="title" i18n:translate="">
+    Process Definition Transitions
+  </title>
 </head>
 <body>
- 
-  <div metal:fill-slot="body">
+<div metal:fill-slot="body">
 
-  transitions
- 
-  </div>
+  <p i18n:translate="">Transitions</p>
  
+</div> 
 </body>
-</html>
\ No newline at end of file
+</html>


=== Zope3/src/zope/app/browser/workflow/stateful/filterTest.pt 1.2 => 1.3 ===
--- Zope3/src/zope/app/browser/workflow/stateful/filterTest.pt:1.2	Wed Jun 25 17:18:57 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/filterTest.pt	Thu Aug  7 13:41:51 2003
@@ -1,16 +1,17 @@
-  <html metal:use-macro="views/standard_macros/page">
-    <head>
-      <style metal:fill-slot="headers" type="text/css"></style>
-    </head>
-    <body>
-      <div metal:fill-slot="body">
-        <div tal:repeat="obj view/filterTest"
-             tal:omit-tag="">
-          <div tal:replace="obj"/><br />
-          </div>
-        </div>
-    </body>
-  </html>
+<html metal:use-macro="views/standard_macros/page">
+<body>
+<div metal:fill-slot="body">
+
+  <div tal:repeat="obj view/filterTest"
+       tal:omit-tag="">
+
+    <div tal:replace="obj"/><br />
+
+  </div>
+
+</div>
+</body>
+</html>
 
 
 


=== Zope3/src/zope/app/browser/workflow/stateful/filteradapter.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/browser/workflow/stateful/filteradapter.py:1.2	Fri Jun  6 17:35:20 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/filteradapter.py	Thu Aug  7 13:41:51 2003
@@ -15,13 +15,14 @@
  
 $Id$
 """
-__metaclass__ = type
-
 from zope.interface import implements
 from zope.component import queryAdapter 
 from zope.app.interfaces.workflow import IProcessInstanceContainerAdaptable
 from zope.app.interfaces.workflow import IProcessInstanceContainer
 from interfaces import IContentFilterAdapter
+
+__metaclass__ = type
+
 
 class FilterAdapter:
     


=== Zope3/src/zope/app/browser/workflow/stateful/instance.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/browser/workflow/stateful/instance.py:1.6	Thu Jul 31 11:01:27 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/instance.py	Thu Aug  7 13:41:51 2003
@@ -15,10 +15,9 @@
  
 $Id$
 """
-__metaclass__ = type
-
 from zope.app.browser.form.submit import Update
 from zope.app.form.utility import setUpWidget, applyWidgetsChanges
+from zope.app.i18n import ZopeMessageIDFactory as _
 from zope.app.interfaces.dublincore import IZopeDublinCore
 from zope.app.interfaces.workflow import IProcessInstanceContainer
 from zope.app.interfaces.workflow import IProcessInstanceContainerAdaptable
@@ -30,6 +29,9 @@
 from zope.publisher.browser import BrowserView
 from zope.security.proxy import trustedRemoveSecurityProxy
 from zope.schema import getFields
+
+__metaclass__ = type
+
  
 class ManagementView(BrowserView):
 
@@ -45,7 +47,6 @@
             setUpWidget(self, name, field,
                         value=getattr(workflow.data, name))
         
-
     def _extractContentInfo(self, item):
         id, processInstance = item
         info = {}
@@ -141,6 +142,6 @@
                 self, workflow.data, schema, names=getFields(schema).keys(),
                 exclude_readonly=True)
             if changed:
-                status = u'Updated Workflow Data.'
+                status = _('Updated Workflow Data.')
 
         return status


=== Zope3/src/zope/app/browser/workflow/stateful/instance_manage.pt 1.4 => 1.5 ===
--- Zope3/src/zope/app/browser/workflow/stateful/instance_manage.pt:1.4	Thu Jul 31 11:01:27 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/instance_manage.pt	Thu Aug  7 13:41:51 2003
@@ -1,85 +1,87 @@
-  <html metal:use-macro="views/standard_macros/page">
-    <head>
-      <style metal:fill-slot="headers" type="text/css"></style>
-    </head>
-    <body>
-      <div metal:fill-slot="body">
-        <h3>Workflow Options</h3>
-        <br/>
-        <div metal:define-macro="contents">
-          <div metal:define-macro="contents_selectWorkflow"
-               tal:define="workflow request/workflow | nothing">
-            <div tal:condition="not:workflow" tal:omit-tag="">
-              <form name="containerContentsForm" method="get" 
-                    action="@@workflows.html" 
-                    tal:define="container_contents view/listContentInfo"
-                    tal:condition="container_contents">
-                Workflow: 
-                <select name="workflow" size="1">
-                  <option tal:repeat="workflow container_contents" 
-                          tal:attributes="value workflow/id"
-                          tal:content="workflow/name"></option>
-                </select>
-                &nbsp;<input type="submit" value="Choose" />
-              </form>
-            </div>
-            <div tal:condition="workflow" tal:omit-tag="">
-              Workflow: <div tal:replace="view/getWorkflowTitle"></div>
-            </div>
-          </div>
-          <div metal:define-macro="contents_changeState">
-          </div>
-          
-        </div>
-        <br />
-        <div metal:define-macro="contents_transitions"
-             tal:define="info view/getTransitions"
-             tal:condition="info">
-            Current Status: <div tal:replace="info/status"/>
-            <br />
-            Possible State Changes:
-            <form action="@@fireTransition.html" method="get">
-            <input type="hidden" name="workflow"
-                   tal:attributes="value request/workflow | nothing" />
-              <div tal:repeat="trans info/transitions" 
-                   tal:condition="info/transitions | nothing"
-                   tal:omit-tag="">
-                <input type="radio"
-                       name="selTransition"
-                       tal:attributes="value trans/name"/>
-                <span tal:replace="trans/title"/><br />
-              </div>
-              <input type="submit" value="Make Transition" />
-              </form>
-        </div>
-       
-        <h3>Workflow-relevant Data</h3>
-
-        <p tal:define="status view/update"
-           tal:condition="status"
-           tal:content="status" />
-
-        <form name="." method="POST"> 
-          <div class="row" tal:repeat="widget view/widgets"
-              tal:content="structure widget/row">
-            <div class="label">Name</div>
-            <div class="field"><input type="text" style="width:100%" /></div>
-          </div>
-
-          <div class="row">
-            <div class="controls">
-              <input type="submit" value="Refresh" 
-                  i18n:attributes="value refresh-button" />
-              <input type="submit" name="UPDATE_SUBMIT" value="Submit" 
-                  i18n:attributes="value submit-button"/>
-            </div>
-          </div>
-        </form> 
+<html metal:use-macro="views/standard_macros/page">
+<body>
+<div metal:fill-slot="body">
+
+  <h3 i18n:translate="">Workflow Options</h3>
+  <br/>
+
+  <div metal:define-macro="contents">
+    <div metal:define-macro="contents_selectWorkflow"
+         tal:define="workflow request/workflow | nothing">
+      <div tal:condition="not:workflow" tal:omit-tag="">
+        <form name="containerContentsForm" method="get" 
+              action="@@workflows.html" 
+              tal:define="container_contents view/listContentInfo"
+              tal:condition="container_contents">
+          <span i18n:translate="">Workflow:</span> 
+          <select name="workflow" size="1">
+            <option tal:repeat="workflow container_contents" 
+                    tal:attributes="value workflow/id"
+                    tal:content="workflow/name"></option>
+          </select>
+          &nbsp;<input type="submit" value="Choose" 
+                       i18n:attributes="value choose-button"/>
+        </form>
+      </div>
+      <div tal:condition="workflow" tal:omit-tag="" i18n:translate="">
+        Workflow: 
+        <div tal:replace="view/getWorkflowTitle" 
+             i18n:name="wf_title"/>
+      </div>
+    </div>
+    <div metal:define-macro="contents_changeState">
+    </div>
     
+  </div>
+  <br />
+  <div metal:define-macro="contents_transitions"
+       tal:define="info view/getTransitions"
+       tal:condition="info">
+      <div i18n:translate="">
+        Current Status: 
+        <div tal:replace="info/status"/>
       </div>
-    </body>
-  </html>
-
-
-
+      <br />
+      <span i18n:translate="">Possible State Changes:</span>
+      <form action="@@fireTransition.html" method="get">
+      <input type="hidden" name="workflow"
+             tal:attributes="value request/workflow | nothing" />
+        <div tal:repeat="trans info/transitions" 
+             tal:condition="info/transitions | nothing"
+             tal:omit-tag="">
+          <input type="radio"
+                 name="selTransition"
+                 tal:attributes="value trans/name"/>
+          <span tal:replace="trans/title"/><br />
+        </div>
+        <input type="submit" value="Make Transition" 
+               i18n:attributes="value make-transition-button"/>
+        </form>
+  </div>
+ 
+  <h3 i18n:translate="">Workflow-relevant Data</h3>
+
+  <p tal:define="status view/update"
+     tal:condition="status"
+     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 class="row">
+      <div class="controls">
+        <input type="submit" value="Refresh" 
+            i18n:attributes="value refresh-button" />
+        <input type="submit" name="UPDATE_SUBMIT" value="Submit" 
+            i18n:attributes="value submit-button"/>
+      </div>
+    </div>
+  </form> 
 
+</div>
+</body>
+</html>


=== Zope3/src/zope/app/browser/workflow/stateful/interfaces.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/browser/workflow/stateful/interfaces.py:1.1	Thu May  8 13:27:18 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/interfaces.py	Thu Aug  7 13:41:51 2003
@@ -15,7 +15,6 @@
 
 $Id$
 """
-
 from zope.interface import Interface
 
 class IContentFilterAdapter(Interface):


=== Zope3/src/zope/app/browser/workflow/stateful/published_content.pt 1.2 => 1.3 ===
--- Zope3/src/zope/app/browser/workflow/stateful/published_content.pt:1.2	Wed Jun 25 17:18:57 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/published_content.pt	Thu Aug  7 13:41:51 2003
@@ -1,16 +1,14 @@
-  <html metal:use-macro="views/standard_macros/page">
-    <head>
-      <style metal:fill-slot="headers" type="text/css"></style>
-    </head>
-    <body>
-      <div metal:fill-slot="body">
-        <div tal:repeat="obj view/listPublishedItems"
-             tal:omit-tag="">
-          <div tal:content="obj/url"/><br />
-          </div>
-        </div>
-    </body>
-  </html>
+<html metal:use-macro="views/standard_macros/page">
+<body>
+<div metal:fill-slot="body">
+
+  <div tal:repeat="obj view/listPublishedItems" tal:omit-tag="">
+    <div tal:content="obj/url"/><br />
+  </div>
+
+</div>
+</body>
+</html>
 
 
 


=== Zope3/src/zope/app/browser/workflow/stateful/testobject.zcml 1.2 => 1.3 ===
--- Zope3/src/zope/app/browser/workflow/stateful/testobject.zcml:1.2	Sun Aug  3 13:50:07 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/testobject.zcml	Thu Aug  7 13:41:51 2003
@@ -1,10 +1,6 @@
-<configure
-   xmlns="http://namespaces.zope.org/zope"
-   xmlns:browser="http://namespaces.zope.org/browser"
-   i18n_domain='zope'
-   >
+<configure xmlns="http://namespaces.zope.org/browser">
 
-  <browser:addform
+  <addform
       label="Add Test Object"
       name="AddTestObject"
       schema="zope.app.workflow.stateful.testobject.ITestObject"
@@ -12,7 +8,7 @@
       permission="zope.ManageContent"
       menu="add_content" title="Test Object"/>
 
-  <browser:editform
+  <editform
       schema="zope.app.workflow.stateful.testobject.ITestObject"
       for="zope.app.workflow.stateful.testobject.ITestObject"
       label="Change Test Object"




More information about the Zope3-Checkins mailing list