Merge branch 'master' into 3634-tab-state

Conflicts:
	apps/workbench/app/views/application/_content.html.erb

diff --cc apps/workbench/Gemfile
Simple merge

diff --cc apps/workbench/Gemfile.lock
index 34d126e2355402d0d6eda96b4428d790bb62d26a,bdf39138819841d4cded1766eb49f70500c56599..17239f6f3299b34ef7a7a4ac72ff191c6649c809
--- 1/apps/workbench/Gemfile.lock
--- 2/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@@ -231,9 -229,8 +231,9 @@@ PLATFORM
  DEPENDENCIES
    RedCloth
    andand
-   arvados (>= 0.1.20140910123800)
+   arvados (>= 0.1.20140917180103)
    bootstrap-sass (~> 3.1.0)
 +  bootstrap-tab-history-rails
    bootstrap-x-editable-rails
    capybara
    coffee-rails

diff --cc apps/workbench/app/views/application/_content.html.erb
index 05e6a0184953f204161045347959826fad621581,8ec92bf16c5f0e54c06edefb53c938e8e92e5231..1fbbbebc554c3ad3401e118903c0bffc960ec9ee
--- 1/apps/workbench/app/views/application/_content.html.erb
--- 2/apps/workbench/app/views/application/_content.html.erb
+++ b/apps/workbench/app/views/application/_content.html.erb
@@@ -1,42 -1,40 +1,44 @@@
  <% content_for :tab_panes do %>
  
- <% comparable = controller.respond_to? :compare %>
+   <% comparable = controller.respond_to? :compare %>
  
- <ul class="nav nav-tabs">
-   <% pane_list.each_with_index do |pane, i| %>
-     <li class="<%= 'active' if i==0 %>">
-       <a href="#<%= pane %>" 
-          data-toggle="tab" 
-          id="<%= pane %>-tab" 
-          data-tab-history=true
-          data-pane-content-url="<%= url_for(params.merge(tab_pane: pane)) %>">
-         <%= pane.gsub('_', ' ') %>
-       </a>
-     </li>
-   <% end %>
- </ul>
- <div class="tab-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 %>
-   >
+   <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" id="<%= pane_name %>-tab" data-pane-content-url="<%= url_for(params.merge(tab_pane: pane_name)) %>">
++        <a href="#<%= pane_name %>"
++           data-toggle="tab"
++           id="<%= pane_name %>-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 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 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 %>
+               <%= render_pane pane_name, to_string: true %>
+             <% else %>
+               <div class="spinner spinner-32px spinner-h-center"></div>
+             <% end %>
+           </div>
+         </div>
        </div>
-     </div>
+     <% end %>
    </div>
- <% end %>
- </div>
  
  <% end %>