[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_content - content_hide_form.pt:1.1.24.1 content_publish_form.pt:1.3.26.1 content_reject_form.pt:1.3.26.1

Yvo Schubbe schubbe@web.de
Fri, 28 Feb 2003 11:24:59 -0500


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

Modified Files:
      Tag: yuppie-collector122-branch
	content_hide_form.pt content_publish_form.pt 
	content_reject_form.pt 
Log Message:
- added transition_form template
- added i18n attributes

=== CMF/CMFDefault/skins/zpt_content/content_hide_form.pt 1.1 => 1.1.24.1 ===
--- CMF/CMFDefault/skins/zpt_content/content_hide_form.pt:1.1	Thu Jul  4 08:00:12 2002
+++ CMF/CMFDefault/skins/zpt_content/content_hide_form.pt	Fri Feb 28 11:24:58 2003
@@ -1,61 +1,24 @@
 <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="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="">Hide <span tal:replace="here/getId"
+                                  i18n:name="objectid">Item</span></h1>
 
-<h1> Hide <span tal:replace="here/getId">Me</span> </h1>
-
-<p>Use this form to hide a content item by setting its
+<p i18n:translate="">Use this form to hide a content item by setting its
    status to <b>Private</b>, thereby making it unavailable to
    other portal members and visitors.</p>
 
+</div>
 
-<form method="post" action="content_status_modify"
-      tal:attributes="action string:${here/absolute_url}/content_status_modify"
->
-  <input type="hidden" name="workflow_action" value="hide">
-  <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.
-	 </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 colspan="2"><input type="submit" value=" Hide this Item "></td>
-   </tr>
-  </table>
+<form action="dummy">
+    <div metal:fill-slot="form" i18n:domain="cmf_default">
+     <input type="hidden" name="workflow_action" value="hide" />
+     <input type="submit" value="Hide this item"
+            i18n:attributes="value" />
+    </div>
 </form>
-<div tal:condition="review_history|nothing">
-      <p><strong>Reviewing history</strong>
-	  <br>
-    <div tal:repeat="items python: here.reverseList(review_history)">
-	<span tal:replace="python: items['time'].aCommon()" />
-	<span tal:replace="items/action" />
-  <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>


=== CMF/CMFDefault/skins/zpt_content/content_publish_form.pt 1.3 => 1.3.26.1 ===
--- CMF/CMFDefault/skins/zpt_content/content_publish_form.pt:1.3	Tue Apr  2 19:10:34 2002
+++ CMF/CMFDefault/skins/zpt_content/content_publish_form.pt	Fri Feb 28 11:24:58 2003
@@ -1,65 +1,27 @@
 <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="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="">Publish <span tal:replace="here/getId"
+                                    i18n:name="objectid">Item</span></h1>
 
-<h1> Publish <span tal:replace="here/getId">Item</span></h1>
-
-<p>A <b>published</b> item is available to the general
+<p i18n:translate="">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"
->
-  <input type="hidden" name="workflow_action" value="publish">
-  <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.
-     </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 colspan="2"><input type="submit" value=" Publish this Item "></td>
-   </tr>
-  </table>
+<form action="dummy">
+    <div metal:fill-slot="form" i18n:domain="cmf_default">
+     <input type="hidden" name="workflow_action" value="publish" />
+     <input type="submit" value="Publish this 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 tal:replace="items/action" />
-  <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>


=== CMF/CMFDefault/skins/zpt_content/content_reject_form.pt 1.3 => 1.3.26.1 ===
--- CMF/CMFDefault/skins/zpt_content/content_reject_form.pt:1.3	Tue Apr  2 19:10:34 2002
+++ CMF/CMFDefault/skins/zpt_content/content_reject_form.pt	Fri Feb 28 11:24:58 2003
@@ -1,61 +1,24 @@
 <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="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="">Reject <span tal:replace="here/getId"
+                                   i18n:name="objectid">Item</span></h1>
 
-<h1> Reject <span tal:replace="here/getId">Me</span> </h1>
+<p i18n:translate="">Use this form to reject the publication of a content item
+ and set its status to <b>Private</b>, thereby making it unavailable to other
+ portal members and visitors.</p>
 
-<p>Use this form to reject the publication of a content item and set its 
-   status to <b>Private</b>, thereby making it unavailable to 
-   other portal members and visitors.</p>
+</div>
 
-<form method="post" action="content_status_modify"
-      tal:attributes="action string:${here/absolute_url}/content_status_modify"
->
-<input type="hidden" name="workflow_action" value="reject">
- <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.
-   </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 colspan="2"><input type="submit" value=" Reject this Item "></td>
-  </tr>
- </table>
+<form action="dummy">
+    <div metal:fill-slot="form" i18n:domain="cmf_default">
+     <input type="hidden" name="workflow_action" value="reject" />
+     <input type="submit" value="Reject this item"
+            i18n:attributes="value" />
+    </div>
 </form>
-
-<div tal:condition="review_history|nothing">
-      <p><strong>Reviewing history</strong>
-	  <br>
-    <div tal:repeat="items python: here.reverseList(review_history)">
-	<span tal:replace="python: items['time'].aCommon()" />
-	<span tal:replace="items/action" />
-  <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>