commit/galaxy-central: 2 new changesets

6 Mar 2013

2 new commits in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/dc10f9430b6a/
changeset:   dc10f9430b6a
user:        dan
date:        2013-03-06 19:47:00
summary:     Fix display bug for DrillDown Fields and parameters.
affected #:  2 files

diff -r d1b435e7200d4543fe3060ba9c362220d73d615b -r dc10f9430b6aaaf85c67a998d4ce666a5b66b600 lib/galaxy/tools/parameters/basic.py

--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -1075,9 +1075,9 @@
     >>> print p.get_html()
     <div class="form-row drilldown-container" id="drilldown--736f6d655f6e616d65"><div class="form-row-input">
-    <span class="form-toggle icon-button toggle-expand" id="drilldown--736f6d655f6e616d65-68656164696e6731-click"></span>
+    <div><span class="form-toggle icon-button toggle-expand" id="drilldown--736f6d655f6e616d65-68656164696e6731-click"></span><input type="checkbox" name="some_name" value="heading1" >Heading 1
-    <div class="form-row" id="drilldown--736f6d655f6e616d65-68656164696e6731-container" style="float: left; margin-left: 1em;">
+    </div><div class="form-row" id="drilldown--736f6d655f6e616d65-68656164696e6731-container" style="float: left; margin-left: 1em;"><div class="form-row-input"><input type="checkbox" name="some_name" value="option1" >Option 1
     </div>
@@ -1085,9 +1085,9 @@
     <input type="checkbox" name="some_name" value="option2" >Option 2
     </div><div class="form-row-input">
-    <span class="form-toggle icon-button toggle-expand" id="drilldown--736f6d655f6e616d65-68656164696e6731-68656164696e6731-click"></span>
+    <div><span class="form-toggle icon-button toggle-expand" id="drilldown--736f6d655f6e616d65-68656164696e6731-68656164696e6731-click"></span><input type="checkbox" name="some_name" value="heading1" >Heading 1
-    <div class="form-row" id="drilldown--736f6d655f6e616d65-68656164696e6731-68656164696e6731-container" style="float: left; margin-left: 1em;">
+    </div><div class="form-row" id="drilldown--736f6d655f6e616d65-68656164696e6731-68656164696e6731-container" style="float: left; margin-left: 1em;"><div class="form-row-input"><input type="checkbox" name="some_name" value="option3" >Option 3
     </div>
@@ -1121,9 +1121,9 @@
     >>> print p.get_html()
     <div class="form-row drilldown-container" id="drilldown--736f6d655f6e616d65"><div class="form-row-input">
-    <span class="form-toggle icon-button toggle-expand" id="drilldown--736f6d655f6e616d65-68656164696e6731-click"></span>
+    <div><span class="form-toggle icon-button toggle-expand" id="drilldown--736f6d655f6e616d65-68656164696e6731-click"></span><input type="radio" name="some_name" value="heading1" >Heading 1
-    <div class="form-row" id="drilldown--736f6d655f6e616d65-68656164696e6731-container" style="float: left; margin-left: 1em;">
+    </div><div class="form-row" id="drilldown--736f6d655f6e616d65-68656164696e6731-container" style="float: left; margin-left: 1em;"><div class="form-row-input"><input type="radio" name="some_name" value="option1" >Option 1
     </div>
@@ -1131,9 +1131,9 @@
     <input type="radio" name="some_name" value="option2" >Option 2
     </div><div class="form-row-input">
-    <span class="form-toggle icon-button toggle-expand" id="drilldown--736f6d655f6e616d65-68656164696e6731-68656164696e6731-click"></span>
+    <div><span class="form-toggle icon-button toggle-expand" id="drilldown--736f6d655f6e616d65-68656164696e6731-68656164696e6731-click"></span><input type="radio" name="some_name" value="heading1" >Heading 1
-    <div class="form-row" id="drilldown--736f6d655f6e616d65-68656164696e6731-68656164696e6731-container" style="float: left; margin-left: 1em;">
+    </div><div class="form-row" id="drilldown--736f6d655f6e616d65-68656164696e6731-68656164696e6731-container" style="float: left; margin-left: 1em;"><div class="form-row-input"><input type="radio" name="some_name" value="option3" >Option 3
     </div>

diff -r d1b435e7200d4543fe3060ba9c362220d73d615b -r dc10f9430b6aaaf85c67a998d4ce666a5b66b600 lib/galaxy/web/form_builder.py
--- a/lib/galaxy/web/form_builder.py
+++ b/lib/galaxy/web/form_builder.py
@@ -396,9 +396,9 @@
     >>> print t.get_html()
     <div class="form-row drilldown-container" id="drilldown--666f6f"><div class="form-row-input">
