Merge branch 'master' into 3112-report-bug

[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 8a0624b7afc9a7523a716599964e6fbde8a8b8db..437975831a99de6edfd2ce41cc53ad5ed0bee40b 100644 (file)
--- a/apps/workbench/app/views/application/_content.html.erb
+++ b/apps/workbench/app/views/application/_content.html.erb
@@ -1,30 +1,34 @@
 <% content_for :tab_panes do %>
 
 <% comparable = controller.respond_to? :compare %>
-<% pane_list ||= %w(recent) %>
-<% panes = Hash[pane_list.map { |pane|
-     [pane, render(partial: 'show_' + pane.downcase,
-                   locals: { comparable: comparable, objects: @objects })]
-   }.compact] %>
 
 <ul class="nav nav-tabs">
-  <% panes.each_with_index do |(pane, content), i| %>
-    <li class="<%= 'active' if i==0 %>"><a href="#<%= pane %>" data-toggle="tab" id="<%= pane %>-tab"> <%= pane.gsub('_', ' ') %></a></li>
+  <% pane_list.each_with_index do |pane, i| %>
+    <li class="<%= 'active' if i==0 %>"><a href="#<%= pane %>" data-toggle="tab" id="<%= pane %>-tab" data-pane-content-url="<%= url_for(params.merge(tab_pane: pane)) %>"> <%= pane.gsub('_', ' ') %></a></li>
   <% end %>
 </ul>
 <div class="tab-content">
-<% panes.each_with_index do |(pane, content), i| %>
-  <div id="<%= pane %>" class="tab-pane fade <%= 'in active' if i==0 %>">
-    <div class="smart-scroll" style="margin-top:0.5em;">
-      <%= content %>
+<% pane_list.each_with_index do |pane, i| %>
+  <div id="<%= pane %>"
+       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 %>-scroll" style="margin-top:0.5em;">
+      <div class="pane-content">
+        <% if i == 0 %>
+          <%= render_pane pane, to_string: true %>
+        <% else %>
+          <div class="spinner spinner-32px spinner-h-center"></div>
+        <% end %>
+      </div>
     </div>
   </div>
 <% end %>
 </div>
 
 <% end %>
-
-<% content_for :js do %>
-    $(window).on('load', smart_scroll_fixup);
-    $(document).on('shown.bs.tab', 'ul.nav-tabs > li > a', smart_scroll_fixup);
-<% end %>