From 713ca093d8c1f053dd6ce3017e580ff18e1b96f6 Mon Sep 17 00:00:00 2001
From: Kathy Lussier <klussier@masslnc.org>
Date: Mon, 27 Aug 2018 16:15:31 -0400
Subject: [PATCH] LP#1776020: Tweaks to display of name keywords

Add an icon next to the primary name to indicate the presence of name keywords,
which can be seen via hovering. The name keywords continue to display at the
bottom of the patron summary sidebar.

Also fixes a minor bug where preferred name would display for anyone with
a middle name.

Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 Open-ILS/src/templates/staff/circ/patron/index.tt2     | 1 +
 Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 | 7 +------
 Open-ILS/src/templates/staff/css/circ.css.tt2          | 7 +++++++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2
index dc9c1b2147..6724ca45d2 100644
--- a/Open-ILS/src/templates/staff/circ/patron/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2
@@ -101,6 +101,7 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
                 '{{patron().family_name()}}',
                 '{{patron().first_given_name()}}',
                 '{{patron().second_given_name()}}') %]
+               <span ng-if="patron().name_keywords()"> <a title="[% l('Name keywords: ') %]{{patron().name_keywords()}}" class="glyphicon glyphicon-tags"></a>
           </div>
 
           <p ng-show="patron().notes().length > 0"><a class='patron-summary-has-notes' href="./circ/patron/{{patron().id()}}/notes"><span class="label label-warning">Notes &nbsp;{{patron().notes().length}}</span></a></p>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
index cf0bc4eb91..c50ff0d6c8 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
@@ -2,7 +2,7 @@
 <div ng-cloak class="patron-summary-grid-wrapper">
   <div ng-show="patron()" id="patron-summary-grid">
     <div class="row patron-summary-pref-name"
-      ng-if="patron().pref_family_name() || patron().pref_first_given_name() || patron().second_given_name()">
+      ng-if="patron().pref_family_name() || patron().pref_first_given_name() || patron().pref_second_given_name()">
       <div class="col-md-12">
         [% l('[_1], [_2] [_3] (Preferred)', 
           '{{patron().pref_family_name() || patron().family_name()}}',
@@ -11,11 +11,6 @@
         %]
       </div>
     </div>
-    <div ng-if="patron().name_keywords()" class="row patron-summary-pref-name">
-      <div class="col-md-12">
-        <a title="{{patron().name_keywords()}}">[% l('Name Keywords') %]</a>
-      </div>
-    </div>
     <div class="row" 
       ng-class="{'patron-summary-divider' : !$index}"
       ng-repeat="penalty in alert_penalties()">
diff --git a/Open-ILS/src/templates/staff/css/circ.css.tt2 b/Open-ILS/src/templates/staff/css/circ.css.tt2
index f0d29c28f4..cbbf509133 100644
--- a/Open-ILS/src/templates/staff/css/circ.css.tt2
+++ b/Open-ILS/src/templates/staff/css/circ.css.tt2
@@ -22,6 +22,13 @@ but the ones I'm finding aren't quite cutting it..*/
   color: #5cb85c;
 }
 
+/* Tag icon used for name keywords shouldn't look like a link */
+
+.glyphicon-tags, .glyphicon-tags:hover, .glyphicon-tags:focus {
+  color: #333;
+  text-decoration: none;
+}
+
 /* FIXME: use .barcode instead */
 #patron-checkout-barcode,
 #patron-renewal-barcode,
-- 
2.11.0