[CMF-checkins] CVS: Products/CMFDefault/skins/zpt_generic - mail_password_template.pt:1.3 registered_notify_template.pt:1.5

[Yvo Schubbe]

Update of /cvs-repository/Products/CMFDefault/skins/zpt_generic
In directory cvs.zope.org:/tmp/cvs-serv441/CMFDefault/skins/zpt_generic

Modified Files:
	mail_password_template.pt registered_notify_template.pt 
Log Message:
- made sure URLs are surrounded by whitespace
- added dummy defaults for testing


=== Products/CMFDefault/skins/zpt_generic/mail_password_template.pt 1.2 => 1.3 ===
--- Products/CMFDefault/skins/zpt_generic/mail_password_template.pt:1.2	Fri Sep 17 08:17:10 2004
+++ Products/CMFDefault/skins/zpt_generic/mail_password_template.pt	Thu Oct  7 07:13:52 2004
@@ -1,15 +1,16 @@
 <tal:page i18n:domain="cmf_default"
-   tal:define="ptool context/portal_properties"
+   tal:define="ptool context/portal_properties;
+               member_email options/member/email | string:foo at example.org"
 >Subject: <tal:span i18n:translate=""><tal:span i18n:name="portal_title"
     tal:content="ptool/title" />: Membership reminder</tal:span>
 From: <tal:span
    tal:content="ptool/email_from_name" /> <tal:span
    tal:replace="structure string:&lt;${ptool/email_from_address}>" />
-To: <tal:span tal:replace="structure string:&lt;${options/member/email}>" />
+To: <tal:span tal:replace="structure string:&lt;${member_email}>" />
 Content-Type: text/plain
 
 <tal:span i18n:translate="">Your password: <tal:span i18n:name="password"
-    tal:content="options/password" /></tal:span>
+    tal:content="options/password | default">baz</tal:span></tal:span>
 
 <tal:span i18n:translate="">Request made by IP <tal:span i18n:name="ip"
     tal:define="ip python:request.HTTP_X_FORWARDED_FOR or request.REMOTE_ADDR"


=== Products/CMFDefault/skins/zpt_generic/registered_notify_template.pt 1.4 => 1.5 ===
--- Products/CMFDefault/skins/zpt_generic/registered_notify_template.pt:1.4	Fri Sep 24 10:07:56 2004
+++ Products/CMFDefault/skins/zpt_generic/registered_notify_template.pt	Thu Oct  7 07:13:52 2004
@@ -2,13 +2,14 @@
    tal:define="mtool context/portal_membership;
                ptool context/portal_properties;
                utool nocall:context/portal_url;
+               member_email options/member/email | string:foo at example.org;
                login_url python:mtool.getActionInfo('user/login')['url']"
 >Subject: <tal:span i18n:translate=""><tal:span i18n:name="portal_title"
     tal:content="ptool/title" />: Your Membership Information</tal:span>
 From: <tal:span
    tal:content="ptool/email_from_name" /> <tal:span
    tal:replace="structure string:&lt;${ptool/email_from_address}>" />
-To: <tal:span tal:replace="structure string:&lt;${options/member/email}>" />
+To: <tal:span tal:replace="structure string:&lt;${member_email}>" />
 Content-Type: text/plain
 
 <tal:span i18n:translate=""
@@ -24,25 +25,26 @@
 </tal:case>
 <tal:span i18n:translate=""
 >Visit us at <tal:span i18n:name="portal_url"
-   tal:replace="structure string:&lt;${utool}>" />.</tal:span>
+   tal:content="utool" /></tal:span>
 
 <tal:span i18n:translate=""
 >Your member id and password are:
 
 Member ID: <tal:span i18n:name="member_id"
-   tal:content="options/member/getId" />
+   tal:content="options/member/getId | default">foo</tal:span>
 Password: <tal:span i18n:name="password"
-   tal:content="options/password" /></tal:span>
+   tal:content="options/password | default">baz</tal:span></tal:span>
 
 <tal:span i18n:translate=""
 >You can use this URL to log in:</tal:span>
 
-<tal:span tal:replace="structure string:&lt;${login_url}>" />
+<tal:span tal:content="login_url" />
 <tal:case tal:condition="python:len(login_url)>70">
 <tal:span i18n:translate=""
 >Be aware that this URL might wrap over two lines. If your browser shows an
 error message when you try to access the URL please make sure that you put
 in the complete string.</tal:span>
 </tal:case>
+
 <tal:span tal:content="ptool/email_from_name" />
 </tal:page>