-    <span class="form-toggle icon-button toggle-expand" id="drilldown--666f6f-68656164696e6731-click"></span>
+    <div><span class="form-toggle icon-button toggle-expand" id="drilldown--666f6f-68656164696e6731-click"></span><input type="checkbox" name="foo" value="heading1" >Heading 1
-    <div class="form-row" id="drilldown--666f6f-68656164696e6731-container" style="float: left; margin-left: 1em;">
+    </div><div class="form-row" id="drilldown--666f6f-68656164696e6731-container" style="float: left; margin-left: 1em;"><div class="form-row-input"><input type="checkbox" name="foo" value="option1" >Option 1
     </div>
@@ -406,9 +406,9 @@
     <input type="checkbox" name="foo" value="option2" >Option 2
     </div><div class="form-row-input">
-    <span class="form-toggle icon-button toggle-expand" id="drilldown--666f6f-68656164696e6731-68656164696e6731-click"></span>
+    <div><span class="form-toggle icon-button toggle-expand" id="drilldown--666f6f-68656164696e6731-68656164696e6731-click"></span><input type="checkbox" name="foo" value="heading1" >Heading 1
-    <div class="form-row" id="drilldown--666f6f-68656164696e6731-68656164696e6731-container" style="float: left; margin-left: 1em;">
+    </div><div class="form-row" id="drilldown--666f6f-68656164696e6731-68656164696e6731-container" style="float: left; margin-left: 1em;"><div class="form-row-input"><input type="checkbox" name="foo" value="option3" >Option 3
     </div>
@@ -427,9 +427,9 @@
     >>> print t.get_html()
     <div class="form-row drilldown-container" id="drilldown--666f6f"><div class="form-row-input">
-    <span class="form-toggle icon-button toggle-expand" id="drilldown--666f6f-68656164696e6731-click"></span>
+    <div><span class="form-toggle icon-button toggle-expand" id="drilldown--666f6f-68656164696e6731-click"></span><input type="radio" name="foo" value="heading1" >Heading 1
-    <div class="form-row" id="drilldown--666f6f-68656164696e6731-container" style="float: left; margin-left: 1em;">
+    </div><div class="form-row" id="drilldown--666f6f-68656164696e6731-container" style="float: left; margin-left: 1em;"><div class="form-row-input"><input type="radio" name="foo" value="option1" >Option 1
     </div>
@@ -437,9 +437,9 @@
     <input type="radio" name="foo" value="option2" >Option 2
     </div><div class="form-row-input">
-    <span class="form-toggle icon-button toggle-expand" id="drilldown--666f6f-68656164696e6731-68656164696e6731-click"></span>
+    <div><span class="form-toggle icon-button toggle-expand" id="drilldown--666f6f-68656164696e6731-68656164696e6731-click"></span><input type="radio" name="foo" value="heading1" >Heading 1
-    <div class="form-row" id="drilldown--666f6f-68656164696e6731-68656164696e6731-container" style="float: left; margin-left: 1em;">
+    </div><div class="form-row" id="drilldown--666f6f-68656164696e6731-68656164696e6731-container" style="float: left; margin-left: 1em;"><div class="form-row-input"><input type="radio" name="foo" value="option3" >Option 3
     </div>
@@ -501,10 +501,10 @@
                 html.append( '<div class="form-row-input">')
                 drilldown_group_id = "%s-%s" % ( base_id, hexlify( option['value'] ) )
                 if option['options']:
-                    html.append( '<span class="%s" id="%s-click"></span>' % ( span_class, drilldown_group_id ) )
+                    html.append( '<div><span class="%s" id="%s-click"></span>' % ( span_class, drilldown_group_id ) )
                 html.append( '<input type="%s" name="%s%s" value="%s" %s>%s' % ( self.display, prefix, self.name, escaped_option_value, selected, option['name']) )
                 if option['options']:
-                    html.append( '<div class="form-row" id="%s-container" style="float: left; margin-left: 1em;">' % ( drilldown_group_id )  )
+                    html.append( '</div><div class="form-row" id="%s-container" style="float: left; margin-left: 1em;">' % ( drilldown_group_id )  )
                     recurse_options( html, option['options'], drilldown_group_id, expanded_options )
                     html.append( '</div>')
                 html.append( '</div>')


