[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ - moved the rest of the editform template to formlib_macros
Yvo Schubbe
cvs-admin at zope.org
Mon Jul 9 12:42:34 UTC 2012
Log message for revision 127285:
- moved the rest of the editform template to formlib_macros
- replaced view/base_template/macros/form by context/@@formlib_macros/body
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.pt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.pt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/login.pt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/mail_password.pt
U Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/formlib_macros.pt
U Products.CMFDefault/trunk/Products/CMFDefault/formlib/editform.pt
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.pt 2012-07-09 05:56:30 UTC (rev 127284)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.pt 2012-07-09 12:42:30 UTC (rev 127285)
@@ -9,7 +9,7 @@
<p class="errors" i18n:translate="">Portal syndication is currently disabled</p>
</tal:case>
<tal:case condition="view/allowed">
- <metal:macro metal:use-macro="view/base_template/macros/form" />
+<metal:macro metal:use-macro="context/@@formlib_macros/body" />
</tal:case>
</metal:slot>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.py 2012-07-09 05:56:30 UTC (rev 127284)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.py 2012-07-09 12:42:30 UTC (rev 127285)
@@ -88,7 +88,6 @@
"""Enable, disable and customise syndication settings for a folder.
"""
- base_template = SettingsEditFormBase.template
template = ViewPageTemplateFile("syndication.pt")
form_fields = form.FormFields(ISyndicationInfo).omit('enabled')
label = _(u"Configure Folder Syndication")
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py 2012-07-09 05:56:30 UTC (rev 127284)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/authentication.py 2012-07-09 12:42:30 UTC (rev 127285)
@@ -162,7 +162,6 @@
"""Form view for ILoginSchema.
"""
- base_template = EditFormBase.template
template = ViewPageTemplateFile('login.pt')
label = _(u'Log in')
prefix = ''
@@ -263,7 +262,6 @@
"""Form view for IMailPasswordSchema.
"""
- base_template = EditFormBase.template
template = ViewPageTemplateFile('mail_password.pt')
label = _(u"Don't panic!")
description = _(u"Just enter your member ID below, click 'Send', and "
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.pt 2012-07-09 05:56:30 UTC (rev 127284)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.pt 2012-07-09 12:42:30 UTC (rev 127285)
@@ -2,8 +2,10 @@
<body>
<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
- <h1 tal:content="view/title" i18n:translate="">Become a member</h1>
+<metal:macro metal:use-macro="context/@@formlib_macros/errors" />
+<metal:macro metal:use-macro="context/@@formlib_macros/header" />
+
<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>
@@ -17,8 +19,10 @@
</tal:case>
<tal:case condition="not: view/isOrdinaryMember">
- <metal:macro metal:use-macro="view/base_template/macros/form" />
-</tal:case>
+<form action="." method="post" enctype="multipart/form-data"
+ tal:attributes="action request/ACTUAL_URL">
+<metal:macro metal:use-macro="context/@@formlib_macros/form" />
+</form></tal:case>
</metal:slot>
</body>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py 2012-07-09 05:56:30 UTC (rev 127284)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/join.py 2012-07-09 12:42:30 UTC (rev 127285)
@@ -70,7 +70,6 @@
class JoinFormView(EditFormBase):
- base_template = EditFormBase.template
template = ViewPageTemplateFile("join.pt")
actions = form.Actions(
@@ -117,7 +116,7 @@
return not (self.isManager or self.isAnon)
@property
- def title(self):
+ def label(self):
if self.isManager:
return _(u'Register a New Member')
else:
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/login.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/login.pt 2012-07-09 05:56:30 UTC (rev 127284)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/login.pt 2012-07-09 12:42:30 UTC (rev 127285)
@@ -2,7 +2,7 @@
<body>
<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
-<metal:macro metal:use-macro="view/base_template/macros/form" />
+<metal:macro metal:use-macro="context/@@formlib_macros/body" />
<p><a href=""
tal:attributes="href string:${portal_url}/mail_password.html"
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/mail_password.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/mail_password.pt 2012-07-09 05:56:30 UTC (rev 127284)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/mail_password.pt 2012-07-09 12:42:30 UTC (rev 127285)
@@ -2,7 +2,7 @@
<body>
<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
-<metal:macro metal:use-macro="view/base_template/macros/form" />
+<metal:macro metal:use-macro="context/@@formlib_macros/body" />
<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
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/formlib_macros.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/formlib_macros.pt 2012-07-09 05:56:30 UTC (rev 127284)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/widgets/formlib_macros.pt 2012-07-09 12:42:30 UTC (rev 127285)
@@ -1,7 +1,8 @@
<html>
<body>
-<ul class="errors" metal:define-macro="errors"
+<metal:macro metal:define-macro="body"
+><ul class="errors" metal:define-macro="errors"
tal:condition="view/errors">
<li tal:repeat="error view/error_views"><tal:span
tal:replace="structure error" /></li>
@@ -14,6 +15,8 @@
tal:content="view/description">DESCRIPTION OF THE FORM.</p
></metal:macro>
+<form action="." method="post" enctype="multipart/form-data"
+ tal:attributes="action request/ACTUAL_URL">
<div class="form" metal:define-macro="form">
<div class="widgets">
<tal:loop tal:repeat="widget view/widgets"
@@ -38,6 +41,8 @@
tal:replace="structure action/render" />
</div>
</div>
+</form
+></metal:macro>
</body>
</html>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/formlib/editform.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/formlib/editform.pt 2012-07-09 05:56:30 UTC (rev 127284)
+++ Products.CMFDefault/trunk/Products/CMFDefault/formlib/editform.pt 2012-07-09 12:42:30 UTC (rev 127285)
@@ -2,17 +2,8 @@
<body>
<metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
-<metal:macro metal:define-macro="form"
-><metal:macro metal:use-macro="context/@@formlib_macros/errors" />
+<metal:macro metal:use-macro="context/@@formlib_macros/body" />
+</metal:slot>
-<metal:macro metal:use-macro="context/@@formlib_macros/header" />
-
-<form action="." method="post" enctype="multipart/form-data"
- tal:attributes="action request/ACTUAL_URL">
-<metal:macro metal:use-macro="context/@@formlib_macros/form" />
-</form>
-</metal:macro
-></metal:slot>
-
</body>
</html>
More information about the checkins
mailing list