[Checkins] SVN: z3ext.layoutform/trunk/ Use new z3ext.statusmessage api
Nikolay Kim
fafhrd at datacom.kz
Thu Nov 20 07:29:30 EST 2008
Log message for revision 93153:
Use new z3ext.statusmessage api
Changed:
U z3ext.layoutform/trunk/CHANGES.txt
U z3ext.layoutform/trunk/src/z3ext/layoutform/add.py
U z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml
U z3ext.layoutform/trunk/src/z3ext/layoutform/browser/message.pt
D z3ext.layoutform/trunk/src/z3ext/layoutform/browser/message.py
U z3ext.layoutform/trunk/src/z3ext/layoutform/browser/styles.css
U z3ext.layoutform/trunk/src/z3ext/layoutform/configure.zcml
U z3ext.layoutform/trunk/src/z3ext/layoutform/error.py
U z3ext.layoutform/trunk/src/z3ext/layoutform/interfaces.py
-=-
Modified: z3ext.layoutform/trunk/CHANGES.txt
===================================================================
--- z3ext.layoutform/trunk/CHANGES.txt 2008-11-20 12:03:03 UTC (rev 93152)
+++ z3ext.layoutform/trunk/CHANGES.txt 2008-11-20 12:29:29 UTC (rev 93153)
@@ -2,6 +2,12 @@
CHANGES
=======
+1.2.7 (2008-11-??)
+------------------
+
+- Use new z3ext.statusmessage api
+
+
1.2.6 (2008-11-06)
------------------
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/add.py
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/add.py 2008-11-20 12:03:03 UTC (rev 93152)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/add.py 2008-11-20 12:29:29 UTC (rev 93153)
@@ -71,19 +71,22 @@
def nextURL(self):
if self._addedObject is None:
- return '%s/@@SelectedManagementView.html'%\
- absoluteURL(self.context, self.request)
+ url = absoluteURL(self.context, self.request)
else:
- return absoluteURL(self._addedObject, self.request) + '/'
+ url = absoluteURL(self._addedObject, self.request)
+
+ return '%s/@@SelectedManagementView.html'%url
def cancelURL(self):
context = self.context
if IAdding.providedBy(context):
- return '%s/'%absoluteURL(context.context, self.request)
+ url = absoluteURL(context.context, self.request)
else:
- return '%s/'%absoluteURL(context, self.request)
+ url = absoluteURL(context, self.request)
+ return '%s/@@SelectedManagementView.html'%url
+
def nameAllowed(self):
"""Return whether names can be input by the user."""
context = self.context
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml 2008-11-20 12:03:03 UTC (rev 93152)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/configure.zcml 2008-11-20 12:29:29 UTC (rev 93153)
@@ -218,9 +218,6 @@
type="z3ext.layout.interfaces.IPageletType"
interface="z3ext.layoutform.browser.interfaces.IExtraFormButtonsInfo" />
- <!-- status message -->
- <adapter factory=".message.Message" />
-
<!-- styles -->
<z3ext:resourceinclude
name="z3ext-layoutform.css"
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/message.pt
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/message.pt 2008-11-20 12:03:03 UTC (rev 93152)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/message.pt 2008-11-20 12:29:29 UTC (rev 93153)
@@ -1,9 +1,9 @@
<div class="statusWarningMessage">
- <tal:block content="context/message" />
- <tal:block condition="context/errors">
+ <tal:block content="view/message" />
+ <tal:block condition="view/errors">
<br />
<ul>
- <li tal:repeat="err context/errors"
+ <li tal:repeat="err view/errors"
tal:content="structure err/render">
</li>
</ul>
Deleted: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/message.py
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/message.py 2008-11-20 12:03:03 UTC (rev 93152)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/message.py 2008-11-20 12:29:29 UTC (rev 93153)
@@ -1,35 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2008 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""
-
-$Id: 2007-12-12 12:27:02Z fafhrd $
-"""
-from zope import component, interface
-from zope.app.pagetemplate import ViewPageTemplateFile
-from z3ext.statusmessage.interfaces import IMessageView
-from z3ext.layoutform.interfaces import IFormErrorStatusMessage
-
-
-class Message(object):
- interface.implements(IMessageView)
- component.adapts(IFormErrorStatusMessage, interface.Interface)
-
- index = ViewPageTemplateFile('message.pt')
-
- def __init__(self, context, request):
- self.context = context
- self.request = request
-
- def render(self):
- return self.index()
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/browser/styles.css
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/browser/styles.css 2008-11-20 12:03:03 UTC (rev 93152)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/browser/styles.css 2008-11-20 12:29:29 UTC (rev 93153)
@@ -134,8 +134,11 @@
clear: both;
margin-top: 1em;
}
-
-
+
+ .z-form-controls div {
+ padding-top: 0.5em;
+ }
+
.z-form-button {
background: transparent url(z3ext-layoutform-linkTransparent.gif) no-repeat;
background-position: 5px center;
@@ -184,4 +187,4 @@
padding: 1px 1px 1px 14px;
}
-}
\ No newline at end of file
+}
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/configure.zcml
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/configure.zcml 2008-11-20 12:03:03 UTC (rev 93152)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/configure.zcml 2008-11-20 12:29:29 UTC (rev 93153)
@@ -6,15 +6,11 @@
<includeDependencies package="z3ext.layoutform" />
<!-- form error status message -->
- <utility
+ <adapter
name="formError"
- provides="z3ext.statusmessage.interfaces.IMessageFactory"
- component=".error.FormErrorStatusMessage" />
+ factory=".error.FormErrorStatusMessage" />
- <class class=".error.FormErrorStatusMessage">
- <allow interface=".interfaces.IFormErrorStatusMessage" />
- </class>
-
+ <!-- browser views -->
<include package=".browser" />
<!-- translations -->
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/error.py
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/error.py 2008-11-20 12:03:03 UTC (rev 93152)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/error.py 2008-11-20 12:29:29 UTC (rev 93153)
@@ -16,14 +16,15 @@
$Id: 2007-12-12 12:27:02Z fafhrd $
"""
from zope import interface
+from zope.app.pagetemplate import ViewPageTemplateFile
from z3ext.statusmessage.message import Message
-from interfaces import IFormErrorStatusMessage
-
class FormErrorStatusMessage(Message):
- interface.implements(IFormErrorStatusMessage)
- def __init__(self, message):
+ index = ViewPageTemplateFile('browser/message.pt')
+
+ def render(self, message):
self.message = message[0]
self.errors = [err for err in message[1:] if err.widget is None]
+ return self.index()
Modified: z3ext.layoutform/trunk/src/z3ext/layoutform/interfaces.py
===================================================================
--- z3ext.layoutform/trunk/src/z3ext/layoutform/interfaces.py 2008-11-20 12:03:03 UTC (rev 93152)
+++ z3ext.layoutform/trunk/src/z3ext/layoutform/interfaces.py 2008-11-20 12:29:29 UTC (rev 93153)
@@ -19,7 +19,6 @@
from zope.i18nmessageid import MessageFactory
from z3c.form.interfaces import IFormLayer
from z3ext.layout.interfaces import IPagelet
-from z3ext.statusmessage.interfaces import IMessage
_ = MessageFactory('z3ext.layoutform')
@@ -76,7 +75,3 @@
class ICancelButton(interface.Interface):
""" cancel button """
-
-
-class IFormErrorStatusMessage(IMessage):
- """ form error status message """
More information about the Checkins
mailing list