From 614383b7cb2e8dd68c670872cf2236ec049b7286 Mon Sep 17 00:00:00 2001
From: Greg Von Kuster <greg@bx.psu.edu>
Date: Tue, 3 Jul 2007 20:44:05 +0000
Subject: [PATCH] Fix for form_bulder (finally!!!) - at leasrt the unit test
 now pass...

---
 lib/galaxy/form_builder.py | 54 +++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/lib/galaxy/form_builder.py b/lib/galaxy/form_builder.py
index 7249b042533..65c9d0bc104 100644
--- a/lib/galaxy/form_builder.py
+++ b/lib/galaxy/form_builder.py
@@ -155,47 +155,53 @@ class SelectField(BaseField):
         else:
             return self.get_html_default( prefix )
     def get_html_checkboxes( self, prefix="" ):
+        
         rval = []
-	box_len = 0
-        for text in self.options:
-	    if box_len < len(text) :
-	        box_len = len(text)
-
-	if box_len <= 5 :
-	    rval.append('<table><tr>')
-	
-	nn = 0
-        ctr = 0
+        box_len = 0
         for text, value, selected in self.options:
-	    if box_len > 5 : 
+            if box_len < len(text) :
+                box_len = len(text) 
+                
+        if box_len <= 5 :
+            rval.append('<table><tr>')
+	
+        nn = 0
+        ctr = 0
+        style = ""
+        
+        for text, value, selected in self.options:
+            if len(self.options) > 2 and ctr % 2 == 1:
+            #if ctr % 2 == 1:
+                style = " class=\"odd_row\""
+            else:
+                style = ""
+            if box_len > 5: 
                 if selected:
                     rval.append( '<div%s><input type="checkbox" name="%s%s" value="%s" checked>%s</div>' % ( style, prefix, self.name, value, text) )
                 else:
                     rval.append( '<div%s><input type="checkbox" name="%s%s" value="%s">%s</div>' % ( style, prefix, self.name, value, text) )
-	    else :
-	        #If maximum length of all the texts is less than or equal 5, put 5 checkboxes on one line.
-		if nn == 5 : 
-		    nn = 0
-		    rval.append('</tr><tr>')
+            else:
+                #If maximum length of all the texts is less than or equal 5, put 5 checkboxes on one line.
+                if nn == 5: 
+                    nn = 0
+                    rval.append('</tr><tr>')
                 if selected:
                     rval.append( '<td><input type="checkbox" name="%s%s" value="%s" checked>%s</td>' % ( prefix, self.name, value, text) )
                 else:
                     rval.append( '<td><input type="checkbox" name="%s%s" value="%s">%s</td>' % ( prefix, self.name, value, text) )
-	    nn = nn + 1
+            nn = nn + 1
+            ctr += 1
+            
+        if box_len <= 5 : 
+            rval.append('</tr></table>')
 
-	if box_len <= 5 : 
-	    rval.append('</tr></table>')
-            style = ""
-            if len(self.options) > 2 and ctr % 2 == 1:
-                style = " class=\"odd_row\""
 #            if selected:
 #                rval.append( '<div%s><input type="checkbox" name="%s" value="%s" checked>%s</div>' % ( style, self.name, value, text) )
 #            else:
 #                rval.append( '<div%s><input type="checkbox" name="%s" value="%s">%s</div>' % ( style, self.name, value, text) )
-            ctr += 1
 
         return "\n".join( rval )
-        rval = []
+#        rval = []
 	
 #        ctr = 0
 #        for text, value, selected in self.options: