[ARVADOS] updated: 8ac0683e65e010d51dfa91edc77000a4f4616646
git at public.curoverse.com
git at public.curoverse.com
Tue May 5 15:27:12 EDT 2015
Summary of changes:
apps/workbench/app/helpers/application_helper.rb | 2 +-
apps/workbench/app/views/projects/_index_jobs_and_pipelines.html.erb | 2 +-
apps/workbench/app/views/projects/_show_contents_rows.html.erb | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
via 8ac0683e65e010d51dfa91edc77000a4f4616646 (commit)
from 6e10831be039fb540fc252d35e0ffe673ea8d398 (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 8ac0683e65e010d51dfa91edc77000a4f4616646
Author: Radhika Chippada <radhika at curoverse.com>
Date: Tue May 5 15:26:07 2015 -0400
5735: move tiptitle into nonhtml_options
diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 572ec5e..14b1c34 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -281,7 +281,7 @@ module ApplicationHelper
edit_tiptitle = 'edit'
edit_tiptitle = 'Warning: do not use hyphens in the repository name as they will be stripped' if (object.class.to_s == 'Repository' and attr == 'name')
- edit_button = raw('<a href="#" class="btn btn-xs btn-' + (nonhtml_options[:btnclass] || 'default') + ' btn-nodecorate" data-toggle="x-editable tooltip" data-toggle-selector="#' + span_id + '" data-placement="top" title="' + (htmloptions[:tiptitle] || edit_tiptitle) + '"><i class="fa fa-fw fa-pencil"></i>' + (nonhtml_options[:btntext] || '') + '</a>')
+ edit_button = raw('<a href="#" class="btn btn-xs btn-' + (nonhtml_options[:btnclass] || 'default') + ' btn-nodecorate" data-toggle="x-editable tooltip" data-toggle-selector="#' + span_id + '" data-placement="top" title="' + (nonhtml_options[:tiptitle] || edit_tiptitle) + '"><i class="fa fa-fw fa-pencil"></i>' + (nonhtml_options[:btntext] || '') + '</a>')
if nonhtml_options[:btnplacement] == :left
edit_button + ' ' + span_tag
diff --git a/apps/workbench/app/views/projects/_index_jobs_and_pipelines.html.erb b/apps/workbench/app/views/projects/_index_jobs_and_pipelines.html.erb
index fb9a305..0469684 100644
--- a/apps/workbench/app/views/projects/_index_jobs_and_pipelines.html.erb
+++ b/apps/workbench/app/views/projects/_index_jobs_and_pipelines.html.erb
@@ -6,7 +6,7 @@
<div class="col-sm-4">
<%= render :partial => "show_object_button", :locals => {object: object, size: 'xs'} %>
<% if object.respond_to?(:name) %>
- <%= render_editable_attribute object, 'name', nil, {tiptitle: 'rename'} %>
+ <%= render_editable_attribute object, 'name', nil, {}, {tiptitle: 'rename'} %>
<% else %>
<%= object.class_for_display %> <%= object.uuid %>
<% end %>
diff --git a/apps/workbench/app/views/projects/_show_contents_rows.html.erb b/apps/workbench/app/views/projects/_show_contents_rows.html.erb
index c8b2e2e..5f0f60b 100644
--- a/apps/workbench/app/views/projects/_show_contents_rows.html.erb
+++ b/apps/workbench/app/views/projects/_show_contents_rows.html.erb
@@ -27,7 +27,7 @@
<td>
<% if object.respond_to?(:name) %>
- <%= render_editable_attribute (name_link || object), 'name', nil, {tiptitle: 'rename'} %>
+ <%= render_editable_attribute (name_link || object), 'name', nil, {}, {tiptitle: 'rename'} %>
<% end %>
</td>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list