Merge pull request #2154 from sparc-request/kg-move_service_catalog_s…

…earch KG - Move Service Catalog Search
sparc-request · Jan 8, 2020 · 3ee5ea5 · 3ee5ea5
2 parents 6835337 + 967f9f1
commit 3ee5ea5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 19 deletions.
diff --git a/app/assets/stylesheets/service_requests.scss b/app/assets/stylesheets/service_requests.scss
@@ -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
   }
@@ -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;

diff --git a/app/views/catalogs/_catalog_center.html.haml b/app/views/catalogs/_catalog_center.html.haml
@@ -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

diff --git a/app/views/catalogs/_service_accordion.html.haml b/app/views/catalogs/_service_accordion.html.haml
@@ -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 : []
diff --git a/config/locales/proper.en.yml b/config/locales/proper.en.yml
@@ -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."