[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_content - content_show_form.pt:1.2 content_status_history.pt:1.3

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


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

Modified Files:
	content_show_form.pt content_status_history.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_show_form.pt 1.1 => 1.2 ===
--- CMF/CMFDefault/skins/zpt_content/content_show_form.pt:1.1	Thu Jul  4 08:00:12 2002
+++ CMF/CMFDefault/skins/zpt_content/content_show_form.pt	Thu Mar  6 05:39:01 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="">Make Visible <span tal:replace="here/getId"
+                                         i18n:name="objectid">Item</span></h1>
 
-<h1> Make Visible <span tal:replace="here/getId">Item</span></h1>
+<p i18n:translate="">A <b>Visible</b> item is available other portal members
+  and visitors, however it won't show up in the list of published items.</p>
 
-<p>A <b>Visible</b> item is available other portal members and visitors,
-   however it won't show up in the list of published items.  </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="show">
-  <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=" Make this Item Visible "></td>
-   </tr>
-  </table>
+<form action="dummy">
+    <div metal:fill-slot="form" i18n:domain="cmf_default">
+     <input type="hidden" name="workflow_action" value="show" />
+     <input type="submit" value="Make this item visible"
+            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_status_history.pt 1.2 => 1.3 ===
--- CMF/CMFDefault/skins/zpt_content/content_status_history.pt:1.2	Thu Dec  6 17:43:42 2001
+++ CMF/CMFDefault/skins/zpt_content/content_status_history.pt	Thu Mar  6 05:39:01 2003
@@ -2,40 +2,48 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       metal:use-macro="here/main_template/macros/master">
 <body>
-<div metal:fill-slot="main">
+<div metal:fill-slot="main" i18n:domain="cmf_default">
 <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')">
-<h1>Content Item status history</h1>
 
-<div>An item's status (also called its review state) determines who can see it.
+
+<h1 i18n:translate="">Content Item status history</h1>
+
+<p i18n:translate="">An item's status (also called its review state)
+   determines who can see it.
    A <b>private</b> item can only be viewed by its Owner and by the site
    management.  Only <b>published</b> items are available to the general
    member base and anonymous visitors.  To make an item published, it
    has to be reviewed by one of the site's Reviewers.  You can request
-   that an item be reviewed by setting its status to <b>pending</b>.</div>
+   that an item be reviewed by setting its status to <b>pending</b>.</p>
 
-<div>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>.</div>
+<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>
 
-<h2>Current state</h2>
-This item is in <b><span tal:replace="review_state">Private</span></b> state.
+<h2 i18n:translate="">Current state</h2>
+<span tal:omit-tag="" i18n:translate="">This item is in
+<span i18n:name="status"><b tal:content="review_state"
+                            i18n:translate="">Private</b></span> state.</span>
 
 <div tal:condition="review_history|nothing">
-      <h3><strong>Reviewing history</strong></h3>
+  <h3><strong i18n:translate="">Reviewing history</strong></h3>
     <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>
+    <span tal:omit-tag="" tal:content="items/action" i18n:translate=""></span>
+    <span tal:condition="items/effective_date|nothing" i18n:translate="">
+     (effective: <span tal:replace="python: items['effective_date'].aCommon()"
+                       i18n:name="eff_date"></span>)</span>
+    <span tal:omit-tag="" i18n:translate="">by
+     <span tal:replace="items/actor" i18n:name="actor">Actor</span></span>
+    <br />
       <div tal:define="rhComments items/comments"
 		 tal:replace="rhComments">Comments</div>
     </div>
 </div>
-<div tal:condition="python: not(review_history)">This item has not had any status changes.</div>
+<div tal:condition="python: not(review_history)"
+     i18n:translate="">This item has not had any status changes.</div>
  </div>
 </div>
 </body>