[ARVADOS] updated: 8d141d95a821f785f6f0619aebd3cf4a1ccdbca3
git at public.curoverse.com
git at public.curoverse.com
Tue Jul 22 12:00:10 EDT 2014
Summary of changes:
apps/workbench/app/assets/javascripts/application.js | 4 ++++
apps/workbench/app/views/layouts/body.html.erb | 6 ++----
2 files changed, 6 insertions(+), 4 deletions(-)
via 8d141d95a821f785f6f0619aebd3cf4a1ccdbca3 (commit)
from 423b74882240aa5fde5ad9bf72c6a89651794882 (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 8d141d95a821f785f6f0619aebd3cf4a1ccdbca3
Author: radhika <radhika at curoverse.com>
Date: Tue Jul 22 11:59:28 2014 -0400
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 a041c0c..3010d5f 100644
--- 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 1c5712d..3a8ef11 100644
--- 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 %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list