[CMF-checkins] CVS: CMF/CMFDefault/skins/generic -
content_byline.dtml:1.3 discussion_reply.py:1.4
discussion_thread_view.dtml:1.3 itemRSS.dtml:1.3
listMetaTags.py:1.2 recent_news.dtml:1.8
search_form.dtml:1.10 showThreads.dtml:1.6
Yvo Schubbe
schubbe at web.de
Tue Dec 23 16:47:56 EST 2003
Update of /cvs-repository/CMF/CMFDefault/skins/generic
In directory cvs.zope.org:/tmp/cvs-serv21105/CMFDefault/skins/generic
Modified Files:
content_byline.dtml discussion_reply.py
discussion_thread_view.dtml itemRSS.dtml listMetaTags.py
recent_news.dtml search_form.dtml showThreads.dtml
Log Message:
Merged yuppie-collector025-branch:
- Creator element no longer depends on Ownership. (Collector #25)
- TypeInfo's _finishConstruction() now calls reindexObject().
- Removed WorkflowMethod wrapper of Document.setFormat().
=== CMF/CMFDefault/skins/generic/content_byline.dtml 1.2 => 1.3 ===
--- CMF/CMFDefault/skins/generic/content_byline.dtml:1.2 Thu May 17 17:51:36 2001
+++ CMF/CMFDefault/skins/generic/content_byline.dtml Tue Dec 23 16:47:25 2003
@@ -1,13 +1,21 @@
<p>
Created by
- <dtml-let creator=Creator
+ <dtml-if listCreators>
+ <dtml-in listCreators
+ ><dtml-unless sequence-start
+ ><dtml-if sequence-end> and
+ <dtml-else>,
+ </dtml-if
+ ></dtml-unless>
+ <dtml-let creator=sequence-item
home_url="portal_membership.getHomeUrl(creator)">
- <dtml-if home_url>
- <a href="&dtml-home_url;">&dtml-creator;</a>.
- <dtml-else>
- &dtml-creator;.
- </dtml-if>
- </dtml-let>
+ <dtml-if home_url
+ ><a href="&dtml-home_url;">&dtml-creator;</a><dtml-else
+ >&dtml-creator;</dtml-if
+></dtml-let></dtml-in>.
+ <dtml-else>
+ unknown.
+ </dtml-if>
<dtml-if ModificationDate>
Last modified on <dtml-var ModificationDate>
</dtml-if>
=== CMF/CMFDefault/skins/generic/discussion_reply.py 1.3 => 1.4 ===
--- CMF/CMFDefault/skins/generic/discussion_reply.py:1.3 Thu Oct 17 15:38:36 2002
+++ CMF/CMFDefault/skins/generic/discussion_reply.py Tue Dec 23 16:47:25 2003
@@ -2,10 +2,8 @@
##parameters=title,text
##title=Reply to content
-Creator = context.portal_membership.getAuthenticatedMember().getId()
replyID = context.createReply( title = title
, text = text
- , Creator = Creator
)
target = '%s/%s' % (context.absolute_url(), replyID)
=== CMF/CMFDefault/skins/generic/discussion_thread_view.dtml 1.2 => 1.3 ===
--- CMF/CMFDefault/skins/generic/discussion_thread_view.dtml:1.2 Mon Apr 9 16:21:06 2001
+++ CMF/CMFDefault/skins/generic/discussion_thread_view.dtml Tue Dec 23 16:47:25 2003
@@ -14,7 +14,17 @@
<dtml-tree branches="getReplies">
<a href="&dtml-absolute_url;"><img border=0 src="<dtml-var SCRIPT_NAME><dtml-var getIcon>"></a>
<a href="&dtml-absolute_url;">&dtml-title;</a>,
- by <dtml-var Creator>
+ by <dtml-if listCreators>
+ <dtml-in listCreators
+ ><dtml-unless sequence-start
+ ><dtml-if sequence-end> and
+ <dtml-else>,
+ </dtml-if
+ ></dtml-unless>
+ <dtml-var sequence-item></dtml-in>
+ <dtml-else>
+ unknown
+ </dtml-if>
on <dtml-var Date>
</dtml-tree>
=== CMF/CMFDefault/skins/generic/itemRSS.dtml 1.2 => 1.3 ===
--- CMF/CMFDefault/skins/generic/itemRSS.dtml:1.2 Thu Nov 13 09:46:36 2003
+++ CMF/CMFDefault/skins/generic/itemRSS.dtml Tue Dec 23 16:47:25 2003
@@ -5,7 +5,9 @@
<dtml-var Description>
</description>
<dc:publisher><dtml-var Publisher></dc:publisher>
-<dc:creator><dtml-var Creator></dc:creator>
+<dtml-in listCreators>
+<dc:creator><dtml-var sequence-item></dc:creator>
+</dtml-in>
<dc:rights><dtml-var Rights></dc:rights>
<dtml-in Subject>
<dc:subject>
=== CMF/CMFDefault/skins/generic/listMetaTags.py 1.1 => 1.2 ===
--- CMF/CMFDefault/skins/generic/listMetaTags.py:1.1 Wed Jul 10 11:22:19 2002
+++ CMF/CMFDefault/skins/generic/listMetaTags.py Tue Dec 23 16:47:25 2003
@@ -10,8 +10,10 @@
hdrlist.append( ( 'DC.description', context.Description() ) )
hdrlist.append( ( 'DC.subject', ', '.join( context.Subject() ) ) )
-hdrlist.append( ( 'DC.creator', context.Creator() ) )
-hdrlist.append( ( 'DC.contributors', ', '.join( context.Contributors() ) ) )
+for creator in context.listCreators():
+ hdrlist.append( ( 'DC.creator', creator ) )
+for contributor in context.listContributors():
+ hdrlist.append( ( 'DC.contributor', contributor ) )
if context.Publisher() != 'No publisher':
hdrlist.append( ( 'DC.publisher', context.Publisher() ) )
@@ -39,4 +41,4 @@
hdrlist.append( ( 'DC.rights', context.Rights() ) )
# Strip empty values
-return filter( lambda x: x[1], hdrlist )
+return filter( lambda x: x[1], hdrlist )
=== CMF/CMFDefault/skins/generic/recent_news.dtml 1.7 => 1.8 ===
--- CMF/CMFDefault/skins/generic/recent_news.dtml:1.7 Fri Jul 5 15:45:05 2002
+++ CMF/CMFDefault/skins/generic/recent_news.dtml Tue Dec 23 16:47:25 2003
@@ -18,7 +18,17 @@
<tr>
<td class="NewsListing" align="left" valign="top">
<a href="&dtml-getURL;"> &dtml-Title; </a>
- <br> By &dtml-Creator;
+ <br> By <dtml-if listCreators>
+ <dtml-in listCreators
+ ><dtml-unless sequence-start
+ ><dtml-if sequence-end> and
+ <dtml-else>,
+ </dtml-if
+ ></dtml-unless>
+ <dtml-var sequence-item></dtml-in>
+ <dtml-else>
+ unknown
+ </dtml-if>
</td>
<td class="NewsListing" align="right" valign="top">
<dtml-var Date>
=== CMF/CMFDefault/skins/generic/search_form.dtml 1.9 => 1.10 ===
--- CMF/CMFDefault/skins/generic/search_form.dtml:1.9 Fri Jul 5 15:45:05 2002
+++ CMF/CMFDefault/skins/generic/search_form.dtml Tue Dec 23 16:47:25 2003
@@ -28,7 +28,7 @@
</td>
</tr>
</dtml-if>
-
+
<tr valign="top">
<th> Full Text
</th>
@@ -135,7 +135,7 @@
<th> Creator
</th>
<td>
- <input name="Creator" size="20">
+ <input name="listCreators" size="20">
<dl class="FieldHelp">
<dd> To find items by a particular user only, enter
@@ -158,4 +158,3 @@
</div>
<dtml-var standard_html_footer>
-
=== CMF/CMFDefault/skins/generic/showThreads.dtml 1.5 => 1.6 ===
--- CMF/CMFDefault/skins/generic/showThreads.dtml:1.5 Sun Jun 17 15:21:06 2001
+++ CMF/CMFDefault/skins/generic/showThreads.dtml Tue Dec 23 16:47:25 2003
@@ -13,7 +13,17 @@
<a href="&dtml-absolute_url;"
><img border=0 src="&dtml-portal_url;/&dtml-getIcon;"></a>
<a href="&dtml-absolute_url;">&dtml-Title;</a>,
- by <dtml-var Creator>
+ by <dtml-if listCreators>
+ <dtml-in listCreators
+ ><dtml-unless sequence-start
+ ><dtml-if sequence-end> and
+ <dtml-else>,
+ </dtml-if
+ ></dtml-unless>
+ <dtml-var sequence-item></dtml-in>
+ <dtml-else>
+ unknown
+ </dtml-if>
on <dtml-var CreationDate>
</dtml-tree>
</dtml-let>
More information about the CMF-checkins
mailing list