[open-ils-commits] [GIT] Evergreen ILS branch master updated. 06e2236835d21f7a02a4cb16cc68b7a72f66f4d2

Evergreen Git git at git.evergreen-ils.org
Thu Aug 6 23:08:17 EDT 2020


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  06e2236835d21f7a02a4cb16cc68b7a72f66f4d2 (commit)
       via  d3fb53991c302e033125de9d8f3db580a70e3ffc (commit)
      from  0ebbd2f4a5ff47f7fc6aa0da97fda5336df5c727 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 06e2236835d21f7a02a4cb16cc68b7a72f66f4d2
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Mon Aug 3 17:14:12 2020 -0400

    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 at equinoxinitiative.org>
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>

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>

commit d3fb53991c302e033125de9d8f3db580a70e3ffc
Author: Terran McCanna <tmccanna at georgialibraries.org>
Date:   Tue Oct 22 16:16:35 2019 -0400

    LP#1839369 Accessibility for Search Box
    
    This adds an accessible label to the Search box on the splash
    page of the staff client as well as to the Angular version of
    the splash page.
    
    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Jane Sandberg <sandbej at linnbenton.edu>

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 612e9060f3..fb6b909eec 100644
--- a/Open-ILS/src/eg2/src/app/staff/splash.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/splash.component.html
@@ -73,7 +73,8 @@
                   [(ngModel)]="catSearchQuery"
                   id='catalog-search-input'
                   (keyup.enter)="searchCatalog()"
-                  i18n-placeholder placeholder="Search for...">
+                  i18n-placeholder placeholder="Search for..."
+                  i18n-aria-label aria-label="Search for...">
                 <span class="input-group-btn">
                   <button class="btn btn-outline-secondary" 
                     (click)="searchCatalog()" type="button" i18n>
diff --git a/Open-ILS/src/templates/staff/t_splash.tt2 b/Open-ILS/src/templates/staff/t_splash.tt2
index 2161e7e090..0e5944ace6 100644
--- a/Open-ILS/src/templates/staff/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/t_splash.tt2
@@ -45,6 +45,7 @@
           <div class="row">
             <div class="col-md-8">
                 <input focus-me="focus_search" 
+                    aria-label="[% l('Search catalog for...') %]"
                     class="form-control" ng-model="cat_query" type="text" 
                     ng-keypress="catalog_search($event)"
                     placeholder="[% l('Search catalog for...') %]"/>

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/eg2/src/app/staff/splash.component.html |  5 +++--
 Open-ILS/src/templates/staff/t_splash.tt2            | 17 +++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list