[CMF-checkins] CVS: CMF/CMFDefault/skins/zpt_generic -
folder_contents.pt:1.14 folder_contents_control.py:1.3
folder_rename_form.pt:1.10 search.pt:1.8
search_results_control.py:1.2 undo_form.pt:1.8
Yvo Schubbe
y.2004_ at wcm-solutions.de
Mon Feb 2 11:50:33 EST 2004
Update of /cvs-repository/CMF/CMFDefault/skins/zpt_generic
In directory cvs.zope.org:/tmp/cvs-serv12982/CMFDefault/skins/zpt_generic
Modified Files:
folder_contents.pt folder_contents_control.py
folder_rename_form.pt search.pt search_results_control.py
undo_form.pt
Log Message:
- replaced 'item(s)' and 'result' with more specific names (helps grepping through the code)
=== CMF/CMFDefault/skins/zpt_generic/folder_contents.pt 1.13 => 1.14 ===
--- CMF/CMFDefault/skins/zpt_generic/folder_contents.pt:1.13 Tue Jan 20 17:20:11 2004
+++ CMF/CMFDefault/skins/zpt_generic/folder_contents.pt Mon Feb 2 11:50:32 2004
@@ -9,19 +9,20 @@
<metal:block metal:fill-slot="main"
tal:define="batch control/batch;
form control/form;
- up control/up">
+ up_info control/up_info">
<div class="Desktop" i18n:domain="cmf_default">
<h2 i18n:translate="">Desktop</h2>
-<tal:case tal:condition="up"
-><tal:case tal:condition="up/url"
- ><a href="" tal:attributes="href up/url"
- ><img src="" alt="[Link]" border="0" tal:attributes="src up/icon"
+<tal:case tal:condition="up_info"
+><tal:case tal:condition="up_info/url"
+ ><a href="" tal:attributes="href up_info/url"
+ ><img src="" alt="[Link]" border="0" tal:attributes="src up_info/icon"
i18n:attributes="alt" /></a>
<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"
+ <a href="" tal:attributes="href up_info/url"
+ tal:content="up_info/id">ID</a></tal:case
+><tal:case tal:condition="not: up_info/url"
><span class="mild" i18n:translate="">Root</span></tal:case></tal:case>
<form action="folder_contents" method="post"
@@ -30,42 +31,46 @@
<tr>
<td width="49%">
<table>
- <tr tal:repeat="item batch/listItemInfos1">
+ <tr tal:repeat="item_info batch/listItemInfos1">
<td width="5"
><input type="checkbox" name="ids:tuple" value="" id=""
- tal:attributes="value item/id; id item/checkbox"
- tal:condition="item/checkbox" /></td>
+ tal:attributes="value item_info/id; id item_info/checkbox"
+ tal:condition="item_info/checkbox" /></td>
<td
- ><a href="" tal:attributes="href item/url" tal:condition="item/icon"
+ ><a href="" tal:attributes="href item_info/url"
+ tal:condition="item_info/icon"
><img src="" alt="" border="0"
- tal:attributes="src item/icon; alt item/type"
+ tal:attributes="src item_info/icon; alt item_info/type"
i18n:attributes="alt" /></a></td>
<td
- ><a href="" tal:attributes="href item/url"
- ><tal:span tal:content="item/id">ID</tal:span>
- <tal:case tal:condition="item/title"
- tal:content="string:(${item/title})">(Title)</tal:case></a></td>
+ ><a href="" tal:attributes="href item_info/url"
+ ><tal:span tal:content="item_info/id">ID</tal:span>
+ <tal:case tal:condition="item_info/title"
+ tal:content="string:(${item_info/title})">(Title)</tal:case
+ ></a></td>
</tr>
</table>
</td>
<td width="2%"> </td>
<td width="49%" tal:condition="batch/listItemInfos2">
<table>
- <tr tal:repeat="item batch/listItemInfos2">
+ <tr tal:repeat="item_info batch/listItemInfos2">
<td width="5"
><input type="checkbox" name="ids:tuple" value="" id=""
- tal:attributes="value item/id; id item/checkbox"
- tal:condition="item/checkbox" /></td>
+ tal:attributes="value item_info/id; id item_info/checkbox"
+ tal:condition="item_info/checkbox" /></td>
<td
- ><a href="" tal:attributes="href item/url" tal:condition="item/icon"
+ ><a href="" tal:attributes="href item_info/url"
+ tal:condition="item_info/icon"
><img src="" alt="" border="0"
- tal:attributes="src item/icon; alt item/type"
+ tal:attributes="src item_info/icon; alt item_info/type"
i18n:attributes="alt" /></a></td>
<td
- ><a href="" tal:attributes="href item/url"
- ><tal:span tal:content="item/id">ID</tal:span>
- <tal:case tal:condition="item/title"
- tal:content="string:(${item/title})">(Title)</tal:case></a></td>
+ ><a href="" tal:attributes="href item_info/url"
+ ><tal:span tal:content="item_info/id">ID</tal:span>
+ <tal:case tal:condition="item_info/title"
+ tal:content="string:(${item_info/title})">(Title)</tal:case
+ ></a></td>
</tr>
</table>
</td>
=== CMF/CMFDefault/skins/zpt_generic/folder_contents_control.py 1.2 => 1.3 ===
--- CMF/CMFDefault/skins/zpt_generic/folder_contents_control.py:1.2 Thu Jan 8 03:33:06 2004
+++ CMF/CMFDefault/skins/zpt_generic/folder_contents_control.py Mon Feb 2 11:50:32 2004
@@ -91,19 +91,19 @@
upitems_list_allowed = mtool.checkPermission(ListFolderContents, context,
'aq_parent')
-up = {}
+up_info = {}
if upitems_list_allowed:
up_obj = context.aq_parent
if hasattr(up_obj, 'portal_url'):
up_url = atool.getActionInfo('folder/folderContents', up_obj)['url']
- up = { 'icon': '%s/UpFolder_icon.gif' % portal_url,
- 'id': up_obj.getId(),
- 'url': up_url }
+ up_info = { 'icon': '%s/UpFolder_icon.gif' % portal_url,
+ 'id': up_obj.getId(),
+ 'url': up_url }
else:
- up = { 'icon': '',
- 'id': 'Root',
- 'url': '' }
-control['up'] = up
+ up_info = { 'icon': '',
+ 'id': 'Root',
+ 'url': '' }
+control['up_info'] = up_info
target = atool.getActionInfo('folder/folderContents', context)['url']
context.filterCookie()
=== CMF/CMFDefault/skins/zpt_generic/folder_rename_form.pt 1.9 => 1.10 ===
--- CMF/CMFDefault/skins/zpt_generic/folder_rename_form.pt:1.9 Tue Jan 20 17:20:11 2004
+++ CMF/CMFDefault/skins/zpt_generic/folder_rename_form.pt Mon Feb 2 11:50:32 2004
@@ -16,20 +16,20 @@
<form action="members_manage" method="post"
tal:attributes="action form/action">
<table class="FormLayout">
- <tr tal:repeat="item batch/listItemInfos">
+ <tr tal:repeat="item_info batch/listItemInfos">
<td width="8%"
><img src="" alt="" border="0"
- tal:attributes="src item/icon; alt item/type"
+ tal:attributes="src item_info/icon; alt item_info/type"
i18n:attributes="alt" /></td>
<td width="20%"
- ><tal:span tal:replace="item/id">ID</tal:span>
+ ><tal:span tal:replace="item_info/id">ID</tal:span>
<input type="hidden" name="ids:list" value=""
- tal:attributes="value item/id" /></td>
+ tal:attributes="value item_info/id" /></td>
<td width="5%"
><strong i18n:translate="">to</strong></td>
<td
><input type="text" name="new_ids:list" value=""
- tal:attributes="value item/id" size="20" /></td>
+ tal:attributes="value item_info/id" size="20" /></td>
</tr>
</table>
<metal:block metal:use-macro="here/form_widgets/macros/buttons" />
=== CMF/CMFDefault/skins/zpt_generic/search.pt 1.7 => 1.8 ===
--- CMF/CMFDefault/skins/zpt_generic/search.pt:1.7 Mon Feb 2 07:44:51 2004
+++ CMF/CMFDefault/skins/zpt_generic/search.pt Mon Feb 2 11:50:32 2004
@@ -13,7 +13,7 @@
<h2 i18n:translate="">Search Results</h2>
<metal:block metal:use-macro="here/batch_widgets/macros/summary" />
-<table class="SearchResults" tal:condition="batch/listItemInfos">
+<table class="SearchResults" tal:condition="batch/listItemBrains">
<thead>
<tr>
<td width="16"> </td>
@@ -22,31 +22,31 @@
<th i18n:translate="">Date</th>
</tr>
</thead>
- <tbody tal:repeat="result batch/listItemInfos">
- <tr tal:define="objURL string:${result/getURL}/view">
+ <tbody tal:repeat="item_brain batch/listItemBrains">
+ <tr tal:define="objURL string:${item_brain/getURL}/view">
<td><a href=""
- tal:condition="result/getIcon|nothing"
+ tal:condition="item_brain/getIcon|nothing"
tal:attributes="href objURL"><img src="" border="0" alt="" title=""
- tal:define="alt result/Type"
- tal:attributes="src result/getIcon;
+ tal:define="alt item_brain/Type"
+ tal:attributes="src item_brain/getIcon;
alt alt;
title alt" /></a></td>
<td><a href=""
tal:attributes="href objURL"><span
- tal:condition="result/Title"
- tal:replace="result/Title">Title</span><span
- tal:condition="not:result/Title"
+ tal:condition="item_brain/Title"
+ tal:replace="item_brain/Title">Title</span><span
+ tal:condition="not:item_brain/Title"
tal:omit-tag=""
i18n:translate="">(No title)</span></a></td>
- <td tal:content="result/Type" i18n:translate="">Type</td>
- <td tal:content="result/Date">Date</td>
+ <td tal:content="item_brain/Type" i18n:translate="">Type</td>
+ <td tal:content="item_brain/Date">Date</td>
</tr>
<tr>
<td> </td>
<td colspan="3"><em
- tal:condition="result/Description"
- tal:content="result/Description">Description</em><em
- tal:condition="not:result/Description"
+ tal:condition="item_brain/Description"
+ tal:content="item_brain/Description">Description</em><em
+ tal:condition="not:item_brain/Description"
i18n:translate="">(No description)</em></td>
</tr>
</tbody>
=== CMF/CMFDefault/skins/zpt_generic/search_results_control.py 1.1 => 1.2 ===
--- CMF/CMFDefault/skins/zpt_generic/search_results_control.py:1.1 Mon Feb 2 07:44:51 2004
+++ CMF/CMFDefault/skins/zpt_generic/search_results_control.py Mon Feb 2 11:50:32 2004
@@ -42,7 +42,7 @@
'match': kw.get('SearchableText') }
navigation = context.getBatchNavigation(batch_obj, target, **kw)
control['batch'] = { 'summary': summary,
- 'listItemInfos': batch_obj,
+ 'listItemBrains': batch_obj,
'navigation': navigation }
return control
=== CMF/CMFDefault/skins/zpt_generic/undo_form.pt 1.7 => 1.8 ===
--- CMF/CMFDefault/skins/zpt_generic/undo_form.pt:1.7 Sun Jun 8 15:47:52 2003
+++ CMF/CMFDefault/skins/zpt_generic/undo_form.pt Mon Feb 2 11:50:32 2004
@@ -60,27 +60,27 @@
</td>
</tr>
- <tr tal:repeat="items transactions">
+ <tr tal:repeat="transaction transactions">
<td valign="top">
<input type="checkbox" name="transaction_info:list" value=""
- tal:attributes="value items/id" />
+ tal:attributes="value transaction/id" />
</td>
<td valign="top">
- <strong><span tal:replace="items/description" /></strong>
+ <strong><span tal:replace="transaction/description" /></strong>
<span tal:omit-tag="" i18n:translate="">by</span>
<strong>
- <span tal:condition="items/user_name|nothing">
- <span tal:replace="items/user_name" />
+ <span tal:condition="transaction/user_name|nothing">
+ <span tal:replace="transaction/user_name" />
</span>
- <span tal:condition="not: items/user_name|nothing">
+ <span tal:condition="not: transaction/user_name|nothing">
<em i18n:translate="">Zope</em>
</span>
</strong>
<span tal:omit-tag="" i18n:translate="">on</span>
- <span tal:replace="python: items['time'].Month()" />
- <span tal:replace="python: items['time'].day()" />
+ <span tal:replace="python: transaction['time'].Month()" />
+ <span tal:replace="python: transaction['time'].day()" />
<span tal:omit-tag="" i18n:translate="">at</span>
- <span tal:replace="python: items['time'].Time()" />
+ <span tal:replace="python: transaction['time'].Time()" />
</td>
</tr>
More information about the CMF-checkins
mailing list