From 06e2236835d21f7a02a4cb16cc68b7a72f66f4d2 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Mon, 3 Aug 2020 17:14:12 -0400
Subject: [PATCH] LP#1839369: (follow-up) tweak button and styles

- Change the button text from "Search" to "Search Catalog"
- adjust the styling on the AngularJS side to cuddle the
  button with the search input
- standardize the placeholder text as "Search for..."

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
---
 Open-ILS/src/eg2/src/app/staff/splash.component.html |  2 +-
 Open-ILS/src/templates/staff/t_splash.tt2            | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/splash.component.html b/Open-ILS/src/eg2/src/app/staff/splash.component.html
index fb6b909eec..450a3e5916 100644
--- a/Open-ILS/src/eg2/src/app/staff/splash.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/splash.component.html
@@ -78,7 +78,7 @@
                 <span class="input-group-btn">
                   <button class="btn btn-outline-secondary" 
                     (click)="searchCatalog()" type="button" i18n>
-                    Search
+                    Search Catalog
                   </button>
                 </span>
                   <!--
diff --git a/Open-ILS/src/templates/staff/t_splash.tt2 b/Open-ILS/src/templates/staff/t_splash.tt2
index 0e5944ace6..598f9ff95b 100644
--- a/Open-ILS/src/templates/staff/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/t_splash.tt2
@@ -42,18 +42,18 @@
           <h2 class="panel-title text-center">[% l('Item Search and Cataloging') %]</h2>
         </div>
         <div class="panel-body">
-          <div class="row">
-            <div class="col-md-8">
+          <div>
+            <div class="input-group">
                 <input focus-me="focus_search" 
-                    aria-label="[% l('Search catalog for...') %]"
+                    aria-label="[% l('Search for...') %]"
                     class="form-control" ng-model="cat_query" type="text" 
                     ng-keypress="catalog_search($event)"
-                    placeholder="[% l('Search catalog for...') %]"/>
-            </div>
-            <div class="col-md-4">
-                <button class='btn btn-default' ng-click="catalog_search()">
-                    [% l('Search') %]
-                </button>
+                    placeholder="[% l('Search for...') %]"/>
+                <span class="input-group-btn">
+                    <button class='btn btn-default' ng-click="catalog_search()">
+                        [% l('Search Catalog') %]
+                    </button>
+                </span>
             </div>
           </div>
           <div>
-- 
2.11.0