[ARVADOS] updated: 05e8f8b3b2f18bab495af9b40df54126a41d963f

git at public.curoverse.com git at public.curoverse.com
Mon Jul 21 11:18:12 EDT 2014


Summary of changes:
 .../app/controllers/application_controller.rb      |  2 +-
 .../app/views/layouts/application.html.erb         |  4 +-
 apps/workbench/app/views/users/welcome.html.erb    |  2 +-
 sdk/python/.gitignore                              |  1 +
 sdk/python/MANIFEST.in                             |  1 +
 sdk/python/README.rst                              | 63 ++++++++++++++++++++++
 sdk/python/requirements.txt                        |  6 ---
 sdk/python/setup.py                                |  9 ++++
 sdk/python/{arvados/commands => tests}/__init__.py |  0
 sdk/python/tests/test_arv_put.py                   | 54 ++++++++++---------
 services/fuse/MANIFEST.in                          |  1 +
 services/fuse/README.rst                           | 62 +++++++++++++++++++++
 services/fuse/readme.llfuse                        |  1 -
 services/fuse/requirements.txt                     |  3 --
 services/fuse/setup.py                             |  9 +++-
 .../commands => services/fuse/tests}/__init__.py   |  0
 16 files changed, 177 insertions(+), 41 deletions(-)
 create mode 100644 sdk/python/MANIFEST.in
 create mode 100644 sdk/python/README.rst
 delete mode 100644 sdk/python/requirements.txt
 copy sdk/python/{arvados/commands => tests}/__init__.py (100%)
 create mode 100644 services/fuse/MANIFEST.in
 create mode 100644 services/fuse/README.rst
 delete mode 100644 services/fuse/readme.llfuse
 delete mode 100644 services/fuse/requirements.txt
 copy {sdk/python/arvados/commands => services/fuse/tests}/__init__.py (100%)

       via  05e8f8b3b2f18bab495af9b40df54126a41d963f (commit)
       via  2369ce76e5c4d7797da2845f0574b56fc7709033 (commit)
       via  6d3186381b3e6f4735892e4d8198ae4d0ca32cf5 (commit)
       via  a7a6110f549ae87f6397b53c6d0292bb0cc2ce04 (commit)
       via  2815aa511233f674009587bc1a896720a27b008c (commit)
       via  028d44becf330be95a1d9f44e6c929b983bef30c (commit)
       via  e16c1ecc8097fd586e86fc90206836000b5f5004 (commit)
       via  688c0eec8c0af1a18a581b3d8725ec88d39682f2 (commit)
       via  533d3511169d756e3148632d24756c13879a0701 (commit)
       via  6850ef5b2e9b65cf6fd1658817c788c3abaebef6 (commit)
       via  87368d7ec97e940dd468a433afed0c6b65f30a4e (commit)
      from  1bfa822f0bf0b6ff968e229528057da299414457 (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 05e8f8b3b2f18bab495af9b40df54126a41d963f
Author: radhika <radhika at curoverse.com>
Date:   Mon Jul 21 11:17:50 2014 -0400

    3138: wiselinks data-push still not working.

diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index ad877e7..c850326 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -52,7 +52,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" data-push="true" data-target="#top-nav-wrapper" href="/"><%= Rails.configuration.site_name.downcase rescue Rails.application.class.parent_name %></a>
       </div>
 
       <div class="collapse navbar-collapse">
@@ -149,7 +149,7 @@
             </li>
           <% end %>
           <% else %>
-            <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>
+            <li><a href="<%= arvados_api_client.arvados_login_url(return_to: root_url) %>">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 7afddd6..9cacebd 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", :'data-push' => true, :'data-target' => '#top-nav-wrapper' do %>
+	<%= link_to arvados_api_client.arvados_login_url(return_to: request.url), class: "pull-right btn btn-primary" do %>
           Log in to <%= Rails.configuration.site_name %>
           <i class="fa fa-fw fa-arrow-circle-right"></i>
         <% end %>

commit 2369ce76e5c4d7797da2845f0574b56fc7709033
Merge: 1bfa822 6d31863
Author: radhika <radhika at curoverse.com>
Date:   Fri Jul 18 15:50:41 2014 -0400

    Merge branch 'master' into 3138-wiselinks


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list