[ARVADOS] updated: 7d12bf89586e96ba827c75fa4bee86cce0fc20cb
git at public.curoverse.com
git at public.curoverse.com
Mon May 4 20:01:22 EDT 2015
Summary of changes:
apps/workbench/app/helpers/application_helper.rb | 2 +-
apps/workbench/app/views/projects/_show_description.html.erb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
via 7d12bf89586e96ba827c75fa4bee86cce0fc20cb (commit)
from cb55d2c0309b899c02f4e8dfc161dc7a60bfa9ef (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 7d12bf89586e96ba827c75fa4bee86cce0fc20cb
Author: Radhika Chippada <radhika at curoverse.com>
Date: Mon May 4 19:59:35 2015 -0400
5735: use data- for button text and button class custom attributes.
diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 0db7060..c1b92b4 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -278,7 +278,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-' + (htmloptions[: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>' + (htmloptions[:btntext] || '') + '</a>')
+ edit_button = raw('<a href="#" class="btn btn-xs btn-' + (htmloptions['data-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>' + (htmloptions['data-btntext'] || '') + '</a>')
if htmloptions[:btnplacement] == :left
edit_button + ' ' + span_tag
diff --git a/apps/workbench/app/views/projects/_show_description.html.erb b/apps/workbench/app/views/projects/_show_description.html.erb
index 0ce2408..dbd830b 100644
--- a/apps/workbench/app/views/projects/_show_description.html.erb
+++ b/apps/workbench/app/views/projects/_show_description.html.erb
@@ -1,5 +1,5 @@
<% if @object.respond_to? :description %>
<div class="arv-description-as-subtitle">
- <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "(No description provided)", 'data-toggle' => 'manual', 'data-mode' => 'inline', 'data-rows' => 10, btntext: 'Edit', btnclass: 'primary', btnplacement: :top } %>
+ <%= render_editable_attribute @object, 'description', nil, { 'data-emptytext' => "(No description provided)", 'data-toggle' => 'manual', 'data-mode' => 'inline', 'data-rows' => 10, 'data-btntext' => 'Edit', 'data-btnclass' => 'primary', btnplacement: :top } %>
</div>
<% end %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list