[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_content - content_submit_form.pt:1.4

Yvo Schubbe schubbe@web.de
Thu, 6 Mar 2003 05:39:39 -0500


Update of /cvs-repository/CMF/CMFDefault/skins/zpt_content
In directory cvs.zope.org:/tmp/cvs-serv12904/CMFDefault/skins/zpt_content

Modified Files:
	content_submit_form.pt 
Log Message:
Merged yuppie-collector122-branch:
- Added i18n attributes. (Collector #122)
- Made scripts independent of submit button values.
- Added transition_form.

=== CMF/CMFDefault/skins/zpt_content/content_submit_form.pt 1.3 => 1.4 ===
--- CMF/CMFDefault/skins/zpt_content/content_submit_form.pt:1.3	Tue Apr  2 19:10:34 2002
+++ CMF/CMFDefault/skins/zpt_content/content_submit_form.pt	Thu Mar  6 05:39:33 2003
@@ -1,70 +1,29 @@
 <html xmlns:tal="http://xml.zope.org/namespaces/tal"
       xmlns:metal="http://xml.zope.org/namespaces/metal"
-      metal:use-macro="here/main_template/macros/master">
+      metal:use-macro="here/transition_form/macros/master">
 <body>
-<div metal:fill-slot="main">
-<div class="Desktop"
-     tal:define="member python: here.portal_membership.getAuthenticatedMember(); 
-     review_state python: here.portal_workflow.getInfoFor(here, 'review_state');
-	 review_history python: here.portal_workflow.getInfoFor(here, 'review_history')">
+<div metal:fill-slot="main" i18n:domain="cmf_default">
 
+<h1 i18n:translate="">Submit <span tal:replace="here/getId"
+                             i18n:name="objectid">Item</span> for Review.</h1>
 
-<h1> Submit <span tal:replace="here/getId">Me</span> for Review </h1>
-<span tal:replace="request/message"
-   tal:condition="message|nothing"><hr></span>
-
-<p>To make an item published, it
-   has to be reviewed by one of the site's reviewers. 
+<p i18n:translate="">To make an item published, it
+   has to be reviewed by one of the site's reviewers.
    A <b>published</b> item is available to the general
    member base and anonymous visitors.</p>
 
-<p>Another way to control the visibility of an item is with its <b>effective
-   date</b>.  An item is not publicly available before its effective date,
-   <em>even if its status is <b>published</b></em>.</p>
+<p i18n:translate="">Another way to control the visibility of an item is with
+  its <b>effective date</b>. An item is not publicly available before its
+  effective date, <em>even if its status is <b>published</b></em>.</p>
 
+</div>
 
-<form method="post" action="content_status_modify"
-      tal:attributes="action string:${here/absolute_url}/content_status_modify"
->
- <table class="FormLayout">
-  <tr>
-   <td valign=top align=left>
-    <strong>Status</strong>
-   </td>
-   <td valign=top align=left>
-     This item is currently in <b><span tal:replace="review_state">Private</span></b> status.
-     <input type="hidden" name="workflow_action" value="submit">
-   </td>
-  </tr>
-  <tr>
-   <td valign=top align=left colspan=2>
-    <strong><em>Comments</em></strong><br>
-    <textarea name="comment" cols="60" rows="5" wrap="soft"
-     style="width: 100%"></textarea>
-   </td>
-  </tr>
-  <tr>
-   <td></td>
-   <td><input type="submit" value=" Submit Item "></td>
-  </tr>
- </table>
+<form action="dummy">
+    <div metal:fill-slot="form" i18n:domain="cmf_default">
+     <input type="hidden" name="workflow_action" value="submit" />
+     <input type="submit" value="Submit item"
+            i18n:attributes="value" />
+    </div>
 </form>
-<div tal:condition="review_history">
-      <p><strong>Reviewing history</strong>
-	  <br>
-    <div tal:repeat="items python: here.reverseList(review_history)">
-	<span tal:replace="python: items['time'].aCommon()"></span>
-	<span tal:replace="items/action"></span>
-  <span tal:condition="items/effective_date|nothing">
-  (effective: <span tal:replace="python: items['effective_date'].aCommon()"></span>)
-  </span>
-  
-  by <span tal:replace="items/actor">Actor</span><br>
-   <div tal:define="rhComments items/comments"
-		 tal:replace="rhComments">Comments</div>
- </div>
- </div>
-</div>
-</div>
 </body>
 </html>