[web/formwidgets] make default_size a tunable, fix code layout (closes #2165936) stable
authorAurelien Campeas <aurelien.campeas@logilab.fr>
Fri, 03 Feb 2012 16:34:57 +0100
branchstable
changeset 8193 0c64d6b75303
parent 8192 0067653190c7
child 8194 60efdbb45520
[web/formwidgets] make default_size a tunable, fix code layout (closes #2165936)
web/formwidgets.py
--- a/web/formwidgets.py	Fri Feb 03 14:32:11 2012 +0100
+++ b/web/formwidgets.py	Fri Feb 03 16:34:57 2012 +0100
@@ -429,7 +429,7 @@
     an unicode string, or a list of unicode strings.
     """
     vocabulary_widget = True
-    default_size = 5
+    default_size = 10
 
     def __init__(self, attrs=None, multiple=False, **kwargs):
         super(Select, self).__init__(attrs, **kwargs)
@@ -473,6 +473,74 @@
         return value in curvalues
 
 
+class InOutWidget(Select):
+    needs_js = ('cubicweb.widgets.js', )
+    default_size = 10
+    template = """
+<table id="%(widgetid)s">
+  <tr>
+    <td>%(inoutinput)s</td>
+    <td><div style="margin-bottom:3px">%(addinput)s</div>
+        <div>%(removeinput)s</div>
+    </td>
+    <td>%(resinput)s</td>
+  </tr>
+</table>
+"""
+    add_button = ('<input type="button" id="cwinoutadd" class="wdgButton cwinoutadd" '
+                  'value="&gt;&gt;" size="10" />')
+    remove_button = ('<input type="button" class="wdgButton cwinoutremove" '
+                     'value="&lt;&lt;" size="10" />')
+
+    def __init__(self, *args, **kwargs):
+        super(InOutWidget, self).__init__(*args, **kwargs)
+        self._multiple = True
+
+    def render_select(self, form, field, name, selected=False):
+        values, attrs = self.values_and_attributes(form, field)
+        options = []
+        inputs = []
+        for option in field.vocabulary(form):
+            try:
+                label, value, _oattrs = option
+            except ValueError:
+                label, value = option
+            if selected:
+                # add values
+                if value in values:
+                    options.append(tags.option(label, value=value))
+                    # add hidden inputs
+                    inputs.append(tags.input(value=value,
+                                             name=field.dom_id(form),
+                                             type="hidden"))
+            else:
+                options.append(tags.option(label, value=value))
+        if 'size' not in attrs:
+            attrs['size'] = self.default_size
+        if 'id' in attrs :
+            attrs.pop('id')
+        return tags.select(name=name, multiple=self._multiple, id=name,
+                           options=options, **attrs) + '\n'.join(inputs)
+
+
+    def _render(self, form, field, renderer):
+        domid = field.dom_id(form)
+        jsnodes = {'widgetid': domid,
+                   'from': 'from_' + domid,
+                   'to': 'to_' + domid}
+        form._cw.add_onload(u'$(cw.jqNode("%s")).cwinoutwidget("%s", "%s");'
+                            % (jsnodes['widgetid'], jsnodes['from'], jsnodes['to']))
+        field.required = True
+        return (self.template %
+                {'widgetid': jsnodes['widgetid'],
+                 # helpinfo select tag
+                 'inoutinput' : self.render_select(form, field, jsnodes['from']),
+                 # select tag with resultats
+                 'resinput' : self.render_select(form, field, jsnodes['to'], selected=True),
+                 'addinput' : self.add_button % jsnodes,
+                 'removeinput': self.remove_button % jsnodes
+                 })
+
 class BitSelect(Select):
     """Select widget for IntField using a vocabulary with bit masks as values.
 
@@ -1023,55 +1091,3 @@
             'label': label, 'imgsrc': imgsrc,
             'domid': self.domid, 'href': self.href}
 
-class InOutWidget(Select):
-    needs_js = ('cubicweb.widgets.js', )
-    template = """
-<table id="%(widgetid)s">
-<tr><td>%(inoutinput)s</td>
-    <td><div style="margin-bottom:3px">%(addinput)s</div> <div>%(removeinput)s</div></td>
-    <td>%(resinput)s</td></tr>
-</table>
-"""
-    add_button = """<input type="button" id="cwinoutadd"  class="wdgButton cwinoutadd" value="&gt;&gt;" size="10" />"""
-    remove_button ="""<input type="button" class="wdgButton cwinoutremove" value="&lt;&lt;" size="10" />"""
-
-    def __init__(self, attrs=None):
-        super(InOutWidget, self).__init__(attrs, multiple=True)
-
-    def render_select(self, form, field, name, selected=False):
-        values, attrs = self.values_and_attributes(form, field)
-        options = []
-        inputs = []
-        for _option in field.vocabulary(form):
-            try:
-                label, value, oattrs = _option
-            except ValueError:
-                label, value = _option
-            if selected:
-                # add values
-                if value in values:
-                    options.append(tags.option(label, value=value))
-                    # add hidden inputs
-                    inputs.append(tags.input(value=value, name=field.dom_id(form), type="hidden"))
-            else:
-                options.append(tags.option(label, value=value))
-        if 'size' not in attrs:
-            attrs['size'] = 5
-        if 'id' in attrs :
-            attrs.pop('id')
-        return tags.select(name=name, multiple=self._multiple, id=name,
-                           options=options, **attrs) + '\n'.join(inputs)
-
-
-    def _render(self, form, field, renderer):
-        domid = field.dom_id(form)
-        jsnodes = {'widgetid': domid, 'from': 'from_' + domid, 'to': 'to_' + domid}
-        form._cw.add_onload(u'$(cw.jqNode("%s")).cwinoutwidget("%s", "%s");'
-                            % (jsnodes['widgetid'], jsnodes['from'], jsnodes['to']))
-        field.required=True
-        return self.template % {'widgetid': jsnodes['widgetid'],
-                                'inoutinput' : self.render_select(form, field, jsnodes['from']), # helpinfo select tag
-                                'resinput' : self.render_select(form, field, jsnodes['to'], selected=True), # select tag with resultats
-                                'addinput' : self.add_button % jsnodes,
-                                'removeinput': self.remove_button % jsnodes
-                                }