[ARVADOS] updated: 94b28b1ef8ad0131d8d7595b53603afbb3defa38
git at public.curoverse.com
git at public.curoverse.com
Tue Jun 3 09:16:32 EDT 2014
Summary of changes:
.../javascripts/{folders.js => filterable.js} | 22 +--
.../app/assets/javascripts/infinite_scroll.js | 9 +-
.../app/assets/javascripts/pipeline_instances.js | 17 ++
apps/workbench/app/assets/javascripts/selection.js | 44 ++++-
.../app/assets/stylesheets/select_modal.css.scss | 4 +-
.../app/controllers/application_controller.rb | 18 ++
.../app/controllers/folders_controller.rb | 55 +++---
.../controllers/pipeline_instances_controller.rb | 9 +
apps/workbench/app/helpers/application_helper.rb | 7 +-
apps/workbench/app/models/arvados_base.rb | 5 +-
.../app/views/application/_choose.html.erb | 17 +-
.../app/views/application/_content.html.erb | 7 +-
.../app/views/application/_content_layout.html.erb | 5 +-
.../app/views/collections/_choose_rows.html.erb | 6 +-
apps/workbench/app/views/folders/_choose.html.erb | 2 +-
.../folders/_index_jobs_and_pipelines.html.erb | 4 +-
.../app/views/folders/_show_contents.html.erb | 72 +++++---
.../app/views/folders/_show_contents_rows.html.erb | 4 +-
.../app/views/folders/_show_permissions.html.erb | 2 +-
apps/workbench/app/views/folders/index.html.erb | 2 +-
.../{remove_item.js.erb => remove_items.js.erb} | 0
.../app/views/layouts/application.html.erb | 17 +-
.../pipeline_instances/_show_components.html.erb | 202 +++++++++++----------
.../views/pipeline_instances/_show_inputs.html.erb | 10 +-
.../views/pipeline_instances/_show_recent.html.erb | 19 --
.../views/pipeline_templates/_choose_rows.html.erb | 6 +-
apps/workbench/app/views/users/_home.html.erb | 2 +-
apps/workbench/config/routes.rb | 2 +
apps/workbench/test/integration/users_test.rb | 10 +-
.../test/integration/virtual_machines_test.rb | 2 +-
30 files changed, 351 insertions(+), 230 deletions(-)
rename apps/workbench/app/assets/javascripts/{folders.js => filterable.js} (61%)
rename apps/workbench/app/views/folders/{remove_item.js.erb => remove_items.js.erb} (100%)
via 94b28b1ef8ad0131d8d7595b53603afbb3defa38 (commit)
via 2a23c5749fa650a7fc44d7b7ce7d890a61166076 (commit)
via 29487f418ff010e6ed536bc0a4d52997c1d0cd4f (commit)
via 77225263b324d4a75f5f3fae1fd01d244dc4afa1 (commit)
via 1f0868d558a44c6e3ca14240b92848cacd58a866 (commit)
via 747efcd9371118c2db9c265c13ce399fc4b6c96b (commit)
via be778bdec0bb03b08699c6ee1343a0e791f5dfbf (commit)
from d2399e19a0f8745a666db8fc94b1a230a5c31409 (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 94b28b1ef8ad0131d8d7595b53603afbb3defa38
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Jun 3 09:16:15 2014 -0400
save-the-left-nav: fixed @object, left tabs, layout of former tab bar buttons.
diff --git a/apps/workbench/app/views/application/_content.html.erb b/apps/workbench/app/views/application/_content.html.erb
index 0e3fa0b..8709a92 100644
--- a/apps/workbench/app/views/application/_content.html.erb
+++ b/apps/workbench/app/views/application/_content.html.erb
@@ -28,11 +28,6 @@
locals: { comparable: comparable, objects: @objects })]
}.compact] %>
-<ul class="nav nav-tabs">
- <% panes.each_with_index do |(pane, content), i| %>
- <li class="<%= 'active' if i==0 %>"><a href="#<%= pane %>" data-toggle="tab" id="<%= pane %>-tab"> <%= pane.gsub('_', ' ') %></a></li>
- <% end %>
-</ul>
<div class="tab-content">
<% panes.each_with_index do |(pane, content), i| %>
<div id="<%= pane %>" class="tab-pane fade <%= 'in active' if i==0 %>">
diff --git a/apps/workbench/app/views/application/_content_layout.html.erb b/apps/workbench/app/views/application/_content_layout.html.erb
index 426a497..f957dc1 100644
--- a/apps/workbench/app/views/application/_content_layout.html.erb
+++ b/apps/workbench/app/views/application/_content_layout.html.erb
@@ -1,6 +1,7 @@
-<%= content_for :content_top %>
-<br clear="all" />
<div class="pull-right">
<%= content_for :tab_line_buttons %>
</div>
+<%= content_for :content_top %>
+<br clear="all" />
+
<%= content_for :tab_panes %>
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 01cb9e4..8738219 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -32,7 +32,7 @@
height: 100%;
}
- @media (max-width: 979px) { body { padding-top: 0; } }
+ media (max-width: 979px) { body { padding-top: 0; } }
.navbar .nav li.nav-separator > span.glyphicon.glyphicon-arrow-right {
padding-top: 1.25em;
@@ -49,8 +49,6 @@
<body>
<div id="wrapper" class="container-fluid">
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
- <div id="wrapper" class="container-fluid">
- <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
@@ -65,6 +63,7 @@
<% if current_user.andand.is_active %>
<ul class="nav navbar-nav side-nav">
+<% if @object %>
<% comparable = controller.respond_to? :compare %>
<% pane_list ||= controller.show_pane_list %>
<% panes = Hash[pane_list.map { |pane|
@@ -72,13 +71,15 @@
locals: { comparable: comparable, objects: @objects })]
}.compact] %>
-<li class="tabs-left">
- <ul class="nav nav-tabs ">
+<li class="tabs-left" style="width: 100%; border-bottom: 1px solid">
+ <ul class="nav nav-tabs" style="width: 100%">
<% panes.each_with_index do |(pane, content), i| %>
- <li class="<%= 'active' if i==0 %>"><a href="#<%= pane %>" data-toggle="tab" id="<%= pane %>-tab"> <%= pane.gsub('_', ' ') %></a></li>
+ <li class="<%= 'active' if i==0 %>"><a href="#<%= pane %>" data-toggle="tab" id="<%= pane %>-tab"> <%= pane.gsub('_', ' ') %></a></li>
<% end %>
</ul>
</li>
+<% end %>
+
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-lg fa-folder-o fa-fw"></i> My folders <b class="caret"></b></a>
<ul class="dropdown-menu">
commit 2a23c5749fa650a7fc44d7b7ce7d890a61166076
Merge: d2399e1 29487f4
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Tue Jun 3 08:54:15 2014 -0400
Merge branch 'origin-2872-folder-nav' into origin-save-the-left-nav
Conflicts:
apps/workbench/app/views/layouts/application.html.erb
diff --cc apps/workbench/app/views/layouts/application.html.erb
index d9c4903,6359794..01cb9e4
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@@ -51,8 -47,8 +47,10 @@@
<link href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.css" rel="stylesheet">
</head>
<body>
- <div id="wrapper">
+ <div id="wrapper" class="container-fluid">
+ <div class="navbar navbar-default navbar-fixed-top" role="navigation">
++ <div id="wrapper" class="container-fluid">
+ <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list