3138: add wiselinks data-push to project link.

diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index a041c0cc6c26366c8ee35b107df3eaaa932e686b..3010d5fafa6d65372aa4afa2a35a706833bc3a3f 100644 (file)
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@ -181,6 +181,10 @@ jQuery(function($){
 
     $(document).ready(function() {
         window.wiselinks = new Wiselinks();
+
+        $(document).off('page:loading').on('page:loading', function(event, url, target, render) {
+            $("#page-wrapper").hide().fadeIn(200);
+        });
     });
 
 });

diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 1c5712d557470589c4945b499260310ac8e99074..3a8ef113b841a41a66649954888f07ca8b792bcc 100644 (file)
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -7,7 +7,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" data-push="true" href="/"><%= Rails.configuration.site_name.downcase rescue Rails.application.class.parent_name %></a>
+        <a class="navbar-brand" href="/"><%= Rails.configuration.site_name.downcase rescue Rails.application.class.parent_name %></a>
       </div>
 
       <div class="collapse navbar-collapse">
@@ -121,7 +121,6 @@
       </div><!-- /.navbar-collapse -->
     </nav>
 
-    <div id="body-wrapper">
     <% if current_user.andand.is_active %>
       <nav class="navbar navbar-default breadcrumbs" role="navigation">
         <ul class="nav navbar-nav navbar-left">
@@ -131,7 +130,7 @@
                     link_to(project_path(pnode[:object].uuid), data: {object_uuid: pnode[:object].uuid, name: 'name'}, &block)
                   end,
                   :top_button => Proc.new do %>
-                    <% link_to projects_path, method: 'post', class: 'btn btn-xs btn-default pull-right' do %>
+                    <% link_to projects_path, method: 'post', class: 'btn btn-xs btn-default pull-right', :'data-push' => 'true' do %>
                       <i class="fa fa-plus"></i> New project
                     <% end %>
                   <% end %>
@@ -152,7 +151,6 @@
     <div id="page-wrapper">
       <%= yield %>
     </div>
-    </div>
   </div>
 
   <%= yield :footer_html %>