[Erp5-report] r45709 kazuhiko - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Apr 27 21:08:35 CEST 2011
Author: kazuhiko
Date: Wed Apr 27 21:08:34 2011
New Revision: 45709
URL: http://svn.erp5.org?rev=45709&view=rev
Log:
WebSite_getFancyRelativeDate is just a duplicate. use Base_getDiffBetweenDateAndNow instead.
Removed:
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_getFancyRelativeDate.xml
Modified:
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Document_getPopupInfo.xml
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewDashboardRenderer.xml
erp5/trunk/bt5/erp5_web/bt/revision
Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Document_getPopupInfo.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Document_getPopupInfo.xml?rev=45709&r1=45708&r2=45709&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Document_getPopupInfo.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Document_getPopupInfo.xml [utf8] Wed Apr 27 21:08:34 2011
@@ -66,17 +66,17 @@ doc_info = {}\n
doc_info[\'owner_list\'] = context.Base_getOwnerInfoList()\n
\n
if context.getModificationDate() is not None:\n
- doc_info[\'modification_date\'] = context.WebSite_getFancyRelativeDate(context.getModificationDate())\n
+ doc_info[\'modification_date\'] = context.Base_getDiffBetweenDateAndNow(context.getModificationDate())\n
\n
publication_date = context.Document_getLastWorkflowStateEntryDate(state=(\'public,\'),\n
state_name=\'validation_state\')\n
if publication_date is not None:\n
- doc_info[\'publication_date\'] = context.WebSite_getFancyRelativeDate(publication_date)\n
+ doc_info[\'publication_date\'] = context.Base_getDiffBetweenDateAndNow(publication_date)\n
\n
release_date = context.Document_getLastWorkflowStateEntryDate(state=(\'released,\'),\n
state_name=\'validation_state\')\n
if release_date is not None:\n
- doc_info[\'release_date\'] = context.WebSite_getFancyRelativeDate(release_date)\n
+ doc_info[\'release_date\'] = context.Base_getDiffBetweenDateAndNow(release_date)\n
\n
try:\n
doc_info[\'status\'] = context.getTranslatedValidationStateTitle() or \'\'\n
Removed: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_getFancyRelativeDate.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_getFancyRelativeDate.xml?rev=45708&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_getFancyRelativeDate.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_getFancyRelativeDate.xml (removed)
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>Script_magic</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>name_container</string> </key>
- <value> <string>container</string> </value>
- </item>
- <item>
- <key> <string>name_context</string> </key>
- <value> <string>context</string> </value>
- </item>
- <item>
- <key> <string>name_m_self</string> </key>
- <value> <string>script</string> </value>
- </item>
- <item>
- <key> <string>name_subpath</string> </key>
- <value> <string>traverse_subpath</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_body</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-""" \n
- Calculate and format the time difference between now and supplied date. \n
-"""\n
-\n
-translateString = context.Base_translateString\n
-dif = DateTime() - date_object\n
-hour = 1.0 / 24\n
-minute = 1.0 / (24 * 60)\n
-if dif < 1:\n
- if dif < hour:\n
- return translateString("${timedif} min ago", mapping = {\'timedif\':int(dif / minute)})\n
- return translateString("${timedif}h ago", mapping = {\'timedif\':int(dif / hour)})\n
-if int(dif) == 1: \n
- return translateString(\'1 day ago\')\n
-return translateString("${timedif} days ago", mapping = {\'timedif\':int(dif)})\n
-
-
-]]></string> </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string>date_object</string> </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>WebSite_getFancyRelativeDate</string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Generate relative fancy formatted date as string</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewDashboardRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewDashboardRenderer.xml?rev=45709&r1=45708&r2=45709&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewDashboardRenderer.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewDashboardRenderer.xml [utf8] Wed Apr 27 21:08:34 2011
@@ -79,7 +79,7 @@
<li tal:repeat="newsitem python: news_list">\n
<a tal:define="url python: \'%s/view\' % newsitem.absolute_url()"\n
tal:attributes="href url">\n
- <tal:block tal:replace="python: here.WebSite_getFancyRelativeDate(newsitem.getCreationDate())"\n
+ <tal:block tal:replace="python: here.Base_getDiffBetweenDateAndNow(newsitem.getCreationDate())"\n
tal:on-error="string:"/>—\n
<tal:block tal:replace="newsitem/getTitleOrId"\n
tal:on-error="string:"/>\n
@@ -151,8 +151,7 @@
</div>\n
</tal:block>\n
</tal:block>\n
-</tal:block>\n
-
+</tal:block>
]]></unicode> </value>
</item>
Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=45709&r1=45708&r2=45709&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Wed Apr 27 21:08:34 2011
@@ -1 +1 @@
-1044
\ No newline at end of file
+1045
\ No newline at end of file
More information about the Erp5-report
mailing list