Skip to content

Commit

Permalink
Adjust workflow toolbox structure to accurately mirror main toolbox.
Browse files Browse the repository at this point in the history
  • Loading branch information
dannon committed Aug 5, 2016
1 parent 08d20b2 commit 43dfc75
Showing 1 changed file with 64 additions and 80 deletions.
144 changes: 64 additions & 80 deletions templates/webapps/galaxy/workflow/editor.mako
Original file line number Diff line number Diff line change
Expand Up @@ -61,24 +61,6 @@
<style type="text/css">
body { margin: 0; padding: 0; overflow: hidden; }
#left {
background: #C1C9E5 url(${h.url_for('/static/style/menu_bg.png')}) top repeat-x;
}
div.toolMenu {
margin: 5px;
margin-left: 10px;
margin-right: 10px;
}
div.toolMenuGroupHeader {
font-weight: bold;
padding-top: 0.5em;
padding-bottom: 0.5em;
color: #333;
font-style: italic;
border-bottom: dotted #333 1px;
margin-bottom: 0.5em;
}
div.toolTitleDisabled {
padding-top: 5px;
padding-bottom: 5px;
Expand Down Expand Up @@ -283,76 +265,78 @@
</div>
<div class="unified-panel-body" style="overflow: auto;">
<div class="toolMenu">
<%
from galaxy.workflow.modules import load_module_sections
module_sections = load_module_sections( trans )
%>
<div id="tool-search" style="padding-bottom: 5px; position: relative; display: block; width: 100%">
<input type="text" name="query" placeholder="search tools" id="tool-search-query" class="search-query parent-width" />
<img src="${h.url_for('/static/images/loading_small_white_bg.gif')}" id="search-spinner" class="search-spinner" />
</div>
<div class="toolMenuContainer">
<div class="toolMenu">
<%
from galaxy.workflow.modules import load_module_sections
module_sections = load_module_sections( trans )
%>
<div id="tool-search" style="padding-bottom: 5px; position: relative; display: block; width: 100%">
<input type="text" name="query" placeholder="search tools" id="tool-search-query" class="search-query parent-width" />
<img src="${h.url_for('/static/images/loading_small_white_bg.gif')}" id="search-spinner" class="search-spinner" />
</div>
<div class="toolSectionWrapper">
${render_module_section(module_sections['inputs'])}
</div>
<div class="toolSectionWrapper">
${render_module_section(module_sections['inputs'])}
</div>
<div class="toolSectionList">
%for val in app.toolbox.tool_panel_contents( trans ):
<div class="toolSectionWrapper">
%if isinstance( val, Tool ):
${render_tool( val, False )}
%elif isinstance( val, ToolSection ) and val.elems:
<% section = val %>
<div class="toolSectionTitle" id="title_${section.id}">
<span>${section.name}</span>
</div>
<div id="${section.id}" class="toolSectionBody">
<div class="toolSectionBg">
%for section_key, section_val in section.elems.items():
%if isinstance( section_val, Tool ):
${render_tool( section_val, True )}
%elif isinstance( section_val, ToolSectionLabel ):
${render_label( section_val )}
%endif
%endfor
<div class="toolSectionList">
%for val in app.toolbox.tool_panel_contents( trans ):
<div class="toolSectionWrapper">
%if isinstance( val, Tool ):
${render_tool( val, False )}
%elif isinstance( val, ToolSection ) and val.elems:
<% section = val %>
<div class="toolSectionTitle" id="title_${section.id}">
<span>${section.name}</span>
</div>
<div id="${section.id}" class="toolSectionBody">
<div class="toolSectionBg">
%for section_key, section_val in section.elems.items():
%if isinstance( section_val, Tool ):
${render_tool( section_val, True )}
%elif isinstance( section_val, ToolSectionLabel ):
${render_label( section_val )}
%endif
%endfor
</div>
</div>
%elif isinstance( val, ToolSectionLabel ):
${render_label( val )}
%endif
</div>
%elif isinstance( val, ToolSectionLabel ):
${render_label( val )}
%endif
</div>
%endfor
## Data Manager Tools
%if trans.user_is_admin() and trans.app.data_managers.data_managers:
<div>&nbsp;</div>
<div class="toolSectionWrapper">
<div class="toolSectionTitle" id="title___DATA_MANAGER_TOOLS__">
<span>Data Manager Tools</span>
</div>
<div id="__DATA_MANAGER_TOOLS__" class="toolSectionBody">
<div class="toolSectionBg">
%for data_manager_id, data_manager_val in trans.app.data_managers.data_managers.items():
${ render_tool( data_manager_val.tool, True ) }
%endfor
%endfor
## Data Manager Tools
%if trans.user_is_admin() and trans.app.data_managers.data_managers:
<div>&nbsp;</div>
<div class="toolSectionWrapper">
<div class="toolSectionTitle" id="title___DATA_MANAGER_TOOLS__">
<span>Data Manager Tools</span>
</div>
<div id="__DATA_MANAGER_TOOLS__" class="toolSectionBody">
<div class="toolSectionBg">
%for data_manager_id, data_manager_val in trans.app.data_managers.data_managers.items():
${ render_tool( data_manager_val.tool, True ) }
%endfor
</div>
</div>
</div>
</div>
%endif
## End Data Manager Tools
</div>
<div>&nbsp;</div>
%for section_name, module_section in module_sections.items():
%if section_name != "inputs":
${render_module_section(module_section)}
%endif
%endfor
%endif
## End Data Manager Tools
</div>
<div>&nbsp;</div>
%for section_name, module_section in module_sections.items():
%if section_name != "inputs":
${render_module_section(module_section)}
%endif
%endfor
## Feedback when search returns no results.
<div id="search-no-results" style="display: none; padding-top: 5px">
<em><strong>Search did not match any tools.</strong></em>
</div>
## Feedback when search returns no results.
<div id="search-no-results" style="display: none; padding-top: 5px">
<em><strong>Search did not match any tools.</strong></em>
</div>
</div>
</div>
</div>
</%def>
Expand Down

0 comments on commit 43dfc75

Please sign in to comment.