Diff
Modified: branches/galaxy-integration/app/views/layouts/_galaxy.html.erb (2963 => 2964)
--- branches/galaxy-integration/app/views/layouts/_galaxy.html.erb 2012-03-07 10:22:53 UTC (rev 2963)
+++ branches/galaxy-integration/app/views/layouts/_galaxy.html.erb 2012-03-07 10:25:57 UTC (rev 2964)
@@ -27,6 +27,7 @@
float: left;
padding: 3px 10px;
line-height: 27px;
+ position: absolute;
}
#galaxy_header a { text-decoration: none; color: #EEEEEE;}
@@ -61,8 +62,6 @@
}
</style>
-<% galaxy_filter = 'TYPE_ID("7")' %>
-
<div id="galaxy_header">
<div id="galaxy_inner_header">
<div id="galaxy_logo">
@@ -73,7 +72,7 @@
</div>
<ul>
<li><a href="" session[:galaxy_url] -%>">Return to Galaxy</a></li>
- <li <%='class="selected"'if (params[:filter] && params[:filter].include?(galaxy_filter)) -%>><%= link_to 'Galaxy Workflows', workflows_url(:filter => galaxy_filter) -%></li>
+ <li <%='class="selected"' if request.fullpath.start_with?('/galaxy') -%>><%= link_to 'Galaxy Workflows', '/galaxy' -%></li>
</ul>
</div>
</div>
Modified: branches/galaxy-integration/app/views/workflows/galaxy/_run_options.rhtml (2963 => 2964)
--- branches/galaxy-integration/app/views/workflows/galaxy/_run_options.rhtml 2012-03-07 10:22:53 UTC (rev 2963)
+++ branches/galaxy-integration/app/views/workflows/galaxy/_run_options.rhtml 2012-03-07 10:25:57 UTC (rev 2964)
@@ -1,8 +1,27 @@
<% if using_galaxy? %>
- <div style="margin: 0 0.5em; text-align: center">
- <form action="" session[:galaxy_url] -%>/workflow/import_workflow" method="POST" name="import_workflow">
+ <style type="text/css">
+ div.galaxy_import_form {
+ margin: 0 0.5em;
+ text-align: center;
+ border: 1px solid #D8B365;
+ font-family: Verdana, sans-serif;
+ padding-bottom: 0.5em;
+ }
+
+ div.galaxy_import_form div.header {
+ background-color: #EBD9B2;
+ border-bottom: 1px solid #D8B365;
+ font-weight: bold;
+ padding: 5px 10px;
+ color: #303030;
+ margin-bottom: 0.5em;
+ }
+ </style>
+ <div class="galaxy_import_form">
+ <div class="header">Import this workflow into Galaxy</div>
+ <form action="" session[:galaxy_url].chomp("/") -%>/workflow/import_workflow" method="POST" name="import_workflow">
<input type="hidden" name="url" value="<%= download_workflow_url(@workflow, :disposition => :inline) -%>"/>
- <input type="submit" value="Import into Galaxy" name="import_button"/>
+ <input type="submit" value="Import" name="import_button"/>
</form>
</div>
<% end %>
Modified: branches/galaxy-integration/config/routes.rb (2963 => 2964)
--- branches/galaxy-integration/config/routes.rb 2012-03-07 10:22:53 UTC (rev 2963)
+++ branches/galaxy-integration/config/routes.rb 2012-03-07 10:25:57 UTC (rev 2964)
@@ -286,6 +286,8 @@
map.resources :licenses
map.resources :license_attributes
+ map.connect 'galaxy', :controller => 'workflows', :action ="" 'index', :filter => 'TYPE_ID("7")'
+
# Install the default route as the lowest priority.
map.connect ':controller/:action/:id'
end