[gnue] r9054 - in trunk/gnue-forms/src/uidrivers/html: . widgets

[jan]

Author: jan
Date: 2006-11-20 07:02:26 -0600 (Mon, 20 Nov 2006)
New Revision: 9054

Modified:
   trunk/gnue-forms/src/uidrivers/html/Generator.py
   trunk/gnue-forms/src/uidrivers/html/widgets/entry.py
Log:
Add label to checkbox widget. Make checkbox widget a dojostyle widget.

Modified: trunk/gnue-forms/src/uidrivers/html/Generator.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/Generator.py    2006-11-20 11:48:53 UTC 
(rev 9053)
+++ trunk/gnue-forms/src/uidrivers/html/Generator.py    2006-11-20 13:02:26 UTC 
(rev 9054)
@@ -46,10 +46,12 @@
     return (u'<div id="%s" %s>%s</div>\n') % \
            (id, _css_position(x,y,width,height-FIX2), value)    
            
-def build_entry_checkbox(id, value, x, y):  
-    return (u'<input type="checkbox" id="%s" value="%s" %s %s '+\
-            u'style="position:absolute; top:%spx; left:%spx"/>\n') % \
-           (id, value, _on_change_event(id),_on_focus_event(id), FIX + y, x)   
     
+def build_entry_checkbox(id, value, label, x, y):  
+    return (u'<div style="position:absolute; top:%spx; left:%spx">\n'+\
+            u'<input type="checkbox" id="%s" dojoType="Checkbox" value="%s" %s 
%s/>\n'+\
+            u'<label for="%s">%s</label></div>\n') % \
+           (FIX + y, x, id, value, _on_change_event(id),
+            _on_focus_event(id), id, label) 
            
 def build_entry_default(id, value, x, y, width, height):
     return u'<input type="text" id="%s" value="%s" %s\n %s\n %s/>\n' % \

Modified: trunk/gnue-forms/src/uidrivers/html/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/html/widgets/entry.py        2006-11-20 
11:48:53 UTC (rev 9053)
+++ trunk/gnue-forms/src/uidrivers/html/widgets/entry.py        2006-11-20 
13:02:26 UTC (rev 9054)
@@ -63,7 +63,8 @@
                                        self.itemY, self.itemWidth, 
self.itemHeight)
 
         elif object.style == 'checkbox':
-            dhtml = build_entry_checkbox(id, "%s", 
object.Char__x*event.widgetWidth, self.itemY)
+            dhtml = build_entry_checkbox(id, "%s", object.label, \
+                                         object.Char__x*event.widgetWidth, 
self.itemY)
             
         # multiline edit
         elif hasattr(object,'Char__height') and object.Char__height > 1: