projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2756: use meta tag to provide websocket url to event_log js file
[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 e7023643356d467aaf6fc4e840cf00b839d0c14b..8a0624b7afc9a7523a716599964e6fbde8a8b8db 100644
(file)
--- a/
apps/workbench/app/views/application/_content.html.erb
+++ b/
apps/workbench/app/views/application/_content.html.erb
@@
-4,7
+4,7
@@
<% pane_list ||= %w(recent) %>
<% panes = Hash[pane_list.map { |pane|
[pane, render(partial: 'show_' + pane.downcase,
<% pane_list ||= %w(recent) %>
<% panes = Hash[pane_list.map { |pane|
[pane, render(partial: 'show_' + pane.downcase,
- locals: { comparable: comparable })]
+ locals: { comparable: comparable
, objects: @objects
})]
}.compact] %>
<ul class="nav nav-tabs">
}.compact] %>
<ul class="nav nav-tabs">
@@
-15,7
+15,7
@@
<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="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">
+ <div class="smart-scroll"
style="margin-top:0.5em;"
>
<%= content %>
</div>
</div>
<%= content %>
</div>
</div>
@@
-24,3
+24,7
@@
<% end %>
<% 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 %>