[CMF-checkins] CVS: Products/CMFDefault/skins/zpt_content - content_status_history.pt:1.4 transition_form.pt:1.3

Tue Aug 3 08:49:22 EDT 2004

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

Modified Files:
	content_status_history.pt transition_form.pt 
Log Message:
- replaced reverseList by [::-1] and marked reverseList as deprecated
- some other cleanup


=== Products/CMFDefault/skins/zpt_content/content_status_history.pt 1.3 => 1.4 ===

--- Products/CMFDefault/skins/zpt_content/content_status_history.pt:1.3	Thu Mar  6 05:39:01 2003
+++ Products/CMFDefault/skins/zpt_content/content_status_history.pt	Tue Aug  3 08:48:51 2004
@@ -1,12 +1,12 @@
-<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">
+<html metal:use-macro="context/main_template/macros/master">
 <body>
-<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')">
 
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
+   tal:define="wtool context/portal_workflow;
+               review_state python: wtool.getInfoFor(context, 'review_state');
+               review_history python: wtool.getInfoFor(context,
+                                                       'review_history')">
+<div class="Desktop">
 
 <h1 i18n:translate="">Content Item status history</h1>
 
@@ -29,8 +29,8 @@
 
 <div tal:condition="review_history|nothing">
   <h3><strong i18n:translate="">Reviewing history</strong></h3>
-    <div tal:repeat="items python: here.reverseList(review_history)">
-	  <span tal:replace="python: items['time'].aCommon()" />
+    <div tal:repeat="items python: review_history[::-1]">
+    <span tal:replace="python: items['time'].aCommon()" />
     <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()"
@@ -39,12 +39,14 @@
      <span tal:replace="items/actor" i18n:name="actor">Actor</span></span>
     <br />
       <div tal:define="rhComments items/comments"
-		 tal:replace="rhComments">Comments</div>
+           tal:replace="rhComments">Comments</div>
     </div>
 </div>
 <div tal:condition="python: not(review_history)"
      i18n:translate="">This item has not had any status changes.</div>
- </div>
+
 </div>
+</metal:slot>
+
 </body>
 </html>


=== Products/CMFDefault/skins/zpt_content/transition_form.pt 1.2 => 1.3 ===
--- Products/CMFDefault/skins/zpt_content/transition_form.pt:1.2	Thu Mar  6 05:50:32 2003
+++ Products/CMFDefault/skins/zpt_content/transition_form.pt	Tue Aug  3 08:48:51 2004
@@ -1,23 +1,23 @@
-<metal:block metal:define-macro="master">
-<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:macro metal:define-macro="master"
+><html metal:use-macro="context/main_template/macros/master">
 <body>
-<div metal:fill-slot="main">
-<div class="Desktop"
-     tal:define="wtool here/portal_workflow;
-                 review_state python: wtool.getInfoFor(here, 'review_state');
-                 review_history python: wtool.getInfoFor(here, 'review_history')">
+
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default"
+   tal:define="wtool context/portal_workflow;
+               review_state python: wtool.getInfoFor(context, 'review_state');
+               review_history python: wtool.getInfoFor(context,
+                                                       'review_history')">
+<div class="Desktop">
 
 <div metal:define-slot="main" i18n:domain="cmf_default">
-<h1 i18n:translate="">Transition of <span tal:replace="here/getId"
+<h1 i18n:translate="">Transition of <span tal:replace="context/getId"
                              i18n:name="objectid">Item</span>.</h1>
 
 <p i18n:translate="">Transition description.</p>
 </div>
 
 <form method="post" action="content_status_modify"
-      tal:attributes="action string:${here/absolute_url}/content_status_modify">
+   tal:attributes="action string:${context/absolute_url}/content_status_modify">
  <table class="FormLayout">
   <tr i18n:domain="cmf_default">
    <td valign="top" align="left">
@@ -50,10 +50,10 @@
  </table>
 </form>
 
-<div tal:condition="review_history|nothing" i18n:domain="cmf_default">
+<tal:case tal:condition="review_history|nothing" i18n:domain="cmf_default">
  <p><strong i18n:translate="">Reviewing history</strong>
  <br />
- <span tal:repeat="items python: here.reverseList(review_history)">
+ <tal:loop tal:repeat="items python: review_history[::-1]">
   <span tal:replace="python: items['time'].aCommon()"></span>
   <span tal:omit-tag="" tal:content="items/action" i18n:translate=""></span>
   <span tal:condition="items/effective_date|nothing" i18n:translate="">
@@ -64,12 +64,11 @@
   <br />
    <span tal:define="rhComments items/comments"
          tal:replace="rhComments">Comments</span>
- </span>
-</div>
-
+ </tal:loop>
+</tal:case>
 
 </div>
-</div>
+</metal:slot>
+
 </body>
-</html>
-</metal:block>
\ No newline at end of file
+</html></metal:macro>

