Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

KG - [Cloud] Update Homepage Service Provider Contacts #2153

Merged
merged 1 commit into from
Jan 9, 2020
Merged

KG - [Cloud] Update Homepage Service Provider Contacts #2153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions app/helpers/identities_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@

module IdentitiesHelper
def identity_contact(identity)
contact = identity.full_name + link_to("(#{identity.email})", "mailto:#{identity.email}", class: 'ml-1')
contact += content_tag(:span, format_phone(identity.phone), class: 'ml-1') if identity.phone.present?
content_tag :div, class: 'w-100 d-flex flex-wrap' do
contact = content_tag(:span, icon('fas', 'user mr-1') + identity.full_name, class: 'w-100')
contact += content_tag(:span, icon('far', 'envelope mr-1') + link_to(identity.email, "mailto:#{identity.email}"))
contact += content_tag(:span, icon('fas', 'phone mr-1') + format_phone(identity.phone), class: 'ml-3') if identity.phone.present?

raw(contact)
raw(contact)
end
end
end
14 changes: 8 additions & 6 deletions app/views/catalogs/_description.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@
%p.description
= raw(organization.description)
- if organization.type == "Program"
- if identity_signed_in? && @shard != current_user.shard_identifier && organization.primary_contacts.any?
.d-flex.flex-column.mb-3
%span.text-primary.w-100
- if organization.primary_contacts.any? && (!identity_signed_in? || (identity_signed_in? && @shard != current_user.shard_identifier))
.d-flex.flex-wrap.mb-3
%span.font-weight-bold.w-100
= t('proper.catalog.service_provider_text')
- organization.primary_contacts.each do |pc|
%span.w-100
= identity_contact(pc.identity)
.w-100
.row
- organization.primary_contacts.each do |pc|
.col-6
= identity_contact(pc.identity)
- if organization.services.any?
= render 'catalogs/accordion/services', organization: organization, service_request: service_request

Expand Down
2 changes: 1 addition & 1 deletion config/locales/proper.en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ en:
text: "Please contact %{contact_name} at %{contact_info} to make changes to the existing request."
services_missing:
header: "Add Services to Continue"
service_provider_text: "If you would like to learn more about these Services, please contact one of the Service Providers listed below:"
service_provider_text: "To learn more about these Services, please contact one of the Service Providers listed below:"

############
# PROTOCOL #
Expand Down