https://bitbucket.org/galaxy/galaxy-central/commits/779b54139013/
changeset:   779b54139013
branch:      stable
user:        dan
date:        2013-03-06 19:47:00
summary:     Fix display bug for DrillDown Fields and parameters.
affected #:  2 files

diff -r b65ed2831d234ef9fc78b8c15d9dfcf40f879c4f -r 779b54139013946613772d02a3fbb61e067f3267 lib/galaxy/tools/parameters/basic.py
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -1072,9 +1072,9 @@
     >>> print p.get_html()
     <div class="form-row drilldown-container" id="drilldown--736f6d655f6e616d65"><div class="form-row-input">
-    <span class="form-toggle icon-button toggle-expand" id="drilldown--736f6d655f6e616d65-68656164696e6731-click"></span>
+    <div><span class="form-toggle icon-button toggle-expand" id="drilldown--736f6d655f6e616d65-68656164696e6731-click"></span><input type="checkbox" name="some_name" value="heading1" >Heading 1
-    <div class="form-row" id="drilldown--736f6d655f6e616d65-68656164696e6731-container" style="float: left; margin-left: 1em;">
+    </div><div class="form-row" id="drilldown--736f6d655f6e616d65-68656164696e6731-container" style="float: left; margin-left: 1em;"><div class="form-row-input"><input type="checkbox" name="some_name" value="option1" >Option 1
     </div>
@@ -1082,9 +1082,9 @@
     <input type="checkbox" name="some_name" value="option2" >Option 2
     </div><div class="form-row-input">
-    <span class="form-toggle icon-button toggle-expand" id="drilldown--736f6d655f6e616d65-68656164696e6731-68656164696e6731-click"></span>
+    <div><span class="form-toggle icon-button toggle-expand" id="drilldown--736f6d655f6e616d65-68656164696e6731-68656164696e6731-click"></span><input type="checkbox" name="some_name" value="heading1" >Heading 1
-    <div class="form-row" id="drilldown--736f6d655f6e616d65-68656164696e6731-68656164696e6731-container" style="float: left; margin-left: 1em;">
+    </div><div class="form-row" id="drilldown--736f6d655f6e616d65-68656164696e6731-68656164696e6731-container" style="float: left; margin-left: 1em;"><div class="form-row-input"><input type="checkbox" name="some_name" value="option3" >Option 3
     </div>
@@ -1118,9 +1118,9 @@
     >>> print p.get_html()
     <div class="form-row drilldown-container" id="drilldown--736f6d655f6e616d65"><div class="form-row-input">
-    <span class="form-toggle icon-button toggle-expand" id="drilldown--736f6d655f6e616d65-68656164696e6731-click"></span>
+    <div><span class="form-toggle icon-button toggle-expand" id="drilldown--736f6d655f6e616d65-68656164696e6731-click"></span><input type="radio" name="some_name" value="heading1" >Heading 1
-    <div class="form-row" id="drilldown--736f6d655f6e616d65-68656164696e6731-container" style="float: left; margin-left: 1em;">
+    </div><div class="form-row" id="drilldown--736f6d655f6e616d65-68656164696e6731-container" style="float: left; margin-left: 1em;"><div class="form-row-input"><input type="radio" name="some_name" value="option1" >Option 1
     </div>
@@ -1128,9 +1128,9 @@
     <input type="radio" name="some_name" value="option2" >Option 2
     </div><div class="form-row-input">
-    <span class="form-toggle icon-button toggle-expand" id="drilldown--736f6d655f6e616d65-68656164696e6731-68656164696e6731-click"></span>
+    <div><span class="form-toggle icon-button toggle-expand" id="drilldown--736f6d655f6e616d65-68656164696e6731-68656164696e6731-click"></span><input type="radio" name="some_name" value="heading1" >Heading 1
-    <div class="form-row" id="drilldown--736f6d655f6e616d65-68656164696e6731-68656164696e6731-container" style="float: left; margin-left: 1em;">
+    </div><div class="form-row" id="drilldown--736f6d655f6e616d65-68656164696e6731-68656164696e6731-container" style="float: left; margin-left: 1em;"><div class="form-row-input"><input type="radio" name="some_name" value="option3" >Option 3
     </div>

diff -r b65ed2831d234ef9fc78b8c15d9dfcf40f879c4f -r 779b54139013946613772d02a3fbb61e067f3267 lib/galaxy/web/form_builder.py
--- a/lib/galaxy/web/form_builder.py
+++ b/lib/galaxy/web/form_builder.py
@@ -396,9 +396,9 @@
     >>> print t.get_html()
     <div class="form-row drilldown-container" id="drilldown--666f6f"><div class="form-row-input">
