[ARVADOS] updated: 4fdfbe8fb9523451b0536042d14c2f229b75c0f3

git at public.curoverse.com git at public.curoverse.com
Fri Jul 25 20:42:31 EDT 2014


Summary of changes:
 .../app/assets/javascripts/application.js          |  22 +-
 apps/workbench/app/assets/javascripts/editable.js  |  11 +-
 apps/workbench/app/assets/javascripts/tab_panes.js |  38 ++
 .../app/assets/stylesheets/application.css.scss    |   5 +
 .../controllers/pipeline_instances_controller.rb   |   3 +-
 .../controllers/pipeline_templates_controller.rb   |   3 +-
 .../app/controllers/projects_controller.rb         |  17 +-
 .../app/helpers/pipeline_components_helper.rb      |  13 +
 .../app/helpers/pipeline_instances_helper.rb       |   4 +
 apps/workbench/app/models/arvados_api_client.rb    |   7 +-
 .../views/application/_pipeline_progress.html.erb  |   2 +-
 .../application/_pipeline_status_label.html.erb    |   2 +-
 apps/workbench/app/views/layouts/body.html.erb     |   4 +-
 .../pipeline_instances/_show_components.html.erb   |  79 +---
 .../_show_components_json.html.erb                 |  16 +
 ....html.erb => _show_components_running.html.erb} |  34 --
 .../views/pipeline_instances/_show_recent.html.erb |   4 +-
 .../pipeline_templates/_show_components.html.erb   |   4 +-
 .../pipeline_instances_controller_test.rb          |   7 +
 .../pipeline_templates_controller_test.rb          |   6 +
 .../test/functional/projects_controller_test.rb    |   7 +-
 .../test/integration/pipeline_instances_test.rb    |  12 +-
 doc/install/index.html.textile.liquid              |   2 +-
 doc/install/install-keep.html.textile.liquid       |  52 +++
 sdk/cli/bin/crunch-job                             |   7 +
 sdk/python/bin/arv-get                             |   2 +-
 services/api/test/fixtures/pipeline_instances.yml  |  22 +-
 services/api/test/fixtures/pipeline_templates.yml  |  21 +
 services/keep/src/keep/{keep.go => handlers.go}    | 283 +-----------
 services/keep/src/keep/keep.go                     | 480 +--------------------
 30 files changed, 297 insertions(+), 872 deletions(-)
 create mode 100644 apps/workbench/app/helpers/pipeline_components_helper.rb
 create mode 100644 apps/workbench/app/views/pipeline_instances/_show_components_json.html.erb
 copy apps/workbench/app/views/pipeline_instances/{_show_components.html.erb => _show_components_running.html.erb} (63%)
 create mode 100644 doc/install/install-keep.html.textile.liquid
 copy services/keep/src/keep/{keep.go => handlers.go} (63%)

       via  4fdfbe8fb9523451b0536042d14c2f229b75c0f3 (commit)
       via  e1526dc915e10012352fdd260f9267d10fbf3542 (commit)
       via  cec86eb60c65a0bc456614e59281ea184485f811 (commit)
       via  f2d60a7dc6767003ad8b821dc8029a7dd54deaac (commit)
       via  d0ab992df96443576bc8f30410940c1acdac827a (commit)
       via  ce8d052472be0cb417596c41f2700cf92a260fd3 (commit)
       via  15c61d99c5a867c6a58ef3eb10cc72d7f9ec5cd8 (commit)
       via  fdc4fd98ee963559ac13e737700a8be1f5c736c7 (commit)
       via  7223231e30b3e0e0b488f8db6d7b1749117a05e9 (commit)
       via  315312d808d6b8144d7638b108c0a02be3c14f46 (commit)
       via  fb77c937ac1e0fe4463cfe48c3b60f8a32e8c128 (commit)
       via  fa3f6860158dda089c0b4b96c346bbc643232421 (commit)
       via  95d963b2d176e0ffe0797541368463fb5deaf3cf (commit)
       via  6a6fe8d14502fb47eb4e6b2c0b1cf6d2cdf7a551 (commit)
      from  c3d4b399c57e711f0cd87c2178f873a688323967 (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 4fdfbe8fb9523451b0536042d14c2f229b75c0f3
Merge: e1526dc cec86eb
Author: radhika <radhika at curoverse.com>
Date:   Fri Jul 25 17:56:51 2014 -0400

    Merge branch 'master' into 3138-wiselinks


commit e1526dc915e10012352fdd260f9267d10fbf3542
Author: radhika <radhika at curoverse.com>
Date:   Fri Jul 25 17:55:41 2014 -0400

    3138: When wiselinks is initialized, selection.js does not work. Since we want to stop using selection.js in the near future, let's not initialize wiselinks object for now.

diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index 3010d5f..2ad7ae5 100644
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@ -180,10 +180,26 @@ jQuery(function($){
     });
 
     $(document).ready(function() {
-        window.wiselinks = new Wiselinks();
+        /* When wiselinks is initialized, selection.js is not working. Since we want to stop
+           using selection.js in the near future, let's not initialize wiselinks for now. */
 
-        $(document).off('page:loading').on('page:loading', function(event, url, target, render) {
-            $("#page-wrapper").hide().fadeIn(200);
+        // window.wiselinks = new Wiselinks();
+
+        $(document).off('page:loading').on('page:loading', function(event, $target, render, url){
+            $("#page-wrapper").fadeOut(200);
+        });
+
+        $(document).off('page:redirected').on('page:redirected', function(event, $target, render, url){
+        });
+
+        $(document).off('page:always').on('page:always', function(event, xhr, settings){
+            $("#page-wrapper").fadeIn(200);
+        });
+
+        $(document).off('page:done').on('page:done', function(event, $target, status, url, data){
+        });
+
+        $(document).off('page:fail').on('page:fail', function(event, $target, status, url, error, code){
         });
     });
 
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 3a8ef11..072eaf5 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" href="/"><%= Rails.configuration.site_name.downcase rescue Rails.application.class.parent_name %></a>
+        <a class="navbar-brand" href="/" data-push=true><%= Rails.configuration.site_name.downcase rescue Rails.application.class.parent_name %></a>
       </div>
 
       <div class="collapse navbar-collapse">
@@ -130,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', :'data-push' => 'true' do %>
+                    <% link_to projects_path, method: 'post', class: 'btn btn-xs btn-default pull-right' do %>
                       <i class="fa fa-plus"></i> New project
                     <% end %>
                   <% end %>

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list