[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic - batch_widgets.pt:1.2 content_byline.pt:1.6 folder_contents.pt:1.13 folder_rename_form.pt:1.9 join_form.pt:1.10 members_manage_form.pt:1.3 recent_news.pt:1.8 registered_notify_template.pt:1.2 talkback_tree.pt:1.6

Yvo Schubbe y.2004_ at wcm-solutions.de
Tue Jan 20 17:20:12 EST 2004


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

Modified Files:
	batch_widgets.pt content_byline.pt folder_contents.pt 
	folder_rename_form.pt join_form.pt members_manage_form.pt 
	recent_news.pt registered_notify_template.pt talkback_tree.pt 
Log Message:
fixed Zope 2.5 compatibility


=== CMF/CMFDefault/skins/zpt_generic/batch_widgets.pt 1.1 => 1.2 ===
--- CMF/CMFDefault/skins/zpt_generic/batch_widgets.pt:1.1	Sat Nov  1 11:42:00 2003
+++ CMF/CMFDefault/skins/zpt_generic/batch_widgets.pt	Tue Jan 20 17:20:10 2004
@@ -17,8 +17,8 @@
   ><tal:span tal:content="batch/navigation/previous/text"
    >Previous</tal:span
   > <tal:case tal:condition="batch/navigation/previous/length"
-      tal:content="batch/navigation/previous/length"
-      i18n:name="count">n</tal:case
+   ><span tal:omit-tag="" tal:content="batch/navigation/previous/length"
+      i18n:name="count">n</span></tal:case
   > <tal:span tal:content="batch/navigation/previous/type"
    >items</tal:span></a></tal:case
  ><tal:case tal:condition="python:p and n">
@@ -28,8 +28,8 @@
   ><tal:span tal:content="batch/navigation/next/text"
    >Next</tal:span
   > <tal:case tal:condition="batch/navigation/next/length"
-      tal:content="batch/navigation/next/length"
-      i18n:name="count">n</tal:case
+   ><span tal:omit-tag="" tal:content="batch/navigation/next/length"
+      i18n:name="count">n</span></tal:case
   > <tal:span tal:content="batch/navigation/next/type"
    >items</tal:span></a></tal:case
  ></p


=== CMF/CMFDefault/skins/zpt_generic/content_byline.pt 1.5 => 1.6 ===
--- CMF/CMFDefault/skins/zpt_generic/content_byline.pt:1.5	Tue Dec 23 16:47:25 2003
+++ CMF/CMFDefault/skins/zpt_generic/content_byline.pt	Tue Jan 20 17:20:10 2004
@@ -5,21 +5,22 @@
    metal:define-macro="byline"
    tal:define="mtool here/portal_membership"
    i18n:domain="cmf_default">
- <p><tal:span i18n:translate="">Created by</tal:span
+ <p><span tal:omit-tag="" i18n:translate="">Created by</span
  > <tal:case tal:condition="here/listCreators"
   ><tal:loop tal:repeat="creator here/listCreators"
    ><tal:case tal:condition="not: repeat/creator/start"
     ><tal:case tal:condition="not: repeat/creator/end">, </tal:case
     ><tal:case tal:condition="repeat/creator/end"
-     > <tal:span i18n:translate="">and</tal:span> </tal:case></tal:case
+     > <span tal:omit-tag="" i18n:translate="">and</span> </tal:case
+   ></tal:case
    ><a href="." title="creator"
        tal:define="home_url python: mtool.getHomeUrl(creator)"
        tal:attributes="href home_url; title creator"
        tal:content="creator"
        tal:omit-tag="not: home_url">creator</a></tal:loop></tal:case
- ><tal:case tal:condition="not: here/listCreators" i18n:translate=""
-  >unknown</tal:case>.
-  <tal:span i18n:translate="">Last modified</tal:span
+ ><tal:case tal:condition="not: here/listCreators"
+  ><span tal:omit-tag="" i18n:translate="">unknown</span></tal:case>.
+  <span tal:omit-tag="" i18n:translate="">Last modified</span
  > <tal:span tal:content="here/ModificationDate">Today</tal:span>.</p>
 </div>
 


=== CMF/CMFDefault/skins/zpt_generic/folder_contents.pt 1.12 => 1.13 ===
--- CMF/CMFDefault/skins/zpt_generic/folder_contents.pt:1.12	Mon Jan 12 07:38:42 2004
+++ CMF/CMFDefault/skins/zpt_generic/folder_contents.pt	Tue Jan 20 17:20:11 2004
@@ -1,17 +1,16 @@
 <tal:page
    xmlns:tal="http://xml.zope.org/namespaces/tal"
    xmlns:metal="http://xml.zope.org/namespaces/metal"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
    tal:define="control python: here.folder_contents_control(**request.form)"
    tal:condition="control"
 ><html metal:use-macro="here/main_template/macros/master">
 <body>
 
-<metal:block metal:fill-slot="main" i18n:domain="cmf_default"
+<metal:block metal:fill-slot="main"
    tal:define="batch control/batch;
                form control/form;
                up control/up">
-<div class="Desktop">
+<div class="Desktop" i18n:domain="cmf_default">
 
 <h2 i18n:translate="">Desktop</h2>
 
@@ -20,7 +19,7 @@
  ><a href="" tal:attributes="href up/url"
   ><img src="" alt="[Link]" border="0" tal:attributes="src up/icon"
       i18n:attributes="alt" /></a>
-  <tal:span i18n:translate="">Up to</tal:span>
+  <span tal:omit-tag="" i18n:translate="">Up to</span>
   <a href="" tal:attributes="href up/url" tal:content="up/id">ID</a></tal:case
 ><tal:case tal:condition="not: up/url"
  ><span class="mild" i18n:translate="">Root</span></tal:case></tal:case>


=== CMF/CMFDefault/skins/zpt_generic/folder_rename_form.pt 1.8 => 1.9 ===
--- CMF/CMFDefault/skins/zpt_generic/folder_rename_form.pt:1.8	Mon Jan 12 07:42:40 2004
+++ CMF/CMFDefault/skins/zpt_generic/folder_rename_form.pt	Tue Jan 20 17:20:11 2004
@@ -1,16 +1,15 @@
 <tal:page
    xmlns:tal="http://xml.zope.org/namespaces/tal"
    xmlns:metal="http://xml.zope.org/namespaces/metal"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
    tal:define="control python: here.folder_rename_control(**request.form)"
    tal:condition="control"
 ><html metal:use-macro="here/main_template/macros/master">
 <body>
 
-<metal:block metal:fill-slot="main" i18n:domain="cmf_default"
+<metal:block metal:fill-slot="main"
    tal:define="batch control/batch;
                form control/form">
-<div class="Desktop">
+<div class="Desktop" i18n:domain="cmf_default">
 
 <h2 i18n:translate="">Rename Items</h2>
 


=== CMF/CMFDefault/skins/zpt_generic/join_form.pt 1.9 => 1.10 ===
--- CMF/CMFDefault/skins/zpt_generic/join_form.pt:1.9	Wed Nov 26 05:08:51 2003
+++ CMF/CMFDefault/skins/zpt_generic/join_form.pt	Tue Jan 20 17:20:11 2004
@@ -1,19 +1,19 @@
 <tal:page
    xmlns:tal="http://xml.zope.org/namespaces/tal"
    xmlns:metal="http://xml.zope.org/namespaces/metal"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
    tal:define="control python: here.join_control(**request.form)"
    tal:condition="control"
 ><html metal:use-macro="here/main_template/macros/master">
 <body>
 
-<metal:block metal:fill-slot="header" i18n:domain="cmf_default">
-<h1 tal:content="control/title" i18n:translate="">Become a member</h1>
+<metal:block metal:fill-slot="header">
+<h1 tal:content="control/title"
+   i18n:domain="cmf_default" i18n:translate="">Become a member</h1>
 </metal:block>
 
-<metal:block metal:fill-slot="main" i18n:domain="cmf_default"
+<metal:block metal:fill-slot="main"
    tal:define="form control/form">
-<div class="Desktop">
+<div class="Desktop" i18n:domain="cmf_default">
 
 <tal:case tal:condition="control/isOrdinaryMember">
   <p i18n:translate=""> You are already a member. You may use the


=== CMF/CMFDefault/skins/zpt_generic/members_manage_form.pt 1.2 => 1.3 ===
--- CMF/CMFDefault/skins/zpt_generic/members_manage_form.pt:1.2	Wed Nov 26 05:08:51 2003
+++ CMF/CMFDefault/skins/zpt_generic/members_manage_form.pt	Tue Jan 20 17:20:11 2004
@@ -1,20 +1,19 @@
 <tal:page
    xmlns:tal="http://xml.zope.org/namespaces/tal"
    xmlns:metal="http://xml.zope.org/namespaces/metal"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
    tal:define="control python: here.members_manage_control(**request.form)"
    tal:condition="control"
 ><html metal:use-macro="here/main_template/macros/master">
 <body>
 
-<metal:block metal:fill-slot="header" i18n:domain="cmf_default">
-<h1 i18n:translate="">Manage Members</h1>
+<metal:block metal:fill-slot="header">
+<h1 i18n:domain="cmf_default" i18n:translate="">Manage Members</h1>
 </metal:block>
 
-<metal:block metal:fill-slot="main" i18n:domain="cmf_default"
+<metal:block metal:fill-slot="main"
    tal:define="batch control/batch;
                form control/form">
-<div class="Desktop">
+<div class="Desktop" i18n:domain="cmf_default">
 <form action="members_manage" method="post"
    tal:attributes="action form/action">
  <table class="BatchTable"


=== CMF/CMFDefault/skins/zpt_generic/recent_news.pt 1.7 => 1.8 ===
--- CMF/CMFDefault/skins/zpt_generic/recent_news.pt:1.7	Tue Dec 23 16:47:26 2003
+++ CMF/CMFDefault/skins/zpt_generic/recent_news.pt	Tue Jan 20 17:20:11 2004
@@ -35,10 +35,11 @@
    ><tal:case tal:condition="not: repeat/creator/start"
     ><tal:case tal:condition="not: repeat/creator/end">, </tal:case
     ><tal:case tal:condition="repeat/creator/end"
-     > <tal:span i18n:translate="">and</tal:span> </tal:case></tal:case
+     > <span tal:omit-tag="" i18n:translate="">and</span> </tal:case
+   ></tal:case
    ><tal:span tal:content="creator">creator</tal:span></tal:loop></tal:case
- ><tal:case tal:condition="not: newsitem/listCreators" i18n:translate=""
-  >unknown</tal:case>
+ ><tal:case tal:condition="not: newsitem/listCreators"
+  ><span tal:omit-tag="" i18n:translate="">unknown</span></tal:case>
   </td>
  </tr>
  <tr>


=== CMF/CMFDefault/skins/zpt_generic/registered_notify_template.pt 1.1 => 1.2 ===
--- CMF/CMFDefault/skins/zpt_generic/registered_notify_template.pt:1.1	Wed Oct 29 10:58:31 2003
+++ CMF/CMFDefault/skins/zpt_generic/registered_notify_template.pt	Tue Jan 20 17:20:11 2004
@@ -1,7 +1,6 @@
 <tal:page xmlns:tal="http://xml.zope.org/namespaces/tal"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
    tal:define="control python: here.registered_notify_control(**options)"
-   i18n:domain="cmf_default"
+><div tal:omit-tag="" i18n:domain="cmf_default"
 >Subject: <tal:span i18n:translate=""><tal:span i18n:name="portal_title"
                                          tal:content="control/portal_title"
                                     />: Your Membership Information</tal:span>
@@ -39,4 +38,4 @@
 
 <tal:span i18n:name="email_from_name"
    tal:content="control/email_from_name" />
-</tal:span></tal:page>
+</tal:span></div></tal:page>


=== CMF/CMFDefault/skins/zpt_generic/talkback_tree.pt 1.5 => 1.6 ===
--- CMF/CMFDefault/skins/zpt_generic/talkback_tree.pt:1.5	Tue Dec 23 16:47:26 2003
+++ CMF/CMFDefault/skins/zpt_generic/talkback_tree.pt	Tue Jan 20 17:20:11 2004
@@ -34,10 +34,11 @@
    ><tal:case tal:condition="not: repeat/creator/start"
     ><tal:case tal:condition="not: repeat/creator/end">, </tal:case
     ><tal:case tal:condition="repeat/creator/end"
-     > <tal:span i18n:translate="">and</tal:span> </tal:case></tal:case
+     > <span tal:omit-tag="" i18n:translate="">and</span> </tal:case
+   ></tal:case
    ><tal:span tal:content="creator">creator</tal:span></tal:loop></tal:case
- ><tal:case tal:condition="not: obj/listCreators" i18n:translate=""
-  >unknown</tal:case>
+ ><tal:case tal:condition="not: obj/listCreators"
+  ><span tal:omit-tag="" i18n:translate="">unknown</span></tal:case>
    on <span tal:replace="obj/CreationDate">Today</span>
   </td>
  </tr>




More information about the CMF-checkins mailing list