From 9a99e5201d8857e94716c972c622bc9fedaedae7 Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Thu, 19 Nov 2020 18:18:13 -0500
Subject: [PATCH] OPAC: More small changes to Bootstrap OPAC layout

- Add glyph icons to menus
- Use preferred name instead of first name
- Change some glyphs in the copy table

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
---
 .../src/templates-bootstrap/opac/parts/footer.tt2  |  4 +--
 .../opac/parts/record/copy_table.tt2               |  6 ++--
 .../opac/parts/topnav_links.tt2                    | 33 ++++++++++------------
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2
index 96bc57c79e..33fd2d780c 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2
@@ -10,8 +10,8 @@
     <div class="row w-100">
         <div class="col-12">
             <ul class="navbar-nav">
-                <li class="nav-item"><a class="nav-link" href="http://pines.georgialibraries.org/about" target="_blank">[% l('Learn More About PINES') %]</a></li>
-                <li class="nav-item"><a class="nav-link" href="https://my.nicheacademy.com/pines/course/15006" target="_blank">[% l('How to Use the PINES Catalog') %]</a></li>
+                <li class="nav-item"><a class="nav-link" href="http://pines.georgialibraries.org/about" target="_blank"><i class="fas fa-info-circle" style="color:#8DC641;" aria-hidden="true"></i> [% l('Learn More About PINES') %]</a></li>
+                <li class="nav-item"><a class="nav-link" href="https://my.nicheacademy.com/pines/course/15006" target="_blank"><i class="fas fa-graduation-cap" style="color:#8DC641;" aria-hidden="true"></i>[% l('How to Use the PINES Catalog') %]</a></li>
             </ul>
         </div>
     </div>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2
index 4f2680aeba..a35873640c 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2
@@ -37,7 +37,7 @@ IF has_copies or ctx.foreign_copies;
             <th scope='col' style="vertical-align:top;">[% l("Issue Label") %]</th>
             [%- ELSE -%]
             <th scope='col' style="vertical-align:top;">[% l("Library System: Library Branch Name") %]<a href="#" title="" data-toggle="tooltip" data-original-title="Click a library name on the list below to see that library's location and hours."><i class="fas fa-question-circle" aria-hidden="true"></i></a><br/>
-                <div style="font-style:italic;font-weight:normal;padding-left:10px;"><a href="http://pines.georgialibraries.org/pinesLocator/locator.html" target="_blank">Find your nearest library</a><a href="#" title="" data-toggle="tooltip" data-original-title="Use this library map to identify which libraries are close to you."><i class="fas fa-question-circle" aria-hidden="true"></i></a></div></th>
+                <div style="font-style:italic;font-weight:normal;padding-left:10px;"><a href="#" title="" data-toggle="tooltip" data-original-title="Use this library map to identify which libraries are close to you."><i class="fas fa-map-marker-alt" aria-hidden="true"></i></a> <a href="http://pines.georgialibraries.org/pinesLocator/locator.html" target="_blank">Find your nearest library</a></div></th>
             [%- END %]
             <th scope='col' style="vertical-align:top;">[% l("Call Number / Copy Notes") %]<a href="#" title="" data-toggle="tooltip" data-original-title="Use the call number to locate the item on the shelf."><i class="fas fa-question-circle" aria-hidden="true"></i></a></th>
             [%- IF has_parts == 'true' %]
