quixote/form form_templates.ptl,1.15,1.16

Update of /home/cvs/quixote/form
In directory hewson:/tmp/cvs-serv20516

Modified Files:
	form_templates.ptl 
Log Message:
Modify form and widget classes to return htmltext instances.  This is a
backards incompatible change.


Index: form_templates.ptl
===================================================================
RCS file: /home/cvs/quixote/form/form_templates.ptl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- form_templates.ptl	20 Sep 2002 22:44:54 -0000	1.15
+++ form_templates.ptl	14 Oct 2002 23:19:06 -0000	1.16
@@ -4,36 +4,36 @@
 #"""
 
 from types import StringType
-from quixote.html import value_quote, render_tag
+from quixote.html import htmltag, htmltext
  
-template _render_start (self, request, action, method='post', name=None):
-    render_tag('form', method=method, action=action, name=name)
+def _render_start [html] (self, request, action, method='post', name=None):
+    htmltag('form', method=method, action=action, name=name)
     "\n"
     self._render_hidden_widgets(request)
 
 
-template _render_finish (self, request):
+def _render_finish [html] (self, request):
     '</form>\n'
     self._render_javascript(request)
     
-template _render_sep (self, text, line=1):
+def _render_sep [html] (self, text, line=1):
     ('<tr><td colspan="3">%s<strong><big>%s</big></strong></td></tr>\n' %
      (line and '<hr>' or '', text))
 
-template _render_error (self, error):
+def _render_error [html] (self, error):
     if error:
         '<font color="red">' + error + '</font><br />\n'
     
-template _render_hint (self, hint):
+def _render_hint [html] (self, hint):
     if hint:
         '<em>' + hint + '</em>\n'
 
-template _render_widget_row (self, request, widget):
+def _render_widget_row [html] (self, request, widget):
     if widget.widget_type == 'hidden':
         return
     title = self.title[widget.name] or ''
     if self.required.get(widget.name):
-        title += '&nbsp;*'
+        title = title + '&nbsp;*'
     '<tr>'
     '<th colspan="3" align="left">'
     title
@@ -51,7 +51,7 @@
     '</tr>\n'
 
 
-template _render_hidden_widgets (self, request):
+def _render_hidden_widgets [html] (self, request):
     for widget in self.widget_order:
         if widget.widget_type == 'hidden':
             widget.render(request)
@@ -59,7 +59,7 @@
             '\n'
 
 
-template _render_submit_buttons (self, request, ncols=3):
+def _render_submit_buttons [html] (self, request, ncols=3):
     '<tr><td colspan="%d">\n' % ncols
     for button in self.submit_buttons:
         button.render(request)
@@ -67,12 +67,12 @@
     '</td></tr>'
 
 
-template _render_visible_widgets (self, request):
+def _render_visible_widgets [html] (self, request):
     for widget in self.widget_order:
         self._render_widget_row(request, widget)
 
 
-template _render_body (self, request):
+def _render_body [html] (self, request):
     '<table>'
     if filter(None, self.required.values()):
         '<tr><td colspan="3"><b>*</b> = <em>required field</em></td></tr>\n'
@@ -81,8 +81,8 @@
     '</table>'
 
 
-template render (self, request, action_url):
-    assert type(action_url) is StringType
+def render [html] (self, request, action_url):
+    assert type(action_url) in (StringType, htmltext)
     self._render_start(request, action_url, self.method)
     self._render_body(request)
     self._render_finish(request)