September 2008 - galaxy-dev - lists.galaxyproject.org

[hg] galaxy 1486: Between page reloads, Drill Down parameter typ...
by greg＠scofield.bx.psu.edu 02 Sep '08

02 Sep '08

details: http://www.bx.psu.edu/hg/galaxy/rev/9e956e7b738f changeset: 1486:9e956e7b738f user: Dan Blankenberg <dan(a)bx.psu.edu> date: Wed Aug 27 16:36:41 2008 -0400 description: Between page reloads, Drill Down parameter type will now keep parent nodes expanded when a descendant is selected. 3 file(s) affected in this change: lib/galaxy/tools/parameters/basic.py lib/galaxy/web/form_builder.py templates/tool_form.tmpl diffs (142 lines): diff -r 19c03a96b338 -r 9e956e7b738f lib/galaxy/tools/parameters/basic.py --- a/lib/galaxy/tools/parameters/basic.py Wed Aug 27 15:51:59 2008 -0400 +++ b/lib/galaxy/tools/parameters/basic.py Wed Aug 27 16:36:41 2008 -0400 @@ -729,13 +729,13 @@ >>> print p.get_html() <div><ul class="toolParameterExpandableCollapsable"> <li><span class="toolParameterExpandableCollapsable">[+]</span><input type="checkbox" name="some_name" value="heading1"">Heading 1 - <ul class="toolParameterExpandableCollapsable"> + <ul class="toolParameterExpandableCollapsable" default_state="collapsed"> <li><input type="checkbox" name="some_name" value="option1"">Option 1 </li> <li><input type="checkbox" name="some_name" value="option2"">Option 2 </li> <li><span class="toolParameterExpandableCollapsable">[+]</span><input type="checkbox" name="some_name" value="heading1"">Heading 1 - <ul class="toolParameterExpandableCollapsable"> + <ul class="toolParameterExpandableCollapsable" default_state="collapsed"> <li><input type="checkbox" name="some_name" value="option3"">Option 3 </li> <li><input type="checkbox" name="some_name" value="option4"">Option 4 @@ -766,13 +766,13 @@ >>> print p.get_html() <div><ul class="toolParameterExpandableCollapsable"> <li><span class="toolParameterExpandableCollapsable">[+]</span><input type="radio" name="some_name" value="heading1"">Heading 1 - <ul class="toolParameterExpandableCollapsable"> + <ul class="toolParameterExpandableCollapsable" default_state="collapsed"> <li><input type="radio" name="some_name" value="option1"">Option 1 </li> <li><input type="radio" name="some_name" value="option2"">Option 2 </li> <li><span class="toolParameterExpandableCollapsable">[+]</span><input type="radio" name="some_name" value="heading1"">Heading 1 - <ul class="toolParameterExpandableCollapsable"> + <ul class="toolParameterExpandableCollapsable" default_state="collapsed"> <li><input type="radio" name="some_name" value="option3"">Option 3 </li> <li><input type="radio" name="some_name" value="option4"">Option 4 diff -r 19c03a96b338 -r 9e956e7b738f lib/galaxy/web/form_builder.py --- a/lib/galaxy/web/form_builder.py Wed Aug 27 15:51:59 2008 -0400 +++ b/lib/galaxy/web/form_builder.py Wed Aug 27 16:36:41 2008 -0400 @@ -203,13 +203,13 @@ >>> print t.get_html() <div><ul class="toolParameterExpandableCollapsable"> <li><span class="toolParameterExpandableCollapsable">[+]</span><input type="checkbox" name="foo" value="heading1"">Heading 1 - <ul class="toolParameterExpandableCollapsable"> + <ul class="toolParameterExpandableCollapsable" default_state="collapsed"> <li><input type="checkbox" name="foo" value="option1"">Option 1 </li> <li><input type="checkbox" name="foo" value="option2"">Option 2 </li> <li><span class="toolParameterExpandableCollapsable">[+]</span><input type="checkbox" name="foo" value="heading1"">Heading 1 - <ul class="toolParameterExpandableCollapsable"> + <ul class="toolParameterExpandableCollapsable" default_state="collapsed"> <li><input type="checkbox" name="foo" value="option3"">Option 3 </li> <li><input type="checkbox" name="foo" value="option4"">Option 4 @@ -225,13 +225,13 @@ >>> print t.get_html() <div><ul class="toolParameterExpandableCollapsable"> <li><span class="toolParameterExpandableCollapsable">[+]</span><input type="radio" name="foo" value="heading1"">Heading 1 - <ul class="toolParameterExpandableCollapsable"> + <ul class="toolParameterExpandableCollapsable" default_state="collapsed"> <li><input type="radio" name="foo" value="option1"">Option 1 </li> <li><input type="radio" name="foo" value="option2"">Option 2 </li> <li><span class="toolParameterExpandableCollapsable">[+]</span><input type="radio" name="foo" value="heading1"">Heading 1 - <ul class="toolParameterExpandableCollapsable"> + <ul class="toolParameterExpandableCollapsable" default_state="collapsed"> <li><input type="radio" name="foo" value="option3"">Option 3 </li> <li><input type="radio" name="foo" value="option4"">Option 4 @@ -266,22 +266,36 @@ else: self.refresh_on_change_text = '' def get_html( self, prefix="" ): - def recurse_options( html, options ): + def find_expanded_options( expanded_options, options, parent_options = [] ): + for option in options: + if option['value'] in self.value: + expanded_options.extend( parent_options ) + if option['options']: + new_parents = list( parent_options ) + [ option['value'] ] + find_expanded_options( expanded_options, option['options'], new_parents ) + def recurse_options( html, options, expanded_options = [] ): for option in options: selected = ( option['value'] in self.value ) if selected: selected = ' checked' else: selected = '' if option['options']: - html.append( '<li><span class="toolParameterExpandableCollapsable">[+]</span><input type="%s" name="%s%s" value="%s"%s">%s' % ( self.display, prefix, self.name, option['value'], selected, option['name']) ) - html.append( '<ul class="toolParameterExpandableCollapsable">') - recurse_options( html, option['options'] ) + default_state = 'collapsed' + default_icon = '[+]' + if option['value'] in expanded_options: + default_state = 'expanded' + default_icon = '[-]' + html.append( '<li><span class="toolParameterExpandableCollapsable">%s</span><input type="%s" name="%s%s" value="%s"%s">%s' % ( default_icon, self.display, prefix, self.name, option['value'], selected, option['name']) ) + html.append( '<ul class="toolParameterExpandableCollapsable" default_state="%s">' % default_state ) + recurse_options( html, option['options'], expanded_options ) html.append( '</ul>') else: html.append( '<li><input type="%s" name="%s%s" value="%s"%s">%s' % ( self.display, prefix, self.name, option['value'], selected, option['name']) ) html.append( '</li>' ) rval = [] rval.append( '<div><ul class="toolParameterExpandableCollapsable">' ) - recurse_options( rval, self.options ) + expanded_options = [] + find_expanded_options( expanded_options, self.options ) + recurse_options( rval, self.options, expanded_options ) rval.append( '</ul></div>' ) return '\n'.join( rval ) diff -r 19c03a96b338 -r 9e956e7b738f templates/tool_form.tmpl --- a/templates/tool_form.tmpl Wed Aug 27 15:51:59 2008 -0400 +++ b/templates/tool_form.tmpl Wed Aug 27 16:36:41 2008 -0400 @@ -126,7 +126,7 @@ <input type="submit" class="primary-button" name="runtool_btn" value="Execute"> #else - + <div style="display: none;"> #if $tool_state.page == $tool.last_page <input type="submit" class="primary-button" name="runtool_btn" value="Execute"> @@ -142,7 +142,7 @@ <input type="submit" class="primary-button" name="runtool_btn" value="Next step"> #end if </div> - + #end if </form> @@ -178,7 +178,7 @@ } }); \$( 'ul ul' ).each( function(i) { - if ( \$( this )[0].className == 'toolParameterExpandableCollapsable' ) + if ( \$( this )[0].className == 'toolParameterExpandableCollapsable' && this.attributes.getNamedItem( 'default_state' ).value == 'collapsed' ) { \$( this ).hide(); }

