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 - Move Service Catalog Search #2154

Merged
merged 1 commit into from
Jan 8, 2020
Merged

KG - Move Service Catalog Search #2154

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
18 changes: 8 additions & 10 deletions app/assets/stylesheets/service_requests.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@
///////////////////////

#serviceCatalogForm {
#serviceQuery {
font-size: 1.15rem;

&~ .tt-menu {
width: 40vw;
}
}

.accordion .btn[data-toggle=collapse], #organizationHeader {
padding: 0.75rem 1.25rem !important; // Match list group item padding from cart
}
Expand All @@ -36,16 +44,6 @@
}

#catalogCenter {
.input-group-icon i {
font-size: 1.75rem;
}

#serviceQuery {
height: 48px;
padding-left: 3.5rem;
font-size: 1.75rem;
}

.service:not(:last-of-type) {
padding-bottom: 0.5rem;
margin-bottom: 0.5rem;
Expand Down
4 changes: 0 additions & 4 deletions app/views/catalogs/_catalog_center.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
-# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

.col-12.col-lg-6.mb-3.mb-lg-0#catalogCenter
.form-group.input-group
%span.input-group-icon
= icon('fas', 'search fa-lg text-muted')
= text_field_tag 'serviceQuery', nil, placeholder: t(:proper)[:catalog][:center][:search_placeholder], class: "form-control form-control-lg"
#welcomeMessage
- if organization
= render 'catalogs/description', organization: organization, service_request: service_request, locked_org_ids: locked_org_ids
Expand Down
9 changes: 5 additions & 4 deletions app/views/catalogs/_service_accordion.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@

.col-12.col-lg-3.pr-lg-0.mb-3.mb-lg-0#serviceCatalog
.card
.card-header.bg-primary.text-white
%h3.mb-0<
= icon('fas', 'book-medical mr-2')
= t(:proper)[:catalog][:accordion][:header]
.card-header.bg-primary.p-2
.form-group.input-group.mb-0
%span.input-group-icon
= icon('fas', 'search fa-lg text-muted')
= text_field_tag 'serviceQuery', nil, placeholder: t(:proper)[:catalog][:accordion][:search_placeholder], class: "form-control form-control-lg"
.card-body
= render 'catalogs/accordion/institutions', institutions: institutions, locked_ids: locked_org_ids ? locked_org_ids : []
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 @@ -37,8 +37,8 @@ en:
catalog:
accordion:
header: "Browse Service Catalog"
search_placeholder: "Search by Name, CPT Code, or EAP ID"
center:
search_placeholder: "Search for services by name, CPT code, or EAP ID"
header: "Welcome to SPARCRequest"
subheader: "Storefront of Research Services"
description: "<b>SPARCRequest</b> (<b>S</b>ervices, <b>P</b>ricing, & <b>A</b>pplication for <b>R</b>esearch <b>C</b>enters) is a web-based research transaction management system that provides a central portal to researchers and their study teams to browse for research services and resources as well as submit service and pricing requests with a focus on billing compliance and proposal/budget development. SPARCRequest is OSS (Open-Source Software) for which MUSC holds the copyright license. SPARCRequest is developed in a collaborative and public manner for easy adoptability and the source code is available to anyone."
Expand Down