Skip to content

Commit

Permalink
Merge pull request #60 from bmic-development/ml-add_missing_tooltips
Browse files Browse the repository at this point in the history
Ml add missing tooltips
  • Loading branch information
Stuart-Johnson committed Feb 7, 2017
2 parents c279d6d + f492e19 commit c420892
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
.col-lg-10
= pr_form.text_field :identity_id, placeholder: t(:constants)[:prompts][:search_for_user], class: 'form-control rm-id-dependent'
%label#primary_pi_name.hidden
%a.btn.btn-xs.btn-danger.glyphicon.glyphicon-remove#user-select-clear-icon{ href: "javascript:void(0);", style: 'display: none; vertical-align: middle;' }
%a.btn.btn-xs.btn-danger.glyphicon.glyphicon-remove#user-select-clear-icon{ href: "javascript:void(0);", style: 'display: none; vertical-align: middle;', data: { toggle: "tooltip", animation: 'false', placement: 'right'}, title: "Remove" }
= pr_form.hidden_field :identity_id
= pr_form.hidden_field :role
= pr_form.hidden_field :project_rights
2 changes: 1 addition & 1 deletion app/views/protocols/form/_project_roles_fields.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
.col-lg-10
= pr_form.text_field :identity_id, placeholder: t(:constants)[:prompts][:search_for_user], class: 'form-control rm-id-dependent'
%label#primary_pi_name.hidden
%a.btn.btn-xs.btn-danger.glyphicon.glyphicon-remove#user-select-clear-icon{ href: "javascript:void(0);", style: 'display: none; vertical-align: middle;' }
%a.btn.btn-xs.btn-danger.glyphicon.glyphicon-remove#user-select-clear-icon{ href: "javascript:void(0);", style: 'display: none; vertical-align: middle;', data: { toggle: "tooltip", animation: 'false', placement: 'right'}, title: "Remove" }
= pr_form.hidden_field :identity_id
= pr_form.hidden_field :role
= pr_form.hidden_field :project_rights
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
= li.service.cpt_code? ? " (#{li.service.cpt_code})" : ""
.col-sm-3
- if sub_service_request.can_be_edited? && allow_delete && li.optional?
%button.btn.btn-xs.btn-danger.remove-service.pull-right{ type: 'button', data: { id: li.id, srid: service_request.id, editing_ssr: editing_ssr ? 1 : 0, has_fulfillments: li.fulfillments.any? ? 1 : 0, request_submitted: service_request.submitted_at? ? 1 : 0 } }
%button.btn.btn-xs.btn-danger.remove-service.pull-right{ type: 'button', data: { id: li.id, srid: service_request.id, editing_ssr: editing_ssr ? 1 : 0, has_fulfillments: li.fulfillments.any? ? 1 : 0, request_submitted: service_request.submitted_at? ? 1 : 0, toggle: "tooltip", animation: 'false', placement: 'right'}, title: "Remove" }
%span.glyphicon.glyphicon-remove{ aria: { hidden: 'true' } }
4 changes: 2 additions & 2 deletions lib/dashboard/service_calendars.rb
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def self.select_row(line_items_visit, sub_service_request, portal, locked=false)
url += "&sub_service_request_id=#{sub_service_request.id}" if sub_service_request

content_tag(:span, '', class: "glyphicon #{icon} btn btn-xs #{klass} service-calendar-row",
id: "check-all-row-#{line_items_visit.id}", data: { url: url }, disabled: locked)
id: "check-all-row-#{line_items_visit.id}", data: { toggle: "tooltip", animation: 'false', title: "Toggle Row", url: url }, disabled: locked)
end

def self.select_column(visit_group, n, portal, service_request, sub_service_request)
Expand All @@ -163,7 +163,7 @@ def self.select_column(visit_group, n, portal, service_request, sub_service_requ
role: 'button',
class: "btn btn-xs #{klass} service-calendar-column glyphicon #{icon}",
id: "check-all-column-#{n+1}",
data: { url: url })
data: { toggle: "tooltip", animation: 'false', title: "Toggle Column", url: url })
end
end
end

0 comments on commit c420892

Please sign in to comment.