Changeset 52844
- Timestamp:
- 05/09/08 16:56:48 (4 months ago)
- Files:
-
- CPS3/products/CPSDefault/trunk/CHANGES (modified) (2 diffs)
- CPS3/products/CPSDefault/trunk/skins/cps_default/content_lib_info_one_column.pt (modified) (2 diffs)
- CPS3/products/CPSDefault/trunk/skins/cps_default/getContentInfo.py (modified) (3 diffs)
- CPS3/products/CPSDefault/trunk/skins/cps_default/isInSection.py (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
CPS3/products/CPSDefault/trunk/CHANGES
r52842 r52844 5 5 ~~~~~~~~~~~~ 6 6 - #1907: Make it possible to publish recursively into different sections. 7 Bug fixes 8 ~~~~~~~~~ 9 - #1908: In section folders, document listings should display their effective 10 date instead of their last modification date. 7 11 - #1890: Image without image breaks Image Gallery. 8 12 Part of the fix includes setting 'is_required' to True by default for … … 10 14 Another part of fix is in CPSSchemas.BasicWidgets to correctly handle 11 15 'is_required' field when no image was supplied to 'Image Widget'. 12 Bug fixes13 ~~~~~~~~~14 16 - Better doc in the code. 15 17 New internal features CPS3/products/CPSDefault/trunk/skins/cps_default/content_lib_info_one_column.pt
r32909 r52844 2 2 <!-- $Id$ --> 3 3 4 <!-- One column doc information --> 4 <!-- One column doc information 5 6 Mandatory parameters to pass to this macro: 7 8 - item : the proxy of the document 9 --> 5 10 6 11 <metal:block define-macro="info_one_column"> … … 16 21 status_time not:nothing; 17 22 description python:info['doc'].description"> 18 <span tal:content="python:here.getDateStr(info['time'],'short')" />. 19 <span tal:content="description" /> 23 <tal:span define="time_attribute python:test(here.isInSection(item), 24 'effective', 'time')" 25 content="python:here.getDateStr(info[time_attribute],'short')" /> 26 <tal:span content="description" /> 20 27 </tal:block> 21 28 </div> CPS3/products/CPSDefault/trunk/skins/cps_default/getContentInfo.py
r50891 r52844 1 2 1 ##parameters=proxy=None, doc=None, level=0, cpsmcat=None 3 2 # $Id$ … … 206 205 info['lang'] = 'en' 207 206 info['time'] = proxy.modified() 207 info['effective'] = proxy.effective() 208 208 209 209 # level 1 … … 301 301 else: 302 302 info['time_str'] = '' 303 if info['effective']: 304 info['effective_str'] = context.getDateStr(info['effective']) 305 else: 306 info['effective_str'] = '' 303 307 304 308
