[CMF-checkins] CVS: Products/CMFDefault/skins/zpt_generic - registered_notify_template.pt:1.4 registered_notify.py:NONE

[Yvo Schubbe]

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

Modified Files:
	registered_notify_template.pt 
Removed Files:
	registered_notify.py 
Log Message:
- removed password from the login URL
- synced with mail_password_template, removing the dependency on registered_notify.py


=== Products/CMFDefault/skins/zpt_generic/registered_notify_template.pt 1.3 => 1.4 ===
--- Products/CMFDefault/skins/zpt_generic/registered_notify_template.pt:1.3	Tue Jul  6 18:35:18 2004
+++ Products/CMFDefault/skins/zpt_generic/registered_notify_template.pt	Fri Sep 24 10:07:56 2004
@@ -1,40 +1,48 @@
-<tal:page tal:define="control python: context.registered_notify(**options)"
-><div tal:omit-tag="" i18n:domain="cmf_default"
+<tal:page i18n:domain="cmf_default"
+   tal:define="mtool context/portal_membership;
+               ptool context/portal_properties;
+               utool nocall:context/portal_url;
+               login_url python:mtool.getActionInfo('user/login')['url']"
 >Subject: <tal:span i18n:translate=""><tal:span i18n:name="portal_title"
-                                         tal:content="control/portal_title"
-                                    />: Your Membership Information</tal:span>
-From: <tal:span tal:content="control/email_from_name"
-   /> <tal:span tal:replace="structure control/email_from_address" />
-To: <tal:span tal:replace="structure control/member_email" />
+    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}>" />
 Content-Type: text/plain
 
 <tal:span i18n:translate=""
 >You have been registered as a member of "<tal:span i18n:name="portal_title"
-                                 tal:content="control/portal_title" />", which
+   tal:content="ptool/title" />", which
 allows you to personalize your view of the website and participate in the
-community.
-
-This describes the purpose of the website:
-<tal:span i18n:name="portal_description"
-   tal:content="control/portal_description" />
-
-Visit us at <span i18n:name="portal_url"
-><tal:span tal:replace="structure control/portal_url" /></span>
+community.</tal:span>
+<tal:case tal:condition="ptool/description">
+<tal:span i18n:translate=""
+>This describes the purpose of the website:</tal:span>
 
-Your member id and password are:
+<tal:span tal:content="ptool/description" />
+</tal:case>
+<tal:span i18n:translate=""
+>Visit us at <tal:span i18n:name="portal_url"
+   tal:replace="structure string:&lt;${utool}>" />.</tal:span>
 
-Member ID: <tal:span i18n:name="member_id" tal:content="control/member_id" />
-Password: <tal:span i18n:name="password" tal:content="control/password" />
+<tal:span i18n:translate=""
+>Your member id and password are:
 
-You can use this URL to log on:
+Member ID: <tal:span i18n:name="member_id"
+   tal:content="options/member/getId" />
+Password: <tal:span i18n:name="password"
+   tal:content="options/password" /></tal:span>
 
-<span i18n:name="login_url"
-><tal:span tal:replace="structure control/login_url" /></span>
+<tal:span i18n:translate=""
+>You can use this URL to log in:</tal:span>
 
-Be aware that this URL might wrap over two lines. If your browser shows an
+<tal:span tal:replace="structure string:&lt;${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 i18n:name="email_from_name"
-   tal:content="control/email_from_name" />
-</tal:span></div></tal:page>
+in the complete string.</tal:span>
+</tal:case>
+<tal:span tal:content="ptool/email_from_name" />
+</tal:page>

=== Removed File Products/CMFDefault/skins/zpt_generic/registered_notify.py ===