Merge pull request #101 from mlorb/ml_sci_388

change position of overview and samples [SCI-388]
This commit is contained in:
mlorb 2016-08-25 13:02:20 +02:00 committed by GitHub
commit 4c0765a47e

View file

@ -99,14 +99,6 @@
<% end %>
<% elsif experiment_page? %>
<% if can_view_experiment_samples(@experiment) then %>
<li id="experiment-samples-nav-tab" class="<%= "active" if is_experiment_samples? %>">
<a href="<%= samples_experiment_url(@experiment) %>" title="<%=t "nav2.projects.samples" %>">
<span class="hidden-sm hidden-md"><%=t "nav2.projects.samples" %></span>
<span class="hidden-xs hidden-lg glyphicon glyphicon-tint"></span>
</a>
</li>
<% end %>
<% if can_view_experiment(@experiment) then %>
<li id="canvas-nav-tab" class="<%= "active" if is_experiment_canvas? %>">
<a href="<%= canvas_experiment_url(@experiment) %>" title="<%=t "nav2.experiments.canvas" %>">
@ -115,6 +107,14 @@
</a>
</li>
<% end %>
<% if can_view_experiment_samples(@experiment) then %>
<li id="experiment-samples-nav-tab" class="<%= "active" if is_experiment_samples? %>">
<a href="<%= samples_experiment_url(@experiment) %>" title="<%=t "nav2.projects.samples" %>">
<span class="hidden-sm hidden-md"><%=t "nav2.projects.samples" %></span>
<span class="hidden-xs hidden-lg glyphicon glyphicon-tint"></span>
</a>
</li>
<% end %>
<% if can_view_reports(@experiment.project) then %>
<li id="reports-nav-tab" class="<%= "active" if is_project_reports? %>">
<a href="<%= project_reports_url(@experiment.project) %>" title="<%=t "nav2.projects.reports" %>">