1 0

[hg] galaxy 1487: A better fix for bring-to-front stacking in wo...
by greg＠scofield.bx.psu.edu 02 Sep '08

02 Sep '08

details: http://www.bx.psu.edu/hg/galaxy/rev/a7248362c37b changeset: 1487:a7248362c37b user: James Taylor <james(a)jamestaylor.org> date: Thu Aug 28 13:38:54 2008 -0400 description: A better fix for bring-to-front stacking in workflow editor 2 file(s) affected in this change: static/scripts/galaxy.workflow_editor.canvas.js templates/workflow/editor.mako diffs (71 lines): diff -r 9e956e7b738f -r a7248362c37b static/scripts/galaxy.workflow_editor.canvas.js --- a/static/scripts/galaxy.workflow_editor.canvas.js Wed Aug 27 16:36:41 2008 -0400 +++ b/static/scripts/galaxy.workflow_editor.canvas.js Thu Aug 28 13:38:54 2008 -0400 @@ -259,7 +259,12 @@ $(this.element).addClass( "toolForm-active" ); }, make_inactive : function () { - $(this.element).removeClass( "toolForm-active" ); + // Keep inactive nodes stacked from most to least recently active + // by moving element to the end of parent's node list + var element = this.element.get(0); + (function(p) { p.removeChild( element ); p.appendChild( element ) })(element.parentNode); + // Remove active class + $(element).removeClass( "toolForm-active" ); }, init_field_data : function ( data ) { var f = this.element; @@ -480,14 +485,6 @@ function() { $(this).attr( 'src', "../images/delete_icon_dark.png" ) }, function() { $(this).attr( 'src', "../images/delete_icon.png" ) } ) ); - // zIndex tracking for bring to front - zmax = $("#canvas-container").data( "zmax" ) - if ( ! zmax ) { - // Start above level where connectors are drawn - zmax = 20; - } - f.css( "zIndex", zmax + 1 ); - $("#canvas-container").data( "zmax", zmax + 1 ); // Place inside container f.appendTo( "#canvas-container" ); // Position in container @@ -508,16 +505,11 @@ // containment: $("#shim"), // grow: true, click: function( e, ui ) { - // Bring to front - zmax = $("#canvas-container").data( "zmax" ) - $(this).css( "zIndex", zmax + 1 ); - $("#canvas-container").data( "zmax", zmax + 1 ); // Make active workflow.activate_node( node ); }, start: function( e, ui ) { workflow.activate_node( node ); - $(this).css( 'z-index', $("#canvas-container").data( "zmax" ) + 1000 ); }, drag: function( e, ui ) { $(this).find( ".terminal" ).each( function() { @@ -525,10 +517,6 @@ }) }, stop: function( e, ui ) { - // Bring to front - zmax = $("#canvas-container").data( "zmax" ) - $(this).css( "zIndex", zmax + 1 ); - $("#canvas-container").data( "zmax", zmax + 1 ); // Redraw $(this).find( ".terminal" ).each( function() { this.terminal.redraw(); diff -r 9e956e7b738f -r a7248362c37b templates/workflow/editor.mako --- a/templates/workflow/editor.mako Wed Aug 27 16:36:41 2008 -0400 +++ b/templates/workflow/editor.mako Thu Aug 28 13:38:54 2008 -0400 @@ -394,6 +394,7 @@ } div.toolForm-active { + z-index: 1001; border: solid #8080FF 4px; margin: 3px; }

