[ARVADOS] updated: 86f3157d2fa86e6b36c2d112bf2e6598e4c06b6d
git at public.curoverse.com
git at public.curoverse.com
Mon Jul 28 20:30:18 EDT 2014
Summary of changes:
apps/workbench/app/assets/javascripts/select_modal.js | 6 ++++++
apps/workbench/app/views/application/_choose.html.erb | 11 +++++++----
.../app/views/application/_projects_tree_menu.html.erb | 8 ++++----
apps/workbench/app/views/layouts/body.html.erb | 5 ++++-
4 files changed, 21 insertions(+), 9 deletions(-)
via 86f3157d2fa86e6b36c2d112bf2e6598e4c06b6d (commit)
via 751d20c579152596f77b2515c1a14e7ea05a8951 (commit)
from 4ad1947da490a998d68380b1520c4f95b1784676 (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 86f3157d2fa86e6b36c2d112bf2e6598e4c06b6d
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Jul 28 20:30:10 2014 -0400
3235: Fix hover highlighting on projects dropdowns.
diff --git a/apps/workbench/app/assets/javascripts/select_modal.js b/apps/workbench/app/assets/javascripts/select_modal.js
index 38d3592..c1267d1 100644
--- a/apps/workbench/app/assets/javascripts/select_modal.js
+++ b/apps/workbench/app/assets/javascripts/select_modal.js
@@ -82,7 +82,7 @@ $(document).on('click', '.selectable', function() {
$(this).
closest('.dropdown-menu').
prev('button').
- html($(this).html() + ' <span class="caret"></span>');
+ html($(this).text() + ' <span class="caret"></span>');
// Set (or unset) filter params and refresh filterable rows
$($(this).closest('[data-filterable-target]').attr('data-filterable-target')).
data('infinite-content-params', params).
diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index f08c08c..1be7b06 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -22,8 +22,11 @@
<li class="divider" />
<%= render partial: "projects_tree_menu", locals: {
:project_link_to => Proc.new do |pnode, &block|
- link_to "#", {"class" => "chooser-show-project", "data-project-uuid" => pnode[:object].uuid }, &block
- end,
+ link_to "#", {
+ class: "chooser-show-project",
+ data_project_uuid: pnode[:object].uuid,
+ }, &block
+ end,
:top_button => nil
} %>
</ul>
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 3a1aa9e..ee96d27 100644
--- a/apps/workbench/app/views/application/_projects_tree_menu.html.erb
+++ b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
@@ -4,9 +4,9 @@
</li>
<% my_project_tree.each do |pnode| %>
<% next if pnode[:object].class != Group %>
- <li style="padding-left: <%= pnode[:depth]-1 %>em">
+ <li>
<%= project_link_to.call pnode do %>
- <%= pnode[:object].name %>
+ <span style="padding-left: <%= pnode[:depth]-1 %>em"></span><%= pnode[:object].name %>
<% end %>
</li>
<% end %>
@@ -16,9 +16,9 @@
</li>
<% shared_project_tree.each do |pnode| %>
<% next if pnode[:object].class != Group %>
- <li style="padding-left: <%= pnode[:depth]-1 %>em">
+ <li>
<%= project_link_to.call pnode do %>
- <i class="fa fa-fw fa-share-alt" style="color:#aaa"></i> <%= pnode[:object].name %>
+ <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 5d30d39..78a0ebe 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -155,7 +155,10 @@
<ul class="dropdown-menu" role="menu">
<%= render partial: "projects_tree_menu", locals: {
:project_link_to => Proc.new do |pnode, &block|
- link_to(project_path(pnode[:object].uuid), data: {object_uuid: pnode[:object].uuid, name: 'name'}, &block)
+ link_to(project_path(pnode[:object].uuid),
+ data_object_uuid: pnode[:object].uuid,
+ data_name: 'name',
+ &block)
end,
:top_button => Proc.new do %>
<% link_to projects_path, method: 'post', class: 'btn btn-xs btn-default pull-right' do %>
commit 751d20c579152596f77b2515c1a14e7ea05a8951
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Jul 28 20:12:42 2014 -0400
3235: Show selected project in project-filter dropdown title.
diff --git a/apps/workbench/app/assets/javascripts/select_modal.js b/apps/workbench/app/assets/javascripts/select_modal.js
index 7c72323..38d3592 100644
--- a/apps/workbench/app/assets/javascripts/select_modal.js
+++ b/apps/workbench/app/assets/javascripts/select_modal.js
@@ -78,6 +78,12 @@ $(document).on('click', '.selectable', function() {
'=',
$(this).attr('data-project-uuid')])};
}
+ // Use current selection as dropdown button label
+ $(this).
+ closest('.dropdown-menu').
+ prev('button').
+ html($(this).html() + ' <span class="caret"></span>');
+ // Set (or unset) filter params and refresh filterable rows
$($(this).closest('[data-filterable-target]').attr('data-filterable-target')).
data('infinite-content-params', params).
trigger('refresh-content');
diff --git a/apps/workbench/app/views/application/_choose.html.erb b/apps/workbench/app/views/application/_choose.html.erb
index 4ee96df..f08c08c 100644
--- a/apps/workbench/app/views/application/_choose.html.erb
+++ b/apps/workbench/app/views/application/_choose.html.erb
@@ -11,12 +11,12 @@
<% if params[:by_project] != false %>
<div class="input-group-btn" data-filterable-target=".modal.arv-choose .selectable-container">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
- Filter by project <span class="caret"></span>
+ All projects <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li>
<%= link_to '#', class: 'chooser-show-project' do %>
- Remove filter (search all projects)
+ All projects
<% end %>
</li>
<li class="divider" />
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list