@@ -104,8 +104,8 @@ END; # FOREACH bib
                 <meta property="price" content="0.00">
             </td>[% END %]
             <td><span property="sku">[% callnum | html %]</span> [% IF ctx.get_org_setting(CGI.param('loc')
-                OR ctx.aou_tree.id, 'sms.enable') == 1 %]<br/><i><a href="[% mkurl(ctx.opac_root _ '/sms_cn',
-               {copy_id => copy_info.id}) %];rec=[%- ctx.bre_id -%]" rel="nofollow" vocab="">[% l('Send Text') %]</a></i><a href="#" title="" data-toggle="tooltip" data-original-title="Send this call number to yourself as an SMS text message."><i class="fas fa-question-circle" aria-hidden="true"></i></a>[% END %]</td>
+                OR ctx.aou_tree.id, 'sms.enable') == 1 %]<br/><a href="#" title="" data-toggle="tooltip" data-original-title="Send this call number to yourself as an SMS text message."><i class="fas fa-paper-plane" aria-hidden="true" style="color:#5781AB;"></i></a> <i><a href="[% mkurl(ctx.opac_root _ '/sms_cn',
+               {copy_id => copy_info.id}) %];rec=[%- ctx.bre_id -%]" rel="nofollow" vocab="">[% l('Send Text') %]</a></i>[% END %]</td>
             [%- IF has_parts == 'true' %]
             <td>[% copy_info.part_label | html %]</td>
             [%- END %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2
index ed30b4df45..ecaf0bfad1 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2
@@ -8,21 +8,21 @@
   <!--Left Links-->
 
 
-    <ul class="navbar-nav nav-fl px-3">
+   <ul class="navbar-nav nav-fl px-3">
       <li class="nav-item">
-        <a class="nav-link" href="http://pines.georgialibraries.org/pinesLocator/locator.html" target="_blank"><img src="/images/pines-dot.png" alt="" style="height:12px;border:0px;" aria-hidden="true"> [% l('Library Locations') %]</a>
+        <a class="nav-link" href="http://pines.georgialibraries.org/pinesLocator/locator.html" target="_blank"><i class="fas fa-map-marker-alt" style="color:#8DC641;" aria-hidden="true"></i> [% l('Library Locations') %]</a>
       </li>
       <li class="nav-item">
-        <a class="nav-link" href="https://pines.georgialibraries.org/app" target="_blank"><img src="/images/pines-dot.png" alt="" style="height:12px;border:0px;" aria-hidden="true"> [% l('Download the PINES App') %]</a>
+        <a class="nav-link" href="https://pines.georgialibraries.org/app" target="_blank"><i class="fas fa-mobile-alt" style="color:#8DC641;" aria-hidden="true"></i> [% l('Download the PINES App') %]</a>
       </li>
       <li class="nav-item">
-        <a class="nav-link" href="https://gapines.org/eg/kpac/home"><img src="/images/pines-dot.png" alt="" style="height:12px;border:0px;" aria-hidden="true"> [% l('Kids\' Catalog') %]</a>
+        <a class="nav-link" href="https://gapines.org/eg/kpac/home"><i class="fas fa-child" style="color:#8DC641;" aria-hidden="true"></i> [% l('Kids\' Catalog') %]</a>
       </li>
       <li class="nav-item">
-        <a class="nav-link" href="https://gapines.org/eg/opac/galileo"><img src="/images/pines-dot.png" alt="" style="height:12px;border:0px;" aria-hidden="true"> [% l('GALILEO Virtual Library') %]</a>
+        <a class="nav-link" href="https://gapines.org/eg/opac/galileo"><i class="fas fa-globe-americas" style="color:#8DC641;" aria-hidden="true"></i> [% l('GALILEO Virtual Library') %]</a>
       </li>
       [% IF ctx.get_org_setting(ctx.physical_loc || ctx.aou_tree.id,  'opac.allow_pending_user') && !ctx.user %]
-        <li class="nav-item"><a class="nav-link" href="[% mkurl(ctx.opac_root _ '/register') %]"><img src="/images/pines-dot.png" alt="" style="height:12px;border:0px;" aria-hidden="true"> [% l('Apply for a PINES Library Card') %]</a></li>
+        <li class="nav-item"><a class="nav-link" href="[% mkurl(ctx.opac_root _ '/register') %]"><i class="fas fa-id-card" style="color:#8DC641;" aria-hidden="true"></i> [% l('Apply for a PINES Library Card') %]</a></li>
       [% END %]
     </ul>
     <!--Right Links-->
@@ -33,15 +33,16 @@
            [% IF ctx.page != 'login' %]
            <a href="#loginModal" data-toggle="modal" data-target="#loginModal" class="nav-link login">
            [% ELSE %] <a href="/eg/opac/login" class="nav-link login">
-            [% END %] [% l('My Account') %] </a>
+            [% END %]<i class="fas fa-user" style="color:#8DC641;" aria-hidden="true"></i> [% l('My Account') %] </a>
         </li>
       <!--User is signed in-->
     [% ELSE %]
     <li><div class="dropdown-divider"></div></li>
-     	<!--User-->
-      	<li class="nav-item">
-        	<a class="nav-link disabled active mx-2" href="#">Hello, [%  l('[_1] [_2]', ctx.user.first_given_name, ctx.user.family_name) | html %]</a>
-      	</li>
+        <!--My Account-->
+        <li class="nav-item">
+         <a class="nav-link" href="[% mkurl(ctx.opac_root _ '/myopac/main', {}, ['single', 'message_id', 'sort','sort_type']) %]"> <i class="fas fa-user" style="color:#8DC641;" aria-hidden="true"></i> [% l('My Account') %] ([% ctx.user.pref_first_given_name || ctx.user.first_given_name %])</a>
+        </li>
+
     	<!--Messages with sup tag for # of messages-->
       	<li class="nav-item">
           <a class="nav-link  [% IF ctx.user_stats.messages.unread %] active [% END %]" href="[% mkurl(ctx.opac_root _ '/myopac/messages', {}, ['single', 'message_id']) %]">
@@ -51,20 +52,16 @@
                               <span class="sr-only">[% l('unread') %]</span>
                           </span>
                       [% END %]
-                      [% l('Messages') %]
+                      <i class="fas fa-envelope" style="color:#8DC641;" aria-hidden="true"></i> [% l('Messages') %]
             </a>
         </li>
-        <!--My Account-->
-        <li class="nav-item">
-         <a class="nav-link" href="[% mkurl(ctx.opac_root _ '/myopac/main', {}, ['single', 'message_id', 'sort','sort_type']) %]">[% l('My Account') %]</a>
-        </li>
         <!--Lists Link-->
         <li class="nav-item">
-        <a class="nav-link" href="[% mkurl(ctx.opac_root _ '/myopac/lists', {}, ['single', 'message_id']) %]">[% l('My Lists') %]</a>
+        <a class="nav-link" href="[% mkurl(ctx.opac_root _ '/myopac/lists', {}, ['single', 'message_id']) %]"><i class="fas fa-list" style="color:#8DC641;" aria-hidden="true"></i> [% l('My Lists') %]</a>
         </li>
         <!--Logout-->
         <li class="nav-item">
-        <a class="nav-link" href="[% mkurl(ctx.opac_root _ '/logout', {}, 1) %]" id="logout_link">[% l('Logout') %]</a>
+        <a class="nav-link" href="[% mkurl(ctx.opac_root _ '/logout', {}, 1) %]" id="logout_link"><i class="fas fa-sign-out-alt" style="color:#8DC641;" aria-hidden="true"></i> [% l('Logout') %]</a>
         </li>
       [% END %]
       <!--must end ul and div no matter the user state-->
-- 
2.11.0