[ARVADOS] created: d95bc29acd07b2bb1a47d0de819ae2879cd91009
git at public.curoverse.com
git at public.curoverse.com
Sun Aug 24 16:24:25 EDT 2014
at d95bc29acd07b2bb1a47d0de819ae2879cd91009 (commit)
commit d95bc29acd07b2bb1a47d0de819ae2879cd91009
Author: Tom Clegg <tom at curoverse.com>
Date: Sun Aug 24 16:24:11 2014 -0400
3627: Add hover highlight to Home project on dashboard.
diff --git a/apps/workbench/app/views/projects/_index_projects.html.erb b/apps/workbench/app/views/projects/_index_projects.html.erb
index 027dc29..50d38fe 100644
--- a/apps/workbench/app/views/projects/_index_projects.html.erb
+++ b/apps/workbench/app/views/projects/_index_projects.html.erb
@@ -2,10 +2,10 @@
<% tree.each do |projectnode| %>
<% rowtype = projectnode[:object].class %>
<% next if rowtype != Group and !show_root_node %>
- <div class="<%= 'project' if rowtype == Group %> row">
+ <div class="<%= 'project' if rowtype.in?([Group,User]) %> row">
<div class="col-md-4" style="padding-left: <%= projectnode[:depth] - (show_root_node ? 0 : 1) %>em;">
<% if show_root_node and rowtype == String %>
- <i class="fa fa-fw fa-folder-open-o"></i>
+ <i class="fa fa-fw fa-share-alt"></i>
<%= projectnode[:object] %>
<% elsif show_root_node and rowtype == User %>
<% if projectnode[:object].uuid == current_user.andand.uuid %>
commit f45666bea5f997e974333a588def7df50a03a90d
Author: Tom Clegg <tom at curoverse.com>
Date: Sun Aug 24 16:19:27 2014 -0400
3627: Really make Home project selectable in project chooser.
diff --git a/apps/workbench/app/views/projects/_choose.html.erb b/apps/workbench/app/views/projects/_choose.html.erb
index d4b12a2..c0759ed 100644
--- a/apps/workbench/app/views/projects/_choose.html.erb
+++ b/apps/workbench/app/views/projects/_choose.html.erb
@@ -24,6 +24,7 @@
row_selectable = !params[:editable] || projectnode[:object].editable?
if projectnode[:object].uuid == current_user.uuid
row_name = "Home"
+ row_selectable = true
else
row_name = projectnode[:object].friendly_link_name || 'New project'
end %>
commit 12d4dfd41760188fea509e678a72bb78af3e7c33
Author: Tom Clegg <tom at curoverse.com>
Date: Sun Aug 24 16:11:00 2014 -0400
3627: More consistent icons/headings in projects dropdown and chooser.
diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 5c99c15..4463260 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -730,7 +730,7 @@ class ApplicationController < ActionController::Base
@my_project_tree =
sorted_paths.call buildtree.call(children_of, 'me')
@shared_project_tree =
- sorted_paths.call({'Shared with me' =>
+ sorted_paths.call({'Projects shared with me' =>
buildtree.call(children_of, false)})
end
diff --git a/apps/workbench/app/views/projects/_choose.html.erb b/apps/workbench/app/views/projects/_choose.html.erb
index e5bd9e9..d4b12a2 100644
--- a/apps/workbench/app/views/projects/_choose.html.erb
+++ b/apps/workbench/app/views/projects/_choose.html.erb
@@ -17,7 +17,7 @@
<% tree.each do |projectnode| %>
<% if projectnode[:object].is_a? String %>
<div class="row" style="padding-left: <%= 1 + projectnode[:depth] %>em; margin-right: 0px">
- <i class="fa fa-fw fa-folder-open-o"></i>
+ <i class="fa fa-fw fa-share-alt"></i>
<%= projectnode[:object] %>
</div>
<% else
commit 0b7ca85a3b7037bdc2d1a1f65c67196d2719deca
Author: Tom Clegg <tom at curoverse.com>
Date: Sun Aug 24 16:10:21 2014 -0400
3627: Grey out unselectable projects in chooser.
diff --git a/apps/workbench/app/assets/stylesheets/select_modal.css.scss b/apps/workbench/app/assets/stylesheets/select_modal.css.scss
index 4295f30..425793a 100644
--- a/apps/workbench/app/assets/stylesheets/select_modal.css.scss
+++ b/apps/workbench/app/assets/stylesheets/select_modal.css.scss
@@ -2,6 +2,10 @@
padding-top: 5px;
padding-bottom: 5px;
padding-right: 1em;
+ color: #888;
+}
+.selectable-container > .row.selectable {
+ color: #000;
}
.selectable.active, .selectable:hover {
background: #d9edf7;
commit 4dc0af33b57ffe9f55f43ce1df69fd05f36b3995
Author: Tom Clegg <tom at curoverse.com>
Date: Sun Aug 24 14:57:25 2014 -0400
3627: "My Projects" is now called "Home" and is always selectable in choosers.
diff --git a/apps/workbench/app/views/collections/show.html.erb b/apps/workbench/app/views/collections/show.html.erb
index 7d8ac4d..94b099a 100644
--- a/apps/workbench/app/views/collections/show.html.erb
+++ b/apps/workbench/app/views/collections/show.html.erb
@@ -2,7 +2,6 @@
<%= link_to(
choose_projects_path(
title: 'Copy to project...',
- my_root_selectable: true,
action_name: 'Copy',
action_href: actions_path,
action_method: 'post',
diff --git a/apps/workbench/app/views/projects/_choose.html.erb b/apps/workbench/app/views/projects/_choose.html.erb
index 82b9485..e5bd9e9 100644
--- a/apps/workbench/app/views/projects/_choose.html.erb
+++ b/apps/workbench/app/views/projects/_choose.html.erb
@@ -22,17 +22,14 @@
</div>
<% else
row_selectable = !params[:editable] || projectnode[:object].editable?
- folder_class = "fa-folder-o"
if projectnode[:object].uuid == current_user.uuid
- row_name = "My Projects"
- row_selectable &&= params[:my_root_selectable]
- folder_class = "fa-folder-open-o" if not row_selectable
+ row_name = "Home"
else
row_name = projectnode[:object].friendly_link_name || 'New project'
end %>
<div class="<%= 'selectable project' if row_selectable %> row"
style="padding-left: <%= 1 + projectnode[:depth] %>em; margin-right: 0px" data-object-uuid="<%= projectnode[:object].uuid %>">
- <i class="fa fa-fw <%= folder_class %>"></i> <%= row_name %>
+ <i class="fa fa-fw fa-folder-o"></i> <%= row_name %>
</div>
<% end %>
<% end %>
diff --git a/apps/workbench/app/views/projects/show.html.erb b/apps/workbench/app/views/projects/show.html.erb
index c221ca1..9a7b1b4 100644
--- a/apps/workbench/app/views/projects/show.html.erb
+++ b/apps/workbench/app/views/projects/show.html.erb
@@ -44,7 +44,6 @@
choose_projects_path(
title: 'Move this project to...',
editable: true,
- my_root_selectable: true,
action_name: 'Move',
action_href: project_path(@object.uuid),
action_method: 'put',
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list