[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/Formulator/Widgets/Browser - BrowserWidget.py:1.1.4.1.14.1 CheckBoxWidget.py:1.1.4.1.14.1 FileWidget.py:1.1.4.1.14.1 TextAreaWidget.py:1.1.4.1.14.1 TextWidget.py:1.1.4.1.14.1
Jim Fulton
jim@zope.com
Wed, 29 May 2002 11:10:06 -0400
Update of /cvs-repository/Zope3/lib/python/Zope/App/Formulator/Widgets/Browser
In directory cvs.zope.org:/tmp/cvs-serv12181/lib/python/Zope/App/Formulator/Widgets/Browser
Modified Files:
Tag: Zope3InWonderland-branch
BrowserWidget.py CheckBoxWidget.py FileWidget.py
TextAreaWidget.py TextWidget.py
Log Message:
- Added permission_id attribute to adapter and utility directives.
- Got rid of old getView, getResource, and getDefaultViewName.
Renamed getRequestView to getView (and so on).
Changed view interface to use context, rather than getContext.
Introduced notion of presentation types (e.g. IBrowserPresentation,
which is cleaner than IBrowserPublisher).
- Began converting to get/queryFoo, which is much nicer.
- Many formatting fixups.
=== Zope3/lib/python/Zope/App/Formulator/Widgets/Browser/BrowserWidget.py 1.1.4.1 => 1.1.4.1.14.1 ===
extra = ''
- def __init__(self, field):
- ''' '''
- self._field = field
-
-
def getValueFromRequest(self, REQUEST):
""" """
- return REQUEST.get('field_'+self.getContext().id, None)
+ return REQUEST.get('field_'+self.context.id, None)
def _getValueToInsert(self, REQUEST):
""" """
- field = self.getContext()
+ field = self.context
if REQUEST and REQUEST.has_key('field_'+field.id):
return REQUEST['field_'+field.id]
else:
@@ -62,7 +57,7 @@
"""
return renderElement(self.getValue('tag'),
type = self.getValue('type'),
- name = self.getContext().id,
+ name = self.context.id,
value = self._getValueToInsert(REQUEST),
cssClass = self.getValue('cssClass'),
extra = self.getValue('extra'))
@@ -73,7 +68,7 @@
"""
return renderElement(self.getValue('tag'),
type = 'hidden',
- name = self.getContext().id,
+ name = self.context.id,
value = self._getValueToInsert(REQUEST),
cssClass = self.getValue('cssClass'),
extra = self.getValue('extra'))
=== Zope3/lib/python/Zope/App/Formulator/Widgets/Browser/CheckBoxWidget.py 1.1.4.1 => 1.1.4.1.14.1 ===
#
##############################################################################
-"""
-
-$Id$
-"""
-
-from Zope.App.Formulator.Widgets.Browser.BrowserWidget import BrowserWidget
-from Zope.App.Formulator.Widgets.Browser.BrowserWidget import renderElement
-
-
-class CheckBoxWidget(BrowserWidget):
- """Text widget
- """
-
- __implements__ = BrowserWidget.__implements__
-
- propertyNames = BrowserWidget.propertyNames + \
- ['extra', 'default']
-
- type = 'checkbox'
- default = 0
- extra = ''
-
-
- def render(self, REQUEST=None):
- """Renders this widget as HTML using property values in field.
- """
- if self._getValueToInsert(REQUEST):
- return renderElement(self.getValue('tag'),
- type = self.getValue('type'),
- name = self.getContext().id,
- checked = None,
- cssClass = self.getValue('cssClass'),
- extra = self.getValue('extra'))
- else:
- return renderElement(self.getValue('tag'),
- type = self.getValue('type'),
- name = self.getContext().id,
- cssClass = self.getValue('cssClass'),
- size = self.getValue('displayWidth'),
- extra = self.getValue('extra'))
+"""
+
+$Id$
+"""
+
+from Zope.App.Formulator.Widgets.Browser.BrowserWidget import BrowserWidget
+from Zope.App.Formulator.Widgets.Browser.BrowserWidget import renderElement
+
+
+class CheckBoxWidget(BrowserWidget):
+ """Text widget
+ """
+
+ __implements__ = BrowserWidget.__implements__
+
+ propertyNames = BrowserWidget.propertyNames + \
+ ['extra', 'default']
+
+ type = 'checkbox'
+ default = 0
+ extra = ''
+
+
+ def render(self, REQUEST=None):
+ """Renders this widget as HTML using property values in field.
+ """
+ if self._getValueToInsert(REQUEST):
+ return renderElement(self.getValue('tag'),
+ type = self.getValue('type'),
+ name = self.context.id,
+ checked = None,
+ cssClass = self.getValue('cssClass'),
+ extra = self.getValue('extra'))
+ else:
+ return renderElement(self.getValue('tag'),
+ type = self.getValue('type'),
+ name = self.context.id,
+ cssClass = self.getValue('cssClass'),
+ size = self.getValue('displayWidth'),
+ extra = self.getValue('extra'))
=== Zope3/lib/python/Zope/App/Formulator/Widgets/Browser/FileWidget.py 1.1.4.1 => 1.1.4.1.14.1 ===
#
##############################################################################
-"""
-
-$Id$
-"""
-
-from TextWidget import TextWidget
-from Zope.App.Formulator.Widgets.Browser.BrowserWidget import renderElement
-
-
-class FileWidget(TextWidget):
-
- __implements__ = TextWidget.__implements__
-
- type = 'file'
-
-
- def render(self, REQUEST=None):
- """Renders this widget as HTML using property values in field.
- """
- displayMaxWidth = self.getValue('displayMaxWidth') or 0
- if displayMaxWidth > 0:
- return renderElement(self.getValue('tag'),
- type = self.getValue('type'),
- name = self.getContext().id,
- cssClass = self.getValue('cssClass'),
- size = self.getValue('displayWidth'),
- maxlength = displayMaxWidth,
- extra = self.getValue('extra'))
- else:
- return renderElement(self.getValue('tag'),
- type = self.getValue('type'),
- name = self.getContext().id,
- cssClass = self.getValue('cssClass'),
- size = self.getValue('displayWidth'),
- extra = self.getValue('extra'))
+"""
+
+$Id$
+"""
+
+from TextWidget import TextWidget
+from Zope.App.Formulator.Widgets.Browser.BrowserWidget import renderElement
+
+
+class FileWidget(TextWidget):
+
+ __implements__ = TextWidget.__implements__
+
+ type = 'file'
+
+
+ def render(self, REQUEST=None):
+ """Renders this widget as HTML using property values in field.
+ """
+ displayMaxWidth = self.getValue('displayMaxWidth') or 0
+ if displayMaxWidth > 0:
+ return renderElement(self.getValue('tag'),
+ type = self.getValue('type'),
+ name = self.context.id,
+ cssClass = self.getValue('cssClass'),
+ size = self.getValue('displayWidth'),
+ maxlength = displayMaxWidth,
+ extra = self.getValue('extra'))
+ else:
+ return renderElement(self.getValue('tag'),
+ type = self.getValue('type'),
+ name = self.context.id,
+ cssClass = self.getValue('cssClass'),
+ size = self.getValue('displayWidth'),
+ extra = self.getValue('extra'))
=== Zope3/lib/python/Zope/App/Formulator/Widgets/Browser/TextAreaWidget.py 1.1.4.1 => 1.1.4.1.14.1 ===
#
##############################################################################
-"""
-
-$Id$
-"""
-
-from Zope.App.Formulator.Widgets.Browser.BrowserWidget import BrowserWidget
-from Zope.App.Formulator.Widgets.Browser.BrowserWidget import renderElement
-
-
-class TextAreaWidget(BrowserWidget):
- """Textarea widget
- """
- propertyNames = BrowserWidget.propertyNames +\
- ['width', 'height', 'extra']
-
- default = ""
- width = 80
- height = 15
- extra=""
-
- def render(self, REQUEST=None):
- return renderElement("textarea",
- name=self.getContext().id,
- css_class=self.getValue('cssClass'),
- cols=self.getValue('width'),
- rows=self.getValue('height'),
- contents=self._getValueToInsert(REQUEST),
- extra=self.getValue('extra'))
-
+"""
+
+$Id$
+"""
+
+from Zope.App.Formulator.Widgets.Browser.BrowserWidget import BrowserWidget
+from Zope.App.Formulator.Widgets.Browser.BrowserWidget import renderElement
+
+
+class TextAreaWidget(BrowserWidget):
+ """Textarea widget
+ """
+ propertyNames = BrowserWidget.propertyNames +\
+ ['width', 'height', 'extra']
+
+ default = ""
+ width = 80
+ height = 15
+ extra=""
+
+ def render(self, REQUEST=None):
+ return renderElement("textarea",
+ name=self.context.id,
+ css_class=self.getValue('cssClass'),
+ cols=self.getValue('width'),
+ rows=self.getValue('height'),
+ contents=self._getValueToInsert(REQUEST),
+ extra=self.getValue('extra'))
+
=== Zope3/lib/python/Zope/App/Formulator/Widgets/Browser/TextWidget.py 1.1.4.1 => 1.1.4.1.14.1 ===
#
##############################################################################
-"""
-
-$Id$
-"""
-
-from Zope.App.Formulator.Widgets.Browser.BrowserWidget import BrowserWidget
-from Zope.App.Formulator.Widgets.Browser.BrowserWidget import renderElement
-
-
-class TextWidget(BrowserWidget):
- """Text widget
- """
-
- __implements__ = BrowserWidget.__implements__
-
- propertyNames = BrowserWidget.propertyNames + \
- ['displayWidth', 'displayMaxWidth', 'extra', 'default']
-
- default = ''
- displayWidth = 20
- displayMaxWidth = ''
- extra = ''
-
-
- def render(self, REQUEST=None):
- """Renders this widget as HTML using property values in field.
- """
- displayMaxWidth = self.getValue('displayMaxWidth') or 0
- if displayMaxWidth > 0:
- return renderElement(self.getValue('tag'),
- type = self.getValue('type'),
- name = self.getContext().id,
- value = self._getValueToInsert(REQUEST),
- cssClass = self.getValue('cssClass'),
- size = self.getValue('displayWidth'),
- maxlength = displayMaxWidth,
- extra = self.getValue('extra'))
- else:
- return renderElement(self.getValue('tag'),
- type = self.getValue('type'),
- name = self.getContext().id,
- value = self._getValueToInsert(REQUEST),
- cssClass = self.getValue('cssClass'),
- size = self.getValue('displayWidth'),
- extra = self.getValue('extra'))
+"""
+
+$Id$
+"""
+
+from Zope.App.Formulator.Widgets.Browser.BrowserWidget import BrowserWidget
+from Zope.App.Formulator.Widgets.Browser.BrowserWidget import renderElement
+
+
+class TextWidget(BrowserWidget):
+ """Text widget
+ """
+
+ __implements__ = BrowserWidget.__implements__
+
+ propertyNames = BrowserWidget.propertyNames + \
+ ['displayWidth', 'displayMaxWidth', 'extra', 'default']
+
+ default = ''
+ displayWidth = 20
+ displayMaxWidth = ''
+ extra = ''
+
+
+ def render(self, REQUEST=None):
+ """Renders this widget as HTML using property values in field.
+ """
+ displayMaxWidth = self.getValue('displayMaxWidth') or 0
+ if displayMaxWidth > 0:
+ return renderElement(self.getValue('tag'),
+ type = self.getValue('type'),
+ name = self.context.id,
+ value = self._getValueToInsert(REQUEST),
+ cssClass = self.getValue('cssClass'),
+ size = self.getValue('displayWidth'),
+ maxlength = displayMaxWidth,
+ extra = self.getValue('extra'))
+ else:
+ return renderElement(self.getValue('tag'),
+ type = self.getValue('type'),
+ name = self.context.id,
+ value = self._getValueToInsert(REQUEST),
+ cssClass = self.getValue('cssClass'),
+ size = self.getValue('displayWidth'),
+ extra = self.getValue('extra'))