# HG changeset patch
# User sylvain.thenault@logilab.fr
# Date 1242153095 -7200
# Node ID 73dc7ad124aae6c8c2408372d8aef147d804833a
# Parent  d46f59e5efd356f77d9cf92923bf395ade0f9202# Parent  65ec5ccc89270fb8e15b53a16c919ebdbfda531f
merge

diff -r 65ec5ccc8927 -r 73dc7ad124aa appobject.py
--- a/appobject.py	Tue May 12 20:08:36 2009 +0200
+++ b/appobject.py	Tue May 12 20:31:35 2009 +0200
@@ -196,6 +196,13 @@
             view = self.vreg.select_view(__fallback_vid, self.req, rset, **kwargs)
         return view.render(**kwargs)
 
+    def initialize_varmaker(self):
+        varmaker = self.req.get_page_data('rql_varmaker')
+        if varmaker is None:
+            varmaker = self.req.varmaker
+            self.req.set_page_data('rql_varmaker', varmaker)
+        self.varmaker = varmaker
+
     # url generation methods ##################################################
 
     controller = 'view'
diff -r 65ec5ccc8927 -r 73dc7ad124aa view.py
--- a/view.py	Tue May 12 20:08:36 2009 +0200
+++ b/view.py	Tue May 12 20:31:35 2009 +0200
@@ -307,13 +307,6 @@
         if row:
             w(u'</div>')
 
-    def initialize_varmaker(self):
-        varmaker = self.req.get_page_data('rql_varmaker')
-        if varmaker is None:
-            varmaker = self.req.varmaker
-            self.req.set_page_data('rql_varmaker', varmaker)
-        self.varmaker = varmaker
-
 
 
 # concrete views base classes #################################################
diff -r 65ec5ccc8927 -r 73dc7ad124aa web/form.py
--- a/web/form.py	Tue May 12 20:08:36 2009 +0200
+++ b/web/form.py	Tue May 12 20:31:35 2009 +0200
@@ -51,13 +51,6 @@
     XXX: you should inherit from this FIRST (obscure pb with super call)
     """
 
-    def initialize_varmaker(self):
-        varmaker = self.req.get_page_data('rql_varmaker')
-        if varmaker is None:
-            varmaker = self.req.varmaker
-            self.req.set_page_data('rql_varmaker', varmaker)
-        self.varmaker = varmaker
-
     def session_key(self):
         """return the key that may be used to store / retreive data about a
         previous post which failed because of a validation error
diff -r 65ec5ccc8927 -r 73dc7ad124aa web/formfields.py
--- a/web/formfields.py	Tue May 12 20:08:36 2009 +0200
+++ b/web/formfields.py	Tue May 12 20:31:35 2009 +0200
@@ -334,6 +334,9 @@
         super(IntField, self).__init__(**kwargs)
         self.min = min
         self.max = max
+        if isinstance(self.widget, TextInput):
+            self.widget.attrs.setdefault('size', 5)
+            self.widget.attrs.setdefault('maxlength', 15)
 
 class BooleanField(Field):
     widget = Radio
@@ -372,7 +375,7 @@
 
 class TimeField(DateField):
     format_prop = 'ui.datetime-format'
-    widget = TextInput 
+    widget = TextInput
 
 class HiddenInitialValueField(Field):
     def __init__(self, visible_field):
@@ -384,6 +387,7 @@
 
 class RelationField(Field):
     def __init__(self, **kwargs):
+        kwargs.setdefault('sort', False)
         super(RelationField, self).__init__(**kwargs)
 
     @staticmethod
diff -r 65ec5ccc8927 -r 73dc7ad124aa web/formrenderers.py
--- a/web/formrenderers.py	Tue May 12 20:08:36 2009 +0200
+++ b/web/formrenderers.py	Tue May 12 20:31:35 2009 +0200
@@ -226,10 +226,10 @@
         for field in fields:
             error = form.form_field_error(field)
             if error:
-                w(u'<td class="error" style="width:100%;">')
+                w(u'<td class="error">')
                 w(error)
             else:
-                w(u'<td style="width:100%;">')
+                w(u'<td>')
             w(field.render(form, self))
             w(u'</td>')
         w(u'<td>')