[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic -
content_byline.pt:1.4.26.1 recent_news.pt:1.6.34.1
talkback_tree.pt:1.4.52.1
Yvo Schubbe
schubbe at web.de
Tue Dec 23 08:49:44 EST 2003
Update of /cvs-repository/CMF/CMFDefault/skins/zpt_generic
In directory cvs.zope.org:/tmp/cvs-serv8345/CMFDefault/skins/zpt_generic
Modified Files:
Tag: yuppie-collector025-branch
content_byline.pt recent_news.pt talkback_tree.pt
Log Message:
- use listCreators to show all creators
=== CMF/CMFDefault/skins/zpt_generic/content_byline.pt 1.4 => 1.4.26.1 ===
--- CMF/CMFDefault/skins/zpt_generic/content_byline.pt:1.4 Fri Mar 14 13:16:01 2003
+++ CMF/CMFDefault/skins/zpt_generic/content_byline.pt Tue Dec 23 08:49:44 2003
@@ -1,24 +1,27 @@
-<div id="ContentByline"
- metal:define-macro="byline"
- tal:define="creator here/Creator;
- home_url python: here.portal_membership.getHomeUrl(creator);
- "
- i18n:domain="cmf_default"
->
-
-<p>
- <span tal:omit-tag="" i18n:translate="">Created by</span>
- <span tal:condition="home_url"
- ><a href="." title="Here"
- tal:attributes="href home_url;
- title creator;
- "
- tal:content="creator">Creator</a
- ></span><span tal:condition="not: home_url"
- tal:content="creator">Creator</span
- >. <span tal:omit-tag="" i18n:translate="">Last modified</span>
- <span tal:content="here/ModificationDate"
- >Today</span>.
-</p>
+<html>
+<body>
+<div id="ContentByline"
+ metal:define-macro="byline"
+ tal:define="mtool here/portal_membership"
+ i18n:domain="cmf_default">
+ <p><tal:span i18n:translate="">Created by</tal: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
+ ><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:span tal:content="here/ModificationDate">Today</tal:span>.</p>
</div>
+
+</body>
+</html>
=== CMF/CMFDefault/skins/zpt_generic/recent_news.pt 1.6 => 1.6.34.1 ===
--- CMF/CMFDefault/skins/zpt_generic/recent_news.pt:1.6 Thu Mar 6 05:33:02 2003
+++ CMF/CMFDefault/skins/zpt_generic/recent_news.pt Tue Dec 23 08:49:44 2003
@@ -17,29 +17,37 @@
</p>
<table cellspacing="0" border="0" width="90%"
- tal:repeat="newsitems batch"
+ tal:repeat="newsitem batch"
tal:condition="newsitems">
<tr>
<td class="NewsListing" align="left" valign="top">
<a href="" class="NewsListing"
- tal:attributes="href newsitems/getURL"
- tal:content="newsitems/Title">Title</a>
+ tal:attributes="href newsitem/getURL"
+ tal:content="newsitem/Title">Title</a>
</td>
<td class="NewsListing" align="right" valign="top"
- tal:content="newsitems/Date">Date
+ tal:content="newsitem/Date">Date
</td>
</tr>
<tr><td class="NewsByLine" valign="top" colspan="2" align="left">
- By <span tal:replace="newsitems/Creator">Creator</span>
+ By <tal:case tal:condition="newsitem/listCreators"
+ ><tal:loop tal:repeat="creator newsitem/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
+ ><tal:span tal:content="creator">creator</tal:span></tal:loop></tal:case
+ ><tal:case tal:condition="not: newsitem/listCreators" i18n:translate=""
+ >unknown</tal:case>
</td>
- </tr>
+ </tr>
<tr>
<td colspan="2">
- <em> <span tal:define="pss modules/Products.PythonScripts.standard; niDescription newsitems/Description"
+ <em> <span tal:define="pss modules/Products.PythonScripts.standard; niDescription newsitem/Description"
tal:replace="structure python:pss.structured_text(niDescription)">Description</span></em>
</td>
</tr>
- </table>
+ </table>
<div tal:condition="python:not(newsitems)">
<p class="Desktop" i18n:translate="">
No news is good news!
@@ -56,4 +64,3 @@
</div>
</body>
</html>
-
=== CMF/CMFDefault/skins/zpt_generic/talkback_tree.pt 1.4 => 1.4.52.1 ===
--- CMF/CMFDefault/skins/zpt_generic/talkback_tree.pt:1.4 Thu Aug 1 11:28:50 2002
+++ CMF/CMFDefault/skins/zpt_generic/talkback_tree.pt Tue Dec 23 08:49:44 2003
@@ -4,7 +4,7 @@
<table cellspacing="0" border="0"
metal:define-macro="tree"
tal:define="t python:here.setup_talkback_tree(here);
- height t/root/height;">
+ height t/root/height;">
<tr tal:repeat="row t/rows">
<td colspan="1"
tal:define="indent python: row.depth - 1"
@@ -25,11 +25,19 @@
<a href=""
tal:attributes="href url"
><img border="0" src=""
- tal:attributes="src string:${obj/portal_url}/${obj/getIcon}" /></a>
+ tal:attributes="src string:${obj/portal_url}/${obj/getIcon}" /></a>
<a href=""
tal:attributes="href url"
tal:content="obj/Title">Title</a>,
- by <span tal:replace="obj/Creator">Me</span>
+ by <tal:case tal:condition="obj/listCreators"
+ ><tal:loop tal:repeat="creator obj/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
+ ><tal:span tal:content="creator">creator</tal:span></tal:loop></tal:case
+ ><tal:case tal:condition="not: obj/listCreators" i18n:translate=""
+ >unknown</tal:case>
on <span tal:replace="obj/CreationDate">Today</span>
</td>
</tr>
More information about the CMF-checkins
mailing list