[Erp5-report] r17883 - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/erp5_web_...

[nobody at svn.erp5.org]

Author: yusei
Date: Wed Nov 28 18:53:33 2007
New Revision: 17883

URL: http://svn.erp5.org?rev=17883&view=rev
Log:
2007-11-28 Yusei
* Remove hardcoded ingestion email address from WebSite_viewContributeRenderer. Please use Email Ingestion Address preference instead.

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml
    erp5/trunk/bt5/erp5_web/bt/change_log
    erp5/trunk/bt5/erp5_web/bt/revision

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml?rev=17883&r1=17882&r2=17883&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml Wed Nov 28 18:53:33 2007
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -94,7 +91,10 @@
       \n
       <div style="float:right; margin-top:10px;">\n
       <a onclick="setMailString();"  id="mail_contribute_button"\n
-         href="mailto:dms at dms.nexedi.com?subject=Contribution&body=">\n
+         href="mailto:dms at dms.nexedi.com?subject=Contribution&body="\n
+         tal:define="ingestion_address here/portal_preferences/getPreferredDocumentEmailIngestionAddress|nothing"\n
+         tal:condition="ingestion_address"\n
+         tal:attributes="href string:${ingestion_address}?subject=Contribution&body=">\n
         <img src="send_by_mail" border="0"/>\n
         <tal:block  i18n:translate="" i18n:domain="ui">Click here to contribute by Email</tal:block></a>\n
       &nbsp;\n

Modified: erp5/trunk/bt5/erp5_web/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/change_log?rev=17883&r1=17882&r2=17883&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_web/bt/change_log Wed Nov 28 18:53:33 2007
@@ -1,3 +1,6 @@
+2007-11-28 Yusei
+* Remove hardcoded ingestion email address from WebSite_viewContributeRenderer. Please use Email Ingestion Address preference instead.
+
 2007-11-28 Yusei
 * Remove bookmark box from WebSite_viewDashboardRenderer.
 

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=17883&r1=17882&r2=17883&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision Wed Nov 28 18:53:33 2007
@@ -1,1 +1,1 @@
-604
+606