1 0

[hg] galaxy 1488: Another IE fix for stacking / deleting workflo...
by greg＠scofield.bx.psu.edu 02 Sep '08

02 Sep '08

details: http://www.bx.psu.edu/hg/galaxy/rev/dcaed9f80caf changeset: 1488:dcaed9f80caf user: James Taylor <james(a)jamestaylor.org> date: Thu Aug 28 13:57:23 2008 -0400 description: Another IE fix for stacking / deleting workflow editor nodes. 1 file(s) affected in this change: static/scripts/galaxy.workflow_editor.canvas.js diffs (27 lines): diff -r a7248362c37b -r dcaed9f80caf static/scripts/galaxy.workflow_editor.canvas.js --- a/static/scripts/galaxy.workflow_editor.canvas.js Thu Aug 28 13:38:54 2008 -0400 +++ b/static/scripts/galaxy.workflow_editor.canvas.js Thu Aug 28 13:57:23 2008 -0400 @@ -446,16 +446,18 @@ parent.show_form_for_tool( "<div>No node selected</div>" ); }, activate_node : function( node ) { - this.clear_active_node(); - parent.show_form_for_tool( node.form_html, node ); - node.make_active(); - this.active_node = node; + if ( this.active_node != node ) { + this.clear_active_node(); + parent.show_form_for_tool( node.form_html, node ); + node.make_active(); + this.active_node = node; + } }, node_changed : function ( node ) { this.has_changes = true; if ( this.active_node == node ) { // Reactive with new form_html - this.activate_node( node ); + parent.show_form_for_tool( node.form_html, node ); } } });

1 0