[ARVADOS] updated: 419a2af0b5c85c7e6ffc45b18a9fe717570c0de4
git at public.curoverse.com
git at public.curoverse.com
Fri Feb 7 15:57:58 EST 2014
Summary of changes:
.../app/assets/javascripts/application.js | 1 +
.../app/assets/stylesheets/application.css.scss | 2 +-
.../workbench/app/controllers/groups_controller.rb | 3 +-
.../application/_delete_object_button.html.erb | 5 ++
.../app/views/application/_show_recent.html.erb | 6 +--
.../app/views/groups/_show_recent.html.erb | 20 ++++------
.../app/views/layouts/application.html.erb | 42 ++++++++++++++-----
7 files changed, 48 insertions(+), 31 deletions(-)
create mode 100644 apps/workbench/app/views/application/_delete_object_button.html.erb
via 419a2af0b5c85c7e6ffc45b18a9fe717570c0de4 (commit)
via b3f6bcf671f5305d7424423b8f6d87aba5cb46ba (commit)
via a6375dee8141f18593cb8aa4e3bedc47b5f81d78 (commit)
via 0e4203db1f9b8030c0c9b64bf33e41055fa4f5be (commit)
from e9e3b56acfa9024f46b76c51858f8d6fb30f61df (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 419a2af0b5c85c7e6ffc45b18a9fe717570c0de4
Merge: e9e3b56 b3f6bcf
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Feb 7 12:01:00 2014 -0800
Merge branch '1979-workbench-ui-TC'
commit b3f6bcf671f5305d7424423b8f6d87aba5cb46ba
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Feb 7 12:00:36 2014 -0800
Fix top nav behavior when window is narrow.
diff --git a/apps/workbench/app/assets/javascripts/application.js b/apps/workbench/app/assets/javascripts/application.js
index 8cbaed0..4c83198 100644
--- a/apps/workbench/app/assets/javascripts/application.js
+++ b/apps/workbench/app/assets/javascripts/application.js
@@ -17,6 +17,7 @@
//= require bootstrap/tab
//= require bootstrap/tooltip
//= require bootstrap/popover
+//= require bootstrap/collapse
//= require bootstrap3-editable/bootstrap-editable
//= require_tree .
diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index feba5c6..fdc719a 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -79,7 +79,7 @@ form.small-form-margin {
white-space: nowrap;
}
-.navbar .nav li.nav-separator > span {
+.navbar .nav li.nav-separator span {
display: block;
float: none;
color: #bbbbbb;
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 86e8f57..3d5fcfd 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -50,8 +50,17 @@
overflow-y: auto;
}
+ @media (min-width: 768px) {
+ .left-nav {
+ position: fixed;
+ }
+ }
+ @media (max-width: 767px) {
+ .breadcrumbs {
+ display: none;
+ }
+ }
.arvados-nav-container {
- position: fixed;
top: 70px;
height: calc(100% - 70px);
overflow: auto;
@@ -69,8 +78,18 @@
<div class="navbar navbar-default navbar-fixed-top">
<div class="container-fluid">
- <ul class="nav navbar-nav navbar-left">
- <li><a class="navbar-brand" href="/"><%= Rails.configuration.site_name rescue Rails.application.class.parent_name %></a></li>
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#workbench-navbar.navbar-collapse">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="/"><%= Rails.configuration.site_name rescue Rails.application.class.parent_name %></a>
+ </div>
+
+ <div class="collapse navbar-collapse" id="workbench-navbar">
+ <ul class="nav navbar-nav navbar-left breadcrumbs">
<% if current_user %>
<% if content_for?(:breadcrumbs) %>
<%= yield(:breadcrumbs) %>
@@ -161,7 +180,8 @@
<li><a href="<%= $arvados_api_client.arvados_login_url(return_to: root_url) %>">Log in</a></li>
<% end -%>
</ul>
- </div>
+ </div><!-- /.navbar-collapse -->
+ </div><!-- /.container-fluid -->
</div>
<div class="container-fluid">
commit a6375dee8141f18593cb8aa4e3bedc47b5f81d78
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Feb 7 11:58:34 2014 -0800
Fill col-sm-3 space with left nav, and move it to the bottom when
window is narrow.
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 5cb6c83..86e8f57 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -165,8 +165,13 @@
</div>
<div class="container-fluid">
- <div class="col-sm-3">
- <div class="left-nav arvados-nav-container">
+ <div class="col-sm-9 col-sm-offset-3">
+ <div id="content">
+ <%= yield %>
+ </div>
+ </div>
+ <div class="col-sm-3 left-nav">
+ <div class="arvados-nav-container">
<% if current_user %>
<div class="well">
<ul class="arvados-nav">
@@ -216,11 +221,6 @@
<% end %>
</div>
</div>
- <div class="col-sm-9 col-sm-offset-3">
- <div id="content">
- <%= yield %>
- </div>
- </div>
</div>
<%= piwik_tracking_tag %>
commit 0e4203db1f9b8030c0c9b64bf33e41055fa4f5be
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Feb 7 06:23:05 2014 -0800
Clean up groups/index and add delete buttons.
diff --git a/apps/workbench/app/controllers/groups_controller.rb b/apps/workbench/app/controllers/groups_controller.rb
index c706c52..b360b19 100644
--- a/apps/workbench/app/controllers/groups_controller.rb
+++ b/apps/workbench/app/controllers/groups_controller.rb
@@ -1,8 +1,7 @@
class GroupsController < ApplicationController
def index
- @groups = Group.limit(10000).all
+ @groups = Group.all
@group_uuids = @groups.collect &:uuid
- @owned_users = User.where owner_uuid: @group_uuids
@links_from = Link.where link_class: 'permission', tail_uuid: @group_uuids
@links_to = Link.where link_class: 'permission', head_uuid: @group_uuids
end
diff --git a/apps/workbench/app/views/application/_delete_object_button.html.erb b/apps/workbench/app/views/application/_delete_object_button.html.erb
new file mode 100644
index 0000000..67a3d06
--- /dev/null
+++ b/apps/workbench/app/views/application/_delete_object_button.html.erb
@@ -0,0 +1,5 @@
+<% if object.editable? %>
+ <%= link_to({action: 'destroy', id: object.uuid}, method: :delete, remote: true, data: {confirm: "You are about to delete #{object.class} #{object.uuid}.\n\nAre you sure?"}) do %>
+ <i class="glyphicon glyphicon-trash"></i>
+ <% end %>
+<% end %>
diff --git a/apps/workbench/app/views/application/_show_recent.html.erb b/apps/workbench/app/views/application/_show_recent.html.erb
index 9028c6a..c58c628 100644
--- a/apps/workbench/app/views/application/_show_recent.html.erb
+++ b/apps/workbench/app/views/application/_show_recent.html.erb
@@ -44,11 +44,7 @@
</td>
<% end %>
<td>
- <% if object.editable? %>
- <%= link_to({action: 'destroy', id: object.uuid}, method: :delete, remote: true, data: {confirm: "You are about to delete #{controller.model_class} #{object.uuid}.\n\nAre you sure?"}) do %>
- <i class="glyphicon glyphicon-trash"></i>
- <% end %>
- <% end %>
+ <%= render partial: 'delete_object_button', locals: {object:object} %>
</td>
</tr>
<% end %>
diff --git a/apps/workbench/app/views/groups/_show_recent.html.erb b/apps/workbench/app/views/groups/_show_recent.html.erb
index 1e81518..117ddb6 100644
--- a/apps/workbench/app/views/groups/_show_recent.html.erb
+++ b/apps/workbench/app/views/groups/_show_recent.html.erb
@@ -2,17 +2,15 @@
<thead>
<tr class="contain-align-left">
<th>
- id
+ Group
</th><th>
- name
+ Owner
</th><th>
- owner
+ Incoming permissions
</th><th>
- incoming permissions
+ Outgoing permissions
</th><th>
- outgoing permissions
- </th><th>
- owned
+ <!-- column for delete buttons -->
</th>
</tr>
</thead>
@@ -22,17 +20,15 @@
<tr>
<td>
- <%= link_to_if_arvados_object g %>
- </td><td>
- <%= g.name %>
+ <%= g.friendly_link_name %>
</td><td>
- <%= g.owner_uuid %>
+ <%= link_to_if_arvados_object g.owner_uuid, friendly_name: true %>
</td><td>
<%= @links_to.select { |x| x.head_uuid == g.uuid }.collect(&:tail_uuid).uniq.count %>
</td><td>
<%= @links_from.select { |x| x.tail_uuid == g.uuid }.collect(&:head_uuid).uniq.count %>
</td><td>
- <%= @owned_users.select { |x| x.owner_uuid == g.uuid }.count %> users<br />
+ <%= render partial: 'delete_object_button', locals: {object:g} %>
</td>
</tr>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list