Fix for rendering tools / workflows in target frames, also elimnate the Workflow link in the tool panel as we're now using the menu bar.

This commit is contained in:
Greg Von Kuster
2009-02-23 13:52:34 -05:00
parent 19d61ff4cf
commit 987df32669
2 changed files with 4 additions and 26 deletions
+3 -25
View File
@@ -16,9 +16,9 @@
## %if "[[" in tool.description and "]]" in tool.description:
## ${tool.description.replace( '[[', '<a href="link" target="galaxy_main">' % $tool.id ).replace( "]]", "</a>" )
%if tool.name:
<a id="link-${tool.id}" href="${link}" target="galaxy_main" minsizehint="${tool.uihints.get( 'minwidth', -1 )}">${tool.name}</a> ${tool.description}
<a id="link-${tool.id}" href="${link}" target=${tool.target} minsizehint="${tool.uihints.get( 'minwidth', -1 )}">${tool.name}</a> ${tool.description}
%else:
<a id="link-${tool.id}" href="${link}" target="galaxy_main" minsizehint="${tool.uihints.get( 'minwidth', -1 )}">${tool.description}</a>
<a id="link-${tool.id}" href="${link}" target=${tool.target} minsizehint="${tool.uihints.get( 'minwidth', -1 )}">${tool.description}</a>
%endif
</div>
%endif
@@ -32,7 +32,7 @@
<div class="toolTitleNoSection">
%endif
<% encoded_id = key.lstrip( 'workflow_' ) %>
<a id="link-${workflow.id}" href="${ h.url_for( controller='workflow', action='run', id=encoded_id, check_user=False )}" target="galaxy_main"}">${workflow.name}</a>
<a id="link-${workflow.id}" href="${ h.url_for( controller='workflow', action='run', id=encoded_id, check_user=False )}" target="_parent"}">${workflow.name}</a>
</div>
</%def>
@@ -114,28 +114,6 @@
%endif
<div class="toolSectionPad"></div>
%endfor
## Link to workflow management. The location of this may change, but eventually
## at least some workflows will appear here (the user should be able to
## configure which of their stored workflows appear in the tools menu).
<div class="toolSectionPad"></div>
<div class="toolSectionPad"></div>
<div class="toolSectionTitle" id="title_XXinternalXXworkflow">
<span>Workflow <i>(beta)</i></span>
</div>
<div id="XXinternalXXworkflow" class="toolSectionBody">
<div class="toolTitle">
<a href="${h.url_for( controller='workflow', action='index' )}" target="galaxy_main">Manage</a> workflows
</div>
%if t.user:
%for m in t.user.stored_workflow_menu_entries:
<div class="toolTitle">
<a href="${h.url_for( controller='workflow', action='run', id=trans.security.encode_id(m.stored_workflow_id) )}" target="galaxy_main">${m.stored_workflow.name}</a>
</div>
%endfor
%endif
</div>
</div>
</div>
</body>
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<tool name="Access Libraries" id="library_access1">
<description>stored locally</description>
<inputs action="/library/index" method="get">
<inputs action="/library/index" method="get" target="_parent">
<param name="default_action" type="hidden" value="add" />
</inputs>
<uihints minwidth="800"/>