Merge branch 'master' into 3634-tab-state

[arvados.git] / apps / workbench / app / views / application / _content.html.erb

diff --git a/apps/workbench/app/views/application/_content.html.erb b/apps/workbench/app/views/application/_content.html.erb
index e37225ce80c6082fe13e40367282f710795508af..c1cdd8a44c4f8c36f70b1c65041159263067b12a 100644 (file)
--- a/apps/workbench/app/views/application/_content.html.erb
+++ b/apps/workbench/app/views/application/_content.html.erb
@@ -2,30 +2,33 @@
 
   <% comparable = controller.respond_to? :compare %>
 
-<ul class="nav nav-tabs" data-tab-counts-url="<%= url_for(action: :tab_counts) rescue '' %>">
-  <% pane_list.each_with_index do |pane, i| %>
-    <% pane_name = (pane.is_a?(Hash) ? pane[:name] : pane) %>
-    <li class="<%= 'active' if i==0 %>">
-      <a href="#<%= pane_name %>" data-toggle="tab"
-         class="pane-anchor"
-         id="<%= pane_name %>-tab"
-         data-pane-content-url="<%= url_for(params.merge(tab_pane: pane)) %>">
-        <%= pane_name.gsub('_', ' ') %> <span id="<%= pane_name %>-count"></span>
-      </a>
-    </li>
-  <% end %>
-</ul>
-<div class="tab-content">
-<% pane_list.each_with_index do |pane, i| %>
+  <ul class="nav nav-tabs" data-tab-counts-url="<%= url_for(action: :tab_counts) rescue '' %>">
+    <% pane_list.each_with_index do |pane, i| %>
       <% pane_name = (pane.is_a?(Hash) ? pane[:name] : pane) %>
-  <div id="<%= pane_name %>"
-       class="tab-pane fade <%= 'in active loaded' if i==0 %> arv-log-event-listener"
-<% if controller.action_name == "index" %>
-       data-object-kind="arvados#<%= ArvadosApiClient.class_kind controller.model_class %>"
-<% else %>
-       data-object-uuid="<%= @object.uuid %>"
-<% end %>
-  >
+      <li class="<%= 'active' if i==0 %>">
+        <a href="#<%= pane_name %>"
+           class="pane-anchor"
+           id="<%= pane_name %>-tab"
+           data-toggle="tab"
+           data-tab-history=true
+           data-pane-content-url="<%= url_for(params.merge(tab_pane: pane_name)) %>">
+          <%= pane_name.gsub('_', ' ') %> <span id="<%= pane_name %>-count"></span>
+        </a>
+      </li>
+    <% end %>
+  </ul>
+
+  <div class="tab-content">
+    <% pane_list.each_with_index do |pane, i| %>
+      <% pane_name = (pane.is_a?(Hash) ? pane[:name] : pane) %>
+      <div id="<%= pane_name %>"
+           class="tab-pane fade <%= 'in active loaded' if i==0 %> arv-log-event-listener"
+           <% if controller.action_name == "index" %>
+             data-object-kind="arvados#<%= ArvadosApiClient.class_kind controller.model_class %>"
+           <% else %>
+             data-object-uuid="<%= @object.uuid %>"
+           <% end %>
+      >
         <div id="<%= pane_name %>-scroll" style="margin-top:0.5em;">
           <div class="pane-content">
             <% if i == 0 %>