[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/ Site syndication uses the same template as folder syndication.
Charlie Clark
charlie at begeistert.org
Wed Oct 6 08:42:57 EDT 2010
Log message for revision 117293:
Site syndication uses the same template as folder syndication.
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/admin/tests/test_syndication.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.pt 2010-10-06 12:41:58 UTC (rev 117292)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.pt 2010-10-06 12:42:56 UTC (rev 117293)
@@ -9,7 +9,7 @@
tal:content="structure error">Error Message</li>
</ul>
-<h1 i18n:translate="">Folder Syndication</h1>
+<h1 tal:content="view/label">Folder Syndication</h1>
<p class="errors" tal:condition="not: view/allowed"
i18n:translate="">Portal syndication is currently disabled</p>
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.py 2010-10-06 12:41:58 UTC (rev 117292)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/syndication.py 2010-10-06 12:42:56 UTC (rev 117293)
@@ -64,8 +64,11 @@
class Site(EditFormBase):
"""Enable or disable syndication for a site."""
+ form_fields = form.FormFields(ISyndicationSchema)
+ template = ViewPageTemplateFile("syndication.pt")
+ allowed = True
+ label = _(u"Configure Portal Syndication")
- form_fields = form.FormFields(ISyndicationSchema)
actions = form.Actions(
form.Action(
name="enable",
@@ -140,6 +143,7 @@
form_fields = form.FormFields(ISyndicationSchema)
template = ViewPageTemplateFile("syndication.pt")
+ label = _(u"Configure Folder Syndication")
actions = form.Actions(
form.Action(
@@ -190,6 +194,7 @@
def disabled(self, action=None):
return not self.adapter.enabled
+ @property
@memoize
def allowed(self):
syndtool = self._getTool('portal_syndication')
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/tests/test_syndication.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/tests/test_syndication.py 2010-10-06 12:41:58 UTC (rev 117292)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/admin/tests/test_syndication.py 2010-10-06 12:42:56 UTC (rev 117293)
@@ -145,7 +145,7 @@
def test_allowed(self):
view = self._getTargetClass()
- self.assertFalse(view.allowed())
+ self.assertFalse(view.allowed)
def test_adapter(self):
from Products.CMFCore.interfaces import ISyndicationInfo
More information about the checkins
mailing list