[ARVADOS] created: 09c2c027beb4ac81a07aa94005d87d92389ddd8a

[git at public.curoverse.com]

        at  09c2c027beb4ac81a07aa94005d87d92389ddd8a (commit)


commit 09c2c027beb4ac81a07aa94005d87d92389ddd8a
Author: Phil Hodgson <bitbucket at philhodgson.net>
Date:   Tue Sep 16 13:05:28 2014 -0400

    3634: add gem that handles Bootstrap tab state automagically

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index c7e3870..04043b6 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -48,6 +48,7 @@ end
 gem 'jquery-rails'
 gem 'bootstrap-sass', '~> 3.1.0'
 gem 'bootstrap-x-editable-rails'
+gem 'bootstrap-tab-history-rails'
 
 gem 'less'
 gem 'less-rails'
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 7d98bf1..34d126e 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -51,6 +51,8 @@ GEM
       multi_json (>= 1.0.0)
     bootstrap-sass (3.1.0.1)
       sass (~> 3.2)
+    bootstrap-tab-history-rails (0.1.0)
+      railties (>= 3.1)
     bootstrap-x-editable-rails (1.5.1.1)
       railties (>= 3.0)
     builder (3.2.2)
@@ -231,6 +233,7 @@ DEPENDENCIES
   andand
   arvados (>= 0.1.20140910123800)
   bootstrap-sass (~> 3.1.0)
+  bootstrap-tab-history-rails
   bootstrap-x-editable-rails
   capybara
   coffee-rails
diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index cf0812a..82563b0 100644
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@ -21,6 +21,7 @@
 //= require bootstrap/modal
 //= require bootstrap/button
 //= require bootstrap3-editable/bootstrap-editable
+//= require bootstrap-tab-history
 //= require wiselinks
 //= require_tree .
 
diff --git a/apps/workbench/app/views/application/_content.html.erb b/apps/workbench/app/views/application/_content.html.erb
index 4379758..05e6a01 100644
--- a/apps/workbench/app/views/application/_content.html.erb
+++ b/apps/workbench/app/views/application/_content.html.erb
@@ -4,7 +4,15 @@
 
 <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-pane-content-url="<%= url_for(params.merge(tab_pane: pane)) %>"> <%= pane.gsub('_', ' ') %></a></li>
+    <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">

-----------------------------------------------------------------------


hooks/post-receive
--