[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/ templates folder removed as agreed with yuppie
Charlie Clark
charlie at begeistert.org
Tue Jun 29 14:30:00 EDT 2010
Log message for revision 113989:
templates folder removed as agreed with yuppie
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
A Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/forbidden.pt
A Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.pt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py
A Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/logged_in.pt
A Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/logged_out.pt
A Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/login.pt
A Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/mail_password.pt
D Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/forbidden.pt
D Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/join.pt
D Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/logged_in.pt
D Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/logged_out.pt
D Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/login.pt
D Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/mail_password.pt
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py 2010-06-29 18:20:09 UTC (rev 113988)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py 2010-06-29 18:29:59 UTC (rev 113989)
@@ -57,7 +57,7 @@
"""Exception view for Unauthorized.
"""
- forbidden_template = ViewPageTemplateFile('templates/forbidden.pt')
+ forbidden_template = ViewPageTemplateFile('forbidden.pt')
def __call__(self):
try:
@@ -147,7 +147,7 @@
"""
base_template = EditFormBase.template
- template = ViewPageTemplateFile('templates/login.pt')
+ template = ViewPageTemplateFile('login.pt')
label = _(u'Log in')
prefix = ''
@@ -202,7 +202,7 @@
class LoggedIn(ViewBase):
"""Post login methods"""
- template = ViewPageTemplateFile("templates/logged_in.pt")
+ template = ViewPageTemplateFile("logged_in.pt")
def set_skin_cookie(self):
stool = self._getTool('portal_skins')
@@ -244,7 +244,7 @@
"""
base_template = EditFormBase.template
- template = ViewPageTemplateFile('templates/mail_password.pt')
+ template = ViewPageTemplateFile('mail_password.pt')
label = _(u"Don't panic!")
description = _(u"Just enter your member ID below, click 'Send', and "
u"your password will be mailed to you if you gave a "
@@ -289,7 +289,7 @@
class Logout(ViewBase):
"""Log the user out"""
- template = ViewPageTemplateFile("templates/logged_out.pt")
+ template = ViewPageTemplateFile("logged_out.pt")
@memoize
def logged_in(self):
Copied: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/forbidden.pt (from rev 113975, Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/forbidden.pt)
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/forbidden.pt (rev 0)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/forbidden.pt 2010-06-29 18:29:59 UTC (rev 113989)
@@ -0,0 +1,18 @@
+<html metal:use-macro="context/@@standard_macros/page">
+<body>
+
+<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+<h1 id="DesktopTitle">Site Error</h1>
+
+<p id="DesktopDescription" i18n:translate="">An error was encountered while
+ publishing this resource.</p>
+
+<p><strong><tal:span i18n:translate="">Error Type:</tal:span>
+ <tal:span i18n:translate="">Forbidden</tal:span></strong><br />
+ <strong><tal:span i18n:translate="">Error Value:</tal:span>
+ <tal:span i18n:translate="">You don't have all the permissions necessary
+ to see the requested page.</tal:span></strong></p>
+</metal:slot>
+
+</body>
+</html>
Copied: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.pt (from rev 113986, Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/join.pt)
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.pt (rev 0)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.pt 2010-06-29 18:29:59 UTC (rev 113989)
@@ -0,0 +1,33 @@
+<html metal:use-macro="context/@@standard_macros/page">
+<body>
+
+<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+ <h1 tal:content="view/title" i18n:translate="">Become a member</h1>
+
+ <tal:case tal:condition="view/isAnon">
+ <p i18n:translate="">Becoming a member gives you the ability to personalize the site and participate in the community.</p>
+
+ <p i18n:translate="">It does not cost any money to become a member and your email and other personal information will remain private.</p>
+ </tal:case>
+
+ <tal:case tal:condition="view/isOrdinaryMember">
+ <p i18n:translate=""> You are already a member. You may use the
+ <a tal:attributes="href view/personalize">personalization form</a>
+ to change your membership information. </p>
+ </tal:case>
+
+ <tal:case condition="view/registered">
+ <p i18n:translate="">You have been registered as a member.</p>
+
+ <p tal:condition="view/validate_email" i18n:translate="">You will receive
+ an email shortly containing your password and instructions on how to
+ activate your membership.</p>
+ </tal:case>
+
+<tal:case condition="not: view/isOrdinaryMember">
+ <metal:macro metal:use-macro="view/base_template/macros/form" />
+</tal:case>
+</metal:slot>
+
+</body>
+</html>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py 2010-06-29 18:20:09 UTC (rev 113988)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py 2010-06-29 18:29:59 UTC (rev 113989)
@@ -53,7 +53,7 @@
class Join(EditFormBase):
base_template = EditFormBase.template
- template = ViewPageTemplateFile("templates/join.pt")
+ template = ViewPageTemplateFile("join.pt")
registered = False
form_fields = form.FormFields(IJoinSchema)
@@ -74,6 +74,8 @@
super(Join, self).__init__(context, request)
ptool = self._getTool("portal_properties")
self.validate_email = ptool.getProperty('validate_email', None)
+ if self.validate_email:
+ self.form_fields = self.form_fields.select('member_id', 'email')
self.rtool = self._getTool('portal_registration')
self.mtool = self._getTool('portal_membership')
@@ -98,8 +100,6 @@
def setUpWidgets(self, ignore_request=False):
"""If e-mail validation is in effect, users cannot select passwords"""
- if self.validate_email:
- self.form_fields = self.form_fields.select('member_id', 'email')
super(Join, self).setUpWidgets(ignore_request)
def personalize(self):
Copied: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/logged_in.pt (from rev 113975, Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/logged_in.pt)
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/logged_in.pt (rev 0)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/logged_in.pt 2010-06-29 18:29:59 UTC (rev 113989)
@@ -0,0 +1,15 @@
+<html metal:use-macro="context/main_template/macros/master">
+<body>
+
+<metal:slot metal:fill-slot="header" i18n:domain="cmf_default">
+<h1 i18n:translate="">Login success</h1>
+</metal:slot>
+
+<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
+
+<p i18n:translate="">Welcome. You are currently logged in.</p>
+
+</metal:slot>
+
+</body>
+</html>
Copied: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/logged_out.pt (from rev 113975, Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/logged_out.pt)
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/logged_out.pt (rev 0)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/logged_out.pt 2010-06-29 18:29:59 UTC (rev 113989)
@@ -0,0 +1,11 @@
+<html metal:use-macro="context/@@standard_macros/page">
+<body>
+
+<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+<p tal:condition="view/logged_in"
+ i18n:translate="">You are logged in outside the portal. You may need to
+<a href="/manage_zmi_logout">log out of the Zope management interface</a>.</p>
+</metal:slot>
+
+</body>
+</html>
Copied: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/login.pt (from rev 113975, Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/login.pt)
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/login.pt (rev 0)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/login.pt 2010-06-29 18:29:59 UTC (rev 113989)
@@ -0,0 +1,20 @@
+<html metal:use-macro="context/main_template/macros/master">
+<body>
+
+<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+<metal:macro metal:use-macro="view/base_template/macros/form" />
+
+<p><a href=""
+ tal:attributes="href string:${portal_url}/mail_password.html"
+ i18n:translate=""
+ >I forgot my password!</a></p>
+
+<p i18n:translate="">Having trouble logging in? Make sure to enable cookies in
+ your web browser.</p>
+
+<p i18n:translate="">Don't forget to logout or exit your browser when you're
+ done.</p>
+</metal:slot>
+
+</body>
+</html>
Copied: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/mail_password.pt (from rev 113975, Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/mail_password.pt)
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/mail_password.pt (rev 0)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/mail_password.pt 2010-06-29 18:29:59 UTC (rev 113989)
@@ -0,0 +1,18 @@
+<html metal:use-macro="context/main_template/macros/master">
+<body>
+
+<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
+<metal:macro metal:use-macro="view/base_template/macros/form" />
+
+<p i18n:translate="">If this will not work for you (for example, if you forget
+ your member ID or didn't enter your email address) send email to
+ <a href="mailto:me at example.org"
+ tal:define="ptool context/portal_properties"
+ tal:attributes="href string:mailto:${ptool/email_from_address}"
+ tal:content="ptool/email_from_address"
+ i18n:name="admin_email">me at example.org</a>.</p>
+
+</metal:slot>
+
+</body>
+</html>
Deleted: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/forbidden.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/forbidden.pt 2010-06-29 18:20:09 UTC (rev 113988)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/forbidden.pt 2010-06-29 18:29:59 UTC (rev 113989)
@@ -1,18 +0,0 @@
-<html metal:use-macro="context/@@standard_macros/page">
-<body>
-
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
-<h1 id="DesktopTitle">Site Error</h1>
-
-<p id="DesktopDescription" i18n:translate="">An error was encountered while
- publishing this resource.</p>
-
-<p><strong><tal:span i18n:translate="">Error Type:</tal:span>
- <tal:span i18n:translate="">Forbidden</tal:span></strong><br />
- <strong><tal:span i18n:translate="">Error Value:</tal:span>
- <tal:span i18n:translate="">You don't have all the permissions necessary
- to see the requested page.</tal:span></strong></p>
-</metal:slot>
-
-</body>
-</html>
Deleted: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/join.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/join.pt 2010-06-29 18:20:09 UTC (rev 113988)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/join.pt 2010-06-29 18:29:59 UTC (rev 113989)
@@ -1,33 +0,0 @@
-<html metal:use-macro="context/@@standard_macros/page">
-<body>
-
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
- <h1 tal:content="view/title" i18n:translate="">Become a member</h1>
-
- <tal:case tal:condition="view/isAnon">
- <p i18n:translate="">Becoming a member gives you the ability to personalize the site and participate in the community.</p>
-
- <p i18n:translate="">It does not cost any money to become a member and your email and other personal information will remain private.</p>
- </tal:case>
-
- <tal:case tal:condition="view/isOrdinaryMember">
- <p i18n:translate=""> You are already a member. You may use the
- <a tal:attributes="href view/personalize">personalization form</a>
- to change your membership information. </p>
- </tal:case>
-
- <tal:case condition="view/registered">
- <p i18n:translate="">You have been registered as a member.</p>
-
- <p tal:condition="view/validate_email" i18n:translate="">You will receive
- an email shortly containing your password and instructions on how to
- activate your membership.</p>
- </tal:case>
-
-<tal:case condition="not: view/isOrdinaryMember">
- <metal:macro metal:use-macro="view/base_template/macros/form" />
-</tal:case>
-</metal:slot>
-
-</body>
-</html>
Deleted: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/logged_in.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/logged_in.pt 2010-06-29 18:20:09 UTC (rev 113988)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/logged_in.pt 2010-06-29 18:29:59 UTC (rev 113989)
@@ -1,15 +0,0 @@
-<html metal:use-macro="context/main_template/macros/master">
-<body>
-
-<metal:slot metal:fill-slot="header" i18n:domain="cmf_default">
-<h1 i18n:translate="">Login success</h1>
-</metal:slot>
-
-<metal:slot metal:fill-slot="main" i18n:domain="cmf_default">
-
-<p i18n:translate="">Welcome. You are currently logged in.</p>
-
-</metal:slot>
-
-</body>
-</html>
Deleted: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/logged_out.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/logged_out.pt 2010-06-29 18:20:09 UTC (rev 113988)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/logged_out.pt 2010-06-29 18:29:59 UTC (rev 113989)
@@ -1,11 +0,0 @@
-<html metal:use-macro="context/@@standard_macros/page">
-<body>
-
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
-<p tal:condition="view/logged_in"
- i18n:translate="">You are logged in outside the portal. You may need to
-<a href="/manage_zmi_logout">log out of the Zope management interface</a>.</p>
-</metal:slot>
-
-</body>
-</html>
Deleted: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/login.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/login.pt 2010-06-29 18:20:09 UTC (rev 113988)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/login.pt 2010-06-29 18:29:59 UTC (rev 113989)
@@ -1,20 +0,0 @@
-<html metal:use-macro="context/main_template/macros/master">
-<body>
-
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
-<metal:macro metal:use-macro="view/base_template/macros/form" />
-
-<p><a href=""
- tal:attributes="href string:${portal_url}/mail_password.html"
- i18n:translate=""
- >I forgot my password!</a></p>
-
-<p i18n:translate="">Having trouble logging in? Make sure to enable cookies in
- your web browser.</p>
-
-<p i18n:translate="">Don't forget to logout or exit your browser when you're
- done.</p>
-</metal:slot>
-
-</body>
-</html>
Deleted: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/mail_password.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/mail_password.pt 2010-06-29 18:20:09 UTC (rev 113988)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/templates/mail_password.pt 2010-06-29 18:29:59 UTC (rev 113989)
@@ -1,18 +0,0 @@
-<html metal:use-macro="context/main_template/macros/master">
-<body>
-
-<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
-<metal:macro metal:use-macro="view/base_template/macros/form" />
-
-<p i18n:translate="">If this will not work for you (for example, if you forget
- your member ID or didn't enter your email address) send email to
- <a href="mailto:me at example.org"
- tal:define="ptool context/portal_properties"
- tal:attributes="href string:mailto:${ptool/email_from_address}"
- tal:content="ptool/email_from_address"
- i18n:name="admin_email">me at example.org</a>.</p>
-
-</metal:slot>
-
-</body>
-</html>
More information about the checkins
mailing list