[ARVADOS] updated: b9e8878717643b05f75aebb628c0a78722aa2f51
git at public.curoverse.com
git at public.curoverse.com
Wed May 21 10:21:37 EDT 2014
Summary of changes:
apps/workbench/Gemfile | 18 ++-
apps/workbench/Gemfile.lock | 147 +++++++++++----------
.../api_client_authorizations.js.coffee | 3 -
.../assets/javascripts/authorized_keys.js.coffee | 3 -
.../app/assets/javascripts/collections.js | 1 -
.../app/assets/javascripts/folders.js.coffee | 3 -
.../app/assets/javascripts/groups.js.coffee | 3 -
.../app/assets/javascripts/humans.js.coffee | 3 -
.../app/assets/javascripts/job_tasks.js.coffee | 3 -
.../app/assets/javascripts/jobs.js.coffee | 3 -
.../app/assets/javascripts/keep_disks.js.coffee | 4 -
.../app/assets/javascripts/links.js.coffee | 3 -
.../app/assets/javascripts/logs.js.coffee | 3 -
.../app/assets/javascripts/nodes.js.coffee | 3 -
.../app/assets/javascripts/pipeline_instances.js | 1 -
.../javascripts/pipeline_templates.js.coffee | 3 -
.../app/assets/javascripts/repositories.js.coffee | 3 -
.../app/assets/javascripts/sessions.js.coffee | 3 -
.../app/assets/javascripts/specimens.js.coffee | 3 -
.../app/assets/javascripts/traits.js.coffee | 3 -
.../assets/javascripts/user_agreements.js.coffee | 3 -
.../app/assets/javascripts/users.js.coffee | 3 -
.../assets/javascripts/virtual_machines.js.coffee | 3 -
.../app/assets/stylesheets/collections.css.scss | 46 +++++++
.../app/controllers/actions_controller.rb | 2 +-
.../app/controllers/application_controller.rb | 4 +-
.../app/controllers/collections_controller.rb | 90 +++++--------
.../app/controllers/sessions_controller.rb | 2 +-
apps/workbench/app/controllers/users_controller.rb | 10 +-
apps/workbench/app/helpers/application_helper.rb | 12 ++
.../app/helpers/arvados_api_client_helper.rb | 13 ++
apps/workbench/app/models/arvados_api_client.rb | 41 ++++--
apps/workbench/app/models/arvados_base.rb | 60 ++++++---
apps/workbench/app/models/arvados_resource_list.rb | 7 +-
apps/workbench/app/models/collection.rb | 4 +-
apps/workbench/app/models/group.rb | 4 +-
apps/workbench/app/models/user.rb | 26 ++--
apps/workbench/app/models/user_agreement.rb | 8 +-
.../app/views/collections/_show_files.html.erb | 62 ++-------
.../app/views/collections/_show_jobs.html.erb | 64 ---------
.../views/collections/_show_provenance.html.erb | 84 ------------
.../views/collections/_show_source_data.html.erb | 44 ------
apps/workbench/app/views/collections/show.html.erb | 105 +++++++++++++++
apps/workbench/app/views/folders/show.html.erb | 60 ++++-----
.../app/views/layouts/application.html.erb | 2 +-
apps/workbench/app/views/links/_recent.html.erb | 2 +-
.../pipeline_instances/_show_components.html.erb | 5 +-
.../app/views/pipeline_instances/show.js.erb | 6 +-
.../workbench/app/views/users/_show_admin.html.erb | 2 +-
apps/workbench/app/views/users/welcome.html.erb | 2 +-
apps/workbench/app/views/websocket/index.html.erb | 2 +-
apps/workbench/config/application.default.yml | 14 +-
apps/workbench/config/application.rb | 15 +--
.../config/environments/development.rb.example | 12 +-
.../config/environments/production.rb.example | 6 +-
apps/workbench/config/environments/test.rb.example | 6 -
.../config/initializers/zzz_arvados_api_client.rb | 8 --
.../zza_load_config.rb => load_config.rb} | 0
apps/workbench/config/routes.rb | 8 +-
.../test/functional/collections_controller_test.rb | 50 ++++++-
apps/workbench/test/integration/users_test.rb | 7 +-
apps/workbench/test/test_helper.rb | 78 ++++++++---
.../install-workbench-app.html.textile.liquid | 11 ++
services/api/app/models/arvados_model.rb | 4 +-
.../20140422011506_pipeline_instance_state.rb | 2 +
services/api/lib/has_uuid.rb | 5 +-
services/api/test/fixtures/jobs.yml | 2 +-
services/api/test/fixtures/logs.yml | 5 +
services/api/test/unit/arvados_model_test.rb | 34 +++++
services/fuse/arvados_fuse/__init__.py | 27 ++--
services/fuse/bin/arv-mount | 4 +-
71 files changed, 657 insertions(+), 635 deletions(-)
delete mode 100644 apps/workbench/app/assets/javascripts/api_client_authorizations.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/authorized_keys.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/folders.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/groups.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/humans.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/job_tasks.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/jobs.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/links.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/logs.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/nodes.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/pipeline_templates.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/repositories.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/sessions.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/specimens.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/traits.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/user_agreements.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/users.js.coffee
delete mode 100644 apps/workbench/app/assets/javascripts/virtual_machines.js.coffee
create mode 100644 apps/workbench/app/helpers/arvados_api_client_helper.rb
delete mode 100644 apps/workbench/app/views/collections/_show_jobs.html.erb
delete mode 100644 apps/workbench/app/views/collections/_show_provenance.html.erb
delete mode 100644 apps/workbench/app/views/collections/_show_source_data.html.erb
create mode 100644 apps/workbench/app/views/collections/show.html.erb
delete mode 100644 apps/workbench/config/initializers/zzz_arvados_api_client.rb
rename apps/workbench/config/{initializers/zza_load_config.rb => load_config.rb} (100%)
create mode 100644 services/api/test/unit/arvados_model_test.rb
via b9e8878717643b05f75aebb628c0a78722aa2f51 (commit)
via 9e49f83657327527b8bff8a35e77d40ad718fce0 (commit)
via dc47da9fd90b7d078afb4ab8fe18539c111d9ccc (commit)
via e195a00c614f4ad9c2f32c9d3c814f851006f931 (commit)
via 2768b056f5d99952d2d2c4ba8cd1dfbb898901e3 (commit)
via c965f26c02b0f358eccf6989e49703d173206486 (commit)
via f1a04b3e3c61cc92501d18863ccf0abb162f9855 (commit)
via 6d1b822d5a168166deb44d4256bf0abcfd618c67 (commit)
via 9cdf7a2f51489403a488c3d06cf252a36b8e4198 (commit)
via c3367d7b827035d0cfc3418bc028a67142696e13 (commit)
via 7ed1dcf8b0bfa8fc78f228a07b2318094b68abea (commit)
via 5da718633e3663073a624db78274cd69e5dfe6e0 (commit)
via 90744f405977dcfac40d5dea3dbe79391080b80d (commit)
via 471cc718e0cf5a1846feb444887c35c285f33cdf (commit)
via 043002e8d0dfd2a5dbb3cfc135ac21732c199c05 (commit)
via 278fe7048f9035b350a60e032432c9119f151add (commit)
via 7a873b4adfd0a7f94a4e7dfa64eb088caece46df (commit)
via 7b4d7faff279490a40190208bd571a86090e2bf5 (commit)
via 83c873af757aea4217648cc5a909fcadcf3e93e4 (commit)
via 949c388c5ec3bc4f8cc6b3d503c11dcd20e5bbd4 (commit)
via 03395937ba05b9e3192e346a355c691f45cc7c85 (commit)
via cff5301bbc1e1c8f8421fb56dca5a76dfebb058c (commit)
via 2d9f17f33a9d8737d97705b8b77e3e1c05f7b411 (commit)
via 67176a2637ca895015908c7c3bdb1ab7688c1b2c (commit)
via a797b27604a0f5a277d73e2d3522dec033fd4ecf (commit)
via 6ebfb077cbe7357aadccc7ae4f803c61d66d0279 (commit)
via a792aabc3159439c66098935fea2da685eee7ed2 (commit)
via 7ec5dedd6301ae84db941de986f2f0eacc4532e7 (commit)
via 130bd6ec07cf6844861e49602d33b07dd2402595 (commit)
via a46e35694b573fd5c9b355c51323992670fc87b4 (commit)
via 93842871ab5266e45fb6a29da89462af102a6384 (commit)
via 85ab544a82c685a74d814a0e10c48624810be0af (commit)
via bfa9ee952c1ae3f03fe2f9fa781a132411963030 (commit)
via ce5b843c32f6ee74f02a40044073dd4288d16dee (commit)
via fba37ca64631be9e0bdfd17ca70d85dd2c896bfa (commit)
via 647c8b8c47ef521046bea7675af84b621c235e0f (commit)
via 6f6235983d91e0b9fb5660d0a2825f510bbdac73 (commit)
via 54897c8f978f127a44c0a9d20c1e87cea840b21f (commit)
from 15623104e6ac96b9ed0955f62d85e5b798d3f143 (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 b9e8878717643b05f75aebb628c0a78722aa2f51
Author: Brett Smith <brett at curoverse.com>
Date: Wed May 21 10:19:55 2014 -0400
2753: Move file tree CSS to collections.css.
diff --git a/apps/workbench/app/assets/stylesheets/collections.css.scss b/apps/workbench/app/assets/stylesheets/collections.css.scss
index 24b08fa..0c3c396 100644
--- a/apps/workbench/app/assets/stylesheets/collections.css.scss
+++ b/apps/workbench/app/assets/stylesheets/collections.css.scss
@@ -1,3 +1,49 @@
+/* Style for _show_files tree view. */
+
+ul#collection_files {
+ padding-left: 0;
+}
+
+ul.collection_files {
+ line-height: 2.5em;
+ list-style-type: none;
+ padding-left: 2.3em;
+}
+
+ul.collection_files li {
+ clear: both;
+}
+
+.collection_files_row {
+ padding: 1px; /* Replaced by border for :hover */
+}
+
+.collection_files_row:hover {
+ background-color: #D9EDF7;
+ padding: 0px;
+ border: 1px solid #BCE8F1;
+ border-radius: 3px;
+}
+
+.collection_files_inline {
+ clear: both;
+ width: 80%;
+ height: auto;
+ max-height: 6em;
+ margin: 0 1em;
+}
+
+.collection_files_name {
+ padding-left: .5em;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+.collection_files_name i.fa-fw:first-child {
+ width: 1.6em;
+}
+
/*
"active" and "inactive" colors are too similar for a toggle switch
in the default bootstrap theme.
diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index fbd8c4b..38c5d00 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -1,49 +1,3 @@
-<% content_for :css do %>
-ul#collection_files {
- padding-left: 0;
-}
-
-ul.collection_files {
- line-height: 2.5em;
- list-style-type: none;
- padding-left: 2.3em;
-}
-
-ul.collection_files li {
- clear: both;
-}
-
-.collection_files_row {
- padding: 1px; /* Replaced by border for :hover */
-}
-
-.collection_files_row:hover {
- background-color: #D9EDF7;
- padding: 0px;
- border: 1px solid #BCE8F1;
- border-radius: 3px;
-}
-
-.collection_files_inline {
- clear: both;
- width: 80%;
- height: auto;
- max-height: 6em;
- margin: 0 1em;
-}
-
-.collection_files_name {
- padding-left: .5em;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
-}
-
-.collection_files_name i.fa-fw:first-child {
- width: 1.6em;
-}
-<% end %>
-
<% content_for :tab_line_buttons do %>
<div class="row">
<div class="col-md-6"></div>
commit 9e49f83657327527b8bff8a35e77d40ad718fce0
Author: Brett Smith <brett at curoverse.com>
Date: Wed May 21 10:17:29 2014 -0400
2753: Refactor Collection view to use library CSS.
diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index cbdbef6..fbd8c4b 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -39,14 +39,8 @@ ul.collection_files li {
text-overflow: ellipsis;
}
-.collection_files_name i.fa {
- display: block-inline;
- width: 1.75em;
- text-align: center;
-}
-
-.collection_files_buttons {
- float: right;
+.collection_files_name i.fa-fw:first-child {
+ width: 1.6em;
}
<% end %>
@@ -77,14 +71,14 @@ ul.collection_files li {
<% if size.nil? # This is a subdirectory. %>
<% dirstack.push(File.join(dirname, filename)) %>
<div class="collection_files_row">
- <div class="collection_files_name"><i class="fa fa-folder-open"></i> <%= filename %></div>
+ <div class="collection_files_name"><i class="fa fa-fw fa-folder-open"></i> <%= filename %></div>
</div>
<ul class="collection_files">
<% else %>
<% link_params = {controller: 'collections', action: 'show_file',
uuid: @object.uuid, file: file_path, size: size} %>
<div class="collection_files_row">
- <div class="collection_files_buttons">
+ <div class="collection_files_buttons pull-right">
<%= raw(human_readable_bytes_html(size)) %>
<%= check_box_tag 'uuids[]', "#{@object.uuid}/#{file_path}", false, {
:class => 'persistent-selection',
@@ -102,7 +96,7 @@ ul.collection_files li {
{title: "Download #{file_path}", class: "btn btn-info btn-sm"}) %>
</div>
<% if CollectionsHelper::is_image(filename) %>
- <div class="collection_files_name"><i class="fa fa-bar-chart-o"></i> <%= filename %></div>
+ <div class="collection_files_name"><i class="fa fa-fw fa-bar-chart-o"></i> <%= filename %></div>
</div>
<div class="collection_files_inline">
<%= link_to(image_tag("#{url_for @object}/#{file_path}"),
@@ -110,7 +104,7 @@ ul.collection_files li {
{title: file_path}) %>
</div>
<% else %>
- <div class="collection_files_name"><i class="fa fa-file"></i> <%= filename %></div>
+ <div class="collection_files_name"><i class="fa fa-fw fa-file"></i> <%= filename %></div>
</div>
<% end %>
</li>
commit dc47da9fd90b7d078afb4ab8fe18539c111d9ccc
Author: Brett Smith <brett at curoverse.com>
Date: Wed May 21 10:07:28 2014 -0400
2753: Replace Workbench file tree backgrounds with hover effect.
Based on feedback from Tom in refs #2753. I'm still concerned about
users being able to line up buttons with filenames, so the highlight
on :hover is intended to help with that.
diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index 4cc262e..cbdbef6 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -1,20 +1,27 @@
<% content_for :css do %>
+ul#collection_files {
+ padding-left: 0;
+}
+
ul.collection_files {
line-height: 2.5em;
list-style-type: none;
- background: #FFF;
+ padding-left: 2.3em;
}
ul.collection_files li {
clear: both;
}
-li.collection_files_row_even {
- background: #FFF;
+.collection_files_row {
+ padding: 1px; /* Replaced by border for :hover */
}
-li.collection_files_row_odd {
- background: #EEE;
+.collection_files_row:hover {
+ background-color: #D9EDF7;
+ padding: 0px;
+ border: 1px solid #BCE8F1;
+ border-radius: 3px;
}
.collection_files_inline {
@@ -66,14 +73,17 @@ li.collection_files_row_odd {
<% while dirstack.any? and (dirstack.last != dirname) %>
<% dirstack.pop %></ul></li>
<% end %>
- <li class="collection_files_row_<%= (index.odd?) ? 'odd' : 'even' %>">
+ <li>
<% if size.nil? # This is a subdirectory. %>
<% dirstack.push(File.join(dirname, filename)) %>
- <div class="collection_files_name"><i class="fa fa-folder-open"></i> <%= filename %></div>
- <ul class="collection_files">
+ <div class="collection_files_row">
+ <div class="collection_files_name"><i class="fa fa-folder-open"></i> <%= filename %></div>
+ </div>
+ <ul class="collection_files">
<% else %>
<% link_params = {controller: 'collections', action: 'show_file',
uuid: @object.uuid, file: file_path, size: size} %>
+ <div class="collection_files_row">
<div class="collection_files_buttons">
<%= raw(human_readable_bytes_html(size)) %>
<%= check_box_tag 'uuids[]', "#{@object.uuid}/#{file_path}", false, {
@@ -93,6 +103,7 @@ li.collection_files_row_odd {
</div>
<% if CollectionsHelper::is_image(filename) %>
<div class="collection_files_name"><i class="fa fa-bar-chart-o"></i> <%= filename %></div>
+ </div>
<div class="collection_files_inline">
<%= link_to(image_tag("#{url_for @object}/#{file_path}"),
link_params.merge(disposition: 'inline'),
@@ -100,6 +111,7 @@ li.collection_files_row_odd {
</div>
<% else %>
<div class="collection_files_name"><i class="fa fa-file"></i> <%= filename %></div>
+ </div>
<% end %>
</li>
<% end # if file or directory %>
commit e195a00c614f4ad9c2f32c9d3c814f851006f931
Merge: 1562310 2768b05
Author: Brett Smith <brett at curoverse.com>
Date: Wed May 21 09:10:29 2014 -0400
Merge branch 'master' into 2753-collection-tree-view-2-wip
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list