2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/6a75ab8e6a2b/ changeset: 6a75ab8e6a2b user: rmarenco date: 2012-07-10 23:20:57 summary: Fix dataset tool parameter information form. Fixes #773 affected #: 1 file diff -r 3e6ab1cf0c2eebbc886a7911e970f43bbfde522b -r 6a75ab8e6a2bcc08b2a4ad8af55c4afe62e390de templates/show_params.mako --- a/templates/show_params.mako +++ b/templates/show_params.mako @@ -19,19 +19,27 @@ %elif input.type == "conditional": <% current_case = param_values[input.name]['__current_case__'] %><tr> - <td>${input.label}</td> - <td>${current_case}</td> + ${ inputs_recursive_indent( text=input.test_param.label,depth=depth )} + <!-- Get the value of the current Conditonal parameter --> + <td>${input.cases[current_case].value}</td></tr> ${ inputs_recursive(input.cases[current_case].inputs, param_values[input.name], depth=depth+1) } %elif getattr(input, "label", None): <tr> - <td>${input.label}</td> + ${inputs_recursive_indent( text=input.label,depth=depth )} <td>${input.value_to_display_text(param_values[input.name], trans.app)}</td></tr> %endif %endfor </%def> + ## function to add a indentation depending on the depth in a <tr> +<%def name="inputs_recursive_indent( text, depth )"> + <td style="padding-left: ${ ( depth - 1 ) * 10 }px"> + ${text} + </td> +</%def> + <table class="tabletip"><thead><tr><th colspan="2" style="font-size: 120%;"> https://bitbucket.org/galaxy/galaxy-central/changeset/af62b5d831de/ changeset: af62b5d831de user: rmarenco date: 2012-07-10 23:23:56 summary: Automerge affected #: 2 files diff -r 6a75ab8e6a2bcc08b2a4ad8af55c4afe62e390de -r af62b5d831de40a19da96e8c1c4e20c02aa1983c tool_conf.xml.main --- a/tool_conf.xml.main +++ b/tool_conf.xml.main @@ -314,9 +314,6 @@ <tool file="gatk/variant_eval.xml" /><tool file="gatk/variant_combine.xml" /></section> - <section name="NGS: Variant Detection" id="variant_detection"> - <tool file="variant_detection/freebayes.xml" /> - </section><section name="NGS: Indel Analysis" id="indel_analysis"><tool file="indels/sam_indel_filter.xml" /><tool file="indels/indel_sam2interval.xml" /> diff -r 6a75ab8e6a2bcc08b2a4ad8af55c4afe62e390de -r af62b5d831de40a19da96e8c1c4e20c02aa1983c tool_conf.xml.sample --- a/tool_conf.xml.sample +++ b/tool_conf.xml.sample @@ -419,9 +419,6 @@ <tool file="gatk/variant_eval.xml" /><tool file="gatk/variant_combine.xml" /></section> - <section name="NGS: Variant Detection" id="variant_detection"> - <tool file="variant_detection/freebayes.xml" /> - </section><section name="NGS: Peak Calling" id="peak_calling"><tool file="peak_calling/macs_wrapper.xml" /><tool file="peak_calling/sicer_wrapper.xml" /> 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.