[ARVADOS] updated: 0d735490830f2e1924019e23a388eabda59d076c
git at public.curoverse.com
git at public.curoverse.com
Wed Dec 17 09:44:45 EST 2014
Summary of changes:
.../app/assets/stylesheets/application.css.scss | 5 ++
.../views/application/_projects_tree_menu.html.erb | 55 ++++++++++------------
apps/workbench/app/views/layouts/body.html.erb | 11 +++--
3 files changed, 36 insertions(+), 35 deletions(-)
via 0d735490830f2e1924019e23a388eabda59d076c (commit)
via e508f92b8efe56bff8932b46bda4cf0a04d2d3d4 (commit)
from 7b26b999c98fdd0cc29f81cf1e537ae286e81783 (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 0d735490830f2e1924019e23a388eabda59d076c
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Dec 17 09:44:27 2014 -0500
Remove excess heading and divider. No issue #
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index ba138bf..824e370 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -45,15 +45,11 @@
<%= current_user.email %> <span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
- <li role="presentation" class="dropdown-header">
- My account
- </li>
<% if current_user.is_active %>
<li role="menuitem"><a href="/manage_account" role="menuitem"><i class="fa fa-key fa-fw"></i> Manage account</a></li>
<% if Rails.configuration.user_profile_form_fields %>
<li role="menuitem"><a href="/users/<%=current_user.uuid%>/profile" role="menuitem"><i class="fa fa-key fa-fw"></i> Manage profile</a></li>
<% end %>
- <li role="presentation" class="divider"></li>
<% end %>
<li role="menuitem"><a href="<%= logout_path %>" role="menuitem"><i class="fa fa-sign-out fa-fw"></i> Log out</a></li>
<% if current_user.is_active and
commit e508f92b8efe56bff8932b46bda4cf0a04d2d3d4
Author: Tom Clegg <tom at curoverse.com>
Date: Wed Dec 17 09:41:49 2014 -0500
Restore scroll on projects menu. Do not offer "Add project" button in projects dropdown in chooser dialog. closes #4811
diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 51d4702..9bc93e3 100644
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -204,6 +204,11 @@ table.table-fixed-header-row tbody {
top:1.5em;
}
+.dropdown-menu {
+ max-height: 30em;
+ overflow-y: auto;
+}
+
.row-fill-height, .row-fill-height>div[class*='col-'] {
display: flex;
}
diff --git a/apps/workbench/app/views/application/_projects_tree_menu.html.erb b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
index 4a49184..4de3c23 100644
--- a/apps/workbench/app/views/application/_projects_tree_menu.html.erb
+++ b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
@@ -1,30 +1,25 @@
- <li>
- <%= link_to projects_path(options: {ensure_unique_name: true}), method: :post, class: 'btn btn-xs btn-default pull-right' do %>
- <i class="fa fa-plus"></i> Add a new project
- <% end %>
- </li>
- <li>
- <%= project_link_to.call({object: current_user, depth: 0}) do %>
- <span style="padding-left: 0"></span>Home
- <% end %>
- </li>
- <% my_project_tree.each do |pnode| %>
- <% next if pnode[:object].class != Group %>
- <li>
- <%= project_link_to.call pnode do %>
- <span style="padding-left: <%= pnode[:depth] %>em"></span><%= pnode[:object].name %>
- <% end %>
- </li>
- <% end %>
- <li class="divider" />
- <li role="presentation" class="dropdown-header">
- Projects shared with me
- </li>
- <% shared_project_tree.each do |pnode| %>
- <% next if pnode[:object].class != Group %>
- <li>
- <%= project_link_to.call pnode do %>
- <span style="padding-left: <%= pnode[:depth]-1 %>em"></span><i class="fa fa-fw fa-share-alt" style="color:#aaa"></i> <%= pnode[:object].name %>
- <% end %>
- </li>
- <% end %>
+<li>
+ <%= project_link_to.call({object: current_user, depth: 0}) do %>
+ <span style="padding-left: 0">Home</span>
+ <% end %>
+</li>
+<% my_project_tree.each do |pnode| %>
+ <% next if pnode[:object].class != Group %>
+ <li>
+ <%= project_link_to.call pnode do %>
+ <span style="padding-left: <%= pnode[:depth] %>em"></span><%= pnode[:object].name %>
+ <% end %>
+ </li>
+<% end %>
+<li class="divider" />
+<li role="presentation" class="dropdown-header">
+ Projects shared with me
+</li>
+<% shared_project_tree.each do |pnode| %>
+ <% next if pnode[:object].class != Group %>
+ <li>
+ <%= project_link_to.call pnode do %>
+ <span style="padding-left: <%= pnode[:depth]-1 %>em"></span><i class="fa fa-fw fa-share-alt" style="color:#aaa"></i> <%= pnode[:object].name %>
+ <% end %>
+ </li>
+<% end %>
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 07b536b..ba138bf 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -152,7 +152,12 @@
Projects
<span class="caret"></span>
</a>
- <ul class="dropdown-menu" role="menu">
+ <ul class="dropdown-menu" style="min-width: 20em" role="menu">
+ <li>
+ <%= link_to projects_path(options: {ensure_unique_name: true}), method: :post, class: 'btn btn-xs btn-default pull-right' do %>
+ <i class="fa fa-plus"></i> Add a new project
+ <% end %>
+ </li>
<%= render partial: "projects_tree_menu", locals: {
:project_link_to => Proc.new do |pnode, &block|
link_to(project_path(pnode[:object].uuid),
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list