[ARVADOS] updated: 1bfa822f0bf0b6ff968e229528057da299414457

Thu Jul 17 21:00:09 EDT 2014

Summary of changes:
 apps/workbench/Gemfile                                | 1 +
 apps/workbench/Gemfile.lock                           | 2 ++
 apps/workbench/app/assets/javascripts/application.js  | 6 ++++++
 apps/workbench/app/views/layouts/application.html.erb | 4 ++--
 apps/workbench/app/views/users/welcome.html.erb       | 2 +-
 5 files changed, 12 insertions(+), 3 deletions(-)

       via  1bfa822f0bf0b6ff968e229528057da299414457 (commit)
      from  b501fc456ccfe1d4b36107b8b10f43c91fa841b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 1bfa822f0bf0b6ff968e229528057da299414457
Author: radhika <radhika at curoverse.com>
Date:   Thu Jul 17 20:50:18 2014 -0400

    3138: add wiselinks gem

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 754d5c6..f428bc2 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -49,6 +49,7 @@ gem 'bootstrap-x-editable-rails'
 
 gem 'less'
 gem 'less-rails'
+gem 'wiselinks'
 
 # To use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 173be13..3c30bc3 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -183,6 +183,7 @@ GEM
       json (>= 1.8.0)
     websocket (1.0.7)
     websocket-driver (0.3.2)
+    wiselinks (1.2.1)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -219,3 +220,4 @@ DEPENDENCIES
   themes_for_rails!
   therubyracer
   uglifier (>= 1.0.3)
+  wiselinks
diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index d21c4b5..0397850 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 wiselinks
 //= require_tree .
 
 jQuery(function($){
@@ -177,4 +178,9 @@ jQuery(function($){
         fixer.duplicateTheadTr();
         fixer.fixThead();
     });
+
+    $(document).ready(function() {
+        window.wiselinks = new Wiselinks($('#top-nav-wrapper'));
+    });
+
 });
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 63de6c2..ad877e7 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -43,7 +43,7 @@
   <link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.css" rel="stylesheet">
 </head>
 <body>
-  <div id="wrapper" class="container-fluid">
+  <div id="top-nav-wrapper" class="container-fluid">
     <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
       <div class="navbar-header">
         <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@@ -149,7 +149,7 @@
             </li>
           <% end %>
           <% else %>
-            <li><a href="<%= arvados_api_client.arvados_login_url(return_to: root_url) %>">Log in</a></li>
+            <li><a href="<%= arvados_api_client.arvados_login_url(return_to: root_url) %>" data-push="true" data-target="#top-nav-wrapper">Log in</a></li>
           <% end %>
 
           <li class="dropdown help-menu">
diff --git a/apps/workbench/app/views/users/welcome.html.erb b/apps/workbench/app/views/users/welcome.html.erb
index 9cacebd..7afddd6 100644
--- a/apps/workbench/app/views/users/welcome.html.erb
+++ b/apps/workbench/app/views/users/welcome.html.erb
@@ -28,7 +28,7 @@
 
       </p>
       <p>
-	<%= link_to arvados_api_client.arvados_login_url(return_to: request.url), class: "pull-right btn btn-primary" do %>
+	<%= link_to arvados_api_client.arvados_login_url(return_to: request.url), class: "pull-right btn btn-primary", :'data-push' => true, :'data-target' => '#top-nav-wrapper' do %>
           Log in to <%= Rails.configuration.site_name %>
           <i class="fa fa-fw fa-arrow-circle-right"></i>
         <% end %>

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


hooks/post-receive
-- 