-    <span class="form-toggle icon-button toggle-expand" id="drilldown--666f6f-68656164696e6731-click"></span>
+    <div><span class="form-toggle icon-button toggle-expand" id="drilldown--666f6f-68656164696e6731-click"></span><input type="checkbox" name="foo" value="heading1" >Heading 1
-    <div class="form-row" id="drilldown--666f6f-68656164696e6731-container" style="float: left; margin-left: 1em;">
+    </div><div class="form-row" id="drilldown--666f6f-68656164696e6731-container" style="float: left; margin-left: 1em;"><div class="form-row-input"><input type="checkbox" name="foo" value="option1" >Option 1
     </div>
@@ -406,9 +406,9 @@
     <input type="checkbox" name="foo" value="option2" >Option 2
     </div><div class="form-row-input">
-    <span class="form-toggle icon-button toggle-expand" id="drilldown--666f6f-68656164696e6731-68656164696e6731-click"></span>
+    <div><span class="form-toggle icon-button toggle-expand" id="drilldown--666f6f-68656164696e6731-68656164696e6731-click"></span><input type="checkbox" name="foo" value="heading1" >Heading 1
-    <div class="form-row" id="drilldown--666f6f-68656164696e6731-68656164696e6731-container" style="float: left; margin-left: 1em;">
+    </div><div class="form-row" id="drilldown--666f6f-68656164696e6731-68656164696e6731-container" style="float: left; margin-left: 1em;"><div class="form-row-input"><input type="checkbox" name="foo" value="option3" >Option 3
     </div>
@@ -427,9 +427,9 @@
     >>> print t.get_html()
     <div class="form-row drilldown-container" id="drilldown--666f6f"><div class="form-row-input">
-    <span class="form-toggle icon-button toggle-expand" id="drilldown--666f6f-68656164696e6731-click"></span>
+    <div><span class="form-toggle icon-button toggle-expand" id="drilldown--666f6f-68656164696e6731-click"></span><input type="radio" name="foo" value="heading1" >Heading 1
-    <div class="form-row" id="drilldown--666f6f-68656164696e6731-container" style="float: left; margin-left: 1em;">
+    </div><div class="form-row" id="drilldown--666f6f-68656164696e6731-container" style="float: left; margin-left: 1em;"><div class="form-row-input"><input type="radio" name="foo" value="option1" >Option 1
     </div>
@@ -437,9 +437,9 @@
     <input type="radio" name="foo" value="option2" >Option 2
     </div><div class="form-row-input">
-    <span class="form-toggle icon-button toggle-expand" id="drilldown--666f6f-68656164696e6731-68656164696e6731-click"></span>
+    <div><span class="form-toggle icon-button toggle-expand" id="drilldown--666f6f-68656164696e6731-68656164696e6731-click"></span><input type="radio" name="foo" value="heading1" >Heading 1
-    <div class="form-row" id="drilldown--666f6f-68656164696e6731-68656164696e6731-container" style="float: left; margin-left: 1em;">
+    </div><div class="form-row" id="drilldown--666f6f-68656164696e6731-68656164696e6731-container" style="float: left; margin-left: 1em;"><div class="form-row-input"><input type="radio" name="foo" value="option3" >Option 3
     </div>
@@ -501,10 +501,10 @@
                 html.append( '<div class="form-row-input">')
                 drilldown_group_id = "%s-%s" % ( base_id, hexlify( option['value'] ) )
                 if option['options']:
-                    html.append( '<span class="%s" id="%s-click"></span>' % ( span_class, drilldown_group_id ) )
+                    html.append( '<div><span class="%s" id="%s-click"></span>' % ( span_class, drilldown_group_id ) )
                 html.append( '<input type="%s" name="%s%s" value="%s" %s>%s' % ( self.display, prefix, self.name, escaped_option_value, selected, option['name']) )
                 if option['options']:
-                    html.append( '<div class="form-row" id="%s-container" style="float: left; margin-left: 1em;">' % ( drilldown_group_id )  )
+                    html.append( '</div><div class="form-row" id="%s-container" style="float: left; margin-left: 1em;">' % ( drilldown_group_id )  )
                     recurse_options( html, option['options'], drilldown_group_id, expanded_options )
                     html.append( '</div>')
                 html.append( '</div>')

Repository URL: https://bitbucket.org/galaxy/galaxy-central/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.

    

commits-noreply＠bitbucket.org

tags

participants (1)