From 97221be6bc08e82bb76763753823dec6469f8615 Mon Sep 17 00:00:00 2001
From: Chris Burton <cburton@nflibrary.ca>
Date: Fri, 25 Sep 2020 07:59:47 -0400
Subject: [PATCH] LP1895398 Bootstrap OPAC Follow Up - Changes implemented for
 stability of the Bootstrap OPAC

---
 .../src/templates-bootstrap/opac/myopac/holds.tt2  |  4 +-
 .../src/templates-bootstrap/opac/myopac/lists.tt2  |  4 +-
 .../src/templates-bootstrap/opac/myopac/prefs.tt2  | 10 ++-
 .../opac/myopac/prefs_my_lists.tt2                 |  4 +-
 .../opac/parts/advanced/search.tt2                 | 17 ++++-
 .../templates-bootstrap/opac/parts/anon_list.tt2   | 10 +--
 .../templates-bootstrap/opac/parts/cart_nav.tt2    | 18 +++---
 .../opac/parts/check_value_selector.tt2            | 13 +---
 .../src/templates-bootstrap/opac/parts/footer.tt2  | 53 ++++++++--------
 Open-ILS/src/templates-bootstrap/opac/parts/js.tt2 |  3 +-
 .../templates-bootstrap/opac/parts/login/form.tt2  | 10 +--
 .../opac/parts/login/login_modal.tt2               | 12 ++--
 .../templates-bootstrap/opac/parts/myopac/base.tt2 |  6 +-
 .../opac/parts/pref_locale_picker.tt2              | 42 +++++++++----
 .../opac/parts/record/summary.tt2                  | 72 +++++++++++-----------
 .../opac/parts/result/table.tt2                    | 42 ++++++-------
 .../templates-bootstrap/opac/parts/searchbar.tt2   |  2 +-
 .../opac/parts/topnav_links.tt2                    |  1 -
 .../opac/parts/topnav_subnav.tt2                   |  1 +
 19 files changed, 176 insertions(+), 148 deletions(-)

diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
index d8314aa4b7..f95d9ae19e 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
@@ -33,9 +33,9 @@
                     <strong>[% l("Show all holds") %]</strong> |
                     <a href="[% mkurl('holds',{available => 1},['limit','offset']) %]">[% l("Show only available holds") %]</a>
                     [% END -%]
-                     <span title="This option will show all items available for pickup." data-toggle="tooltip">
+                     <a href="#" title="This option will show all items available for pickup." data-toggle="tooltip">
                         <i class="fas fa-question-circle" aria-hidden="true"></i>
-                    </span>
+                    </a>
                </p>
 
           </div>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
index d4dcbdf1fa..a4e8d7ea29 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
@@ -53,9 +53,9 @@
                         <option value="0">[% l('No') %]
                         <option value="1">[% l('Yes') %]
                     </select>
-                    <span title="Allows the list to be shared through a link or RSS." data-toggle="tooltip">
+                    <a href="#" title="Allows the list to be shared through a link or RSS." data-toggle="tooltip">
                         <i class="fas fa-question-circle" aria-hidden="true"></i>
-                    </span>
+                    </a>
                 </td>
             </tr>
             [% IF ctx.mylist.size %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
index 52375d6d7d..d0aa7645ef 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
@@ -152,11 +152,8 @@
                 </td>
                 <td></td>
             </tr>
-            <tr>
-                <td colspan="3">
-                 [%- INCLUDE "opac/parts/pref_locale_picker.tt2" %]
-                </td>
-            </tr>
+            
+           
 
         </tbody>
     </table>
@@ -269,6 +266,7 @@
      </div></div>
             [% END %]
 
-
+</div>
+</div>
 
 [% END %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2
index da71d72ae0..ab6cfb4e1a 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs_my_lists.tt2
@@ -53,9 +53,9 @@
                                         selected='selected'[% END %]>[% val | html %]</option>
                             [% END %]
                         </select>
-                       <span title="Change the amount of items shown while viewing a 'My List'." data-toggle="tooltip">
+                       <a href="#" title="Change the amount of items shown while viewing a 'My List'." data-toggle="tooltip">
                         <i class="fas fa-question-circle"></i>
-                    </span>
+                    </a>
                     </td>
                 </tr>
             </tbody>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2
index b766f812cd..4f4ff73aed 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2
@@ -21,7 +21,20 @@
             </table>
         </div>
     </div>
+<div id='adv_search_submit' class="my-3">
+        <input type="hidden" name="_adv" value="1" />
+        <input id="detail" type="hidden" name="detail_record_view"
+               value="[% show_detail_view %]"/>
+        <span>
+            <button id='search-submit-go' type="submit" class="btn btn-confirm"
+                onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'><i class="fas fa-search"></i> [% l("Submit") %]</button>
+            <img id='search-submit-spinner' src='/opac/images/progressbar_green.gif[% ctx.cache_key %]'
+                class='hidden' alt="[% l('Search in progress icon') %]"/>
+        </span>
 
+        <a href="[% mkurl(ctx.opac_root _ '/advanced', {$loc_name => loc_value}, 1) %]"
+            class="btn btn-deny"><i class="fas fa-ban"></i> [% l('Clear Form') %]</a>
+    </div>
     <div class="my-5">
         <h3>Search Filters</h3>
         <div>
@@ -31,13 +44,13 @@
                     <div class="card">
                         <div class="card-header p-0" id="[% adv_chunk.id %]_card">
                         <h4 class="mb-0">
-                            <button type="button" class="btn filter-header w-100 text-left" data-toggle="collapse" data-target="#[% IF adv_chunk.id == 'adv_copy_location_selector'; 'adv_copy_location_selector_new';  ELSE; adv_chunk.id; END; %]" aria-expanded="true" aria-controls="[% IF adv_chunk.id == 'adv_copy_location_selector'; 'adv_copy_location_selector_new';  ELSE; adv_chunk.id; END; %]">
+                            <button type="button" class="btn filter-header w-100 text-left" data-toggle="collapse" data-target="#[% IF adv_chunk.id == 'adv_copy_location_selector'; 'adv_copy_location_selector_new';  ELSE; adv_chunk.id; END; %]" aria-expanded="true" aria-controls="#[% IF adv_chunk.id == 'adv_copy_location_selector'; 'adv_copy_location_selector_new';  ELSE; adv_chunk.id; END; %]">
                             [% adv_chunk.adv_label %]
                             </button>
                         </h4>
                     </div>
 
-                    <div id="[% IF adv_chunk.id == 'adv_copy_location_selector'; 'adv_copy_location_selector_new';  ELSE; adv_chunk.id; END; %]" class="collapse" aria-labelledby="[% adv_chunk.id %]_card" data-parent="#accordion">
+                    <div id="[% IF adv_chunk.id == 'adv_copy_location_selector'; 'adv_copy_location_selector_new';  ELSE; adv_chunk.id; END; %]" class="collapse" aria-labelledby="[% adv_chunk.id %]_card" data-parent="#[% IF adv_chunk.id == 'adv_copy_location_selector'; 'adv_copy_location_selector_new';  ELSE; adv_chunk.id; END; %]">
                     [% IF adv_chunk.id != 'adv_copy_location_selector';%]
                         <div class="card-body">
                         <fieldset>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2
index b241b27662..3012d2821e 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/anon_list.tt2
@@ -9,12 +9,12 @@
         <div class="bbag-action" style="clear:both;">
         <div class="input-group my-3">
 
-            <button class="btn btn-success m-1" value="place_hold" id="place_hold" type="submit"><i class="fas fa-book" aria-hidden="true"></i> Place Hold</button>
-            <button class="btn btn-danger m-1" value="delete" id="delete" type="submit"><i class="fas fa-trash" aria-hidden="true"></i> Delete</button>
-            <button class="btn btn-action m-1" value="print" id="print" type="submit"><i class="fas fa-print" aria-hidden="true"></i> Print Details</button>
-            <button class="btn btn-action m-1" value="email" id="email" type="submit"><i class="fas fa-envelope-open-text" aria-hidden="true"></i> Email Details</button>
+            <button class="btn btn-success m-1" name="action" value="place_hold" id="place_hold" type="submit"><i class="fas fa-book" aria-hidden="true"></i> Place Hold</button>
+            <button class="btn btn-danger m-1" name="action" value="delete" id="delete" type="submit"><i class="fas fa-trash" aria-hidden="true"></i> Delete</button>
+            <button class="btn btn-action m-1" name="action" value="print" id="print" type="submit"><i class="fas fa-print" aria-hidden="true"></i> Print Details</button>
+            <button class="btn btn-action m-1" name="action" value="email" id="email" type="submit"><i class="fas fa-envelope-open-text" aria-hidden="true"></i> Email Details</button>
 
-            <button class="btn btn-action m-1" value="new_list" id="new_list" type="submit"><i class="fas fa-plus" aria-hidden="true"></i> Add to New List</button>
+            <button class="btn btn-action m-1" name="action" value="new_list" id="new_list" type="submit"><i class="fas fa-plus" aria-hidden="true"></i> Add to New List</button>
             <div class="dropdown show m-1">
                 [% IF ctx.user AND ctx.bookbags.size %]
                  <a class="btn btn-action dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/cart_nav.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/cart_nav.tt2
index f8d189bd9f..4466361a74 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/cart_nav.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/cart_nav.tt2
@@ -1,7 +1,7 @@
 
   <div id="basket_actions">
-  <div class="dropdown">
-      <a href="#" id="cartDropdown" data-toggle="dropdown">
+  <div id="select_basket_action" class="dropdown">
+      <a href="#" class="no-dec" id="cartDropdown" data-toggle="dropdown">
         <img src="[% ctx.media_prefix %]/images/cart-sm.png[% ctx.cache_key %]" alt="[% l('View Basket') %]">
          <div id="record_basket_count_floater">
             <span id="record_basket_count">[% ctx.mylist.size %]</span>
@@ -9,17 +9,17 @@
         </div>
       </a>
       <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="cartDropdown">
-        <a class="dropdown-item" role="menuitem" tabindex="-1" href="[% mkurl(ctx.opac_root _ '/mylist', {}) %]"><i class="fas fa-glasses" aria-hidden="true"></i> [% l('View Basket') %]</a>
-        <a class="dropdown-item" role="menuitem" tabindex="-1" href="[% mkurl(ctx.opac_root _ '/mylist/move', { action => 'place_hold', entire_list => 1 }) %]"><i class="fas fa-book" aria-hidden="true"></i> [% l('Place Holds') %]</a>
-        <a class="dropdown-item" role="menuitem" tabindex="-1" href="[% mkurl(ctx.opac_root _ '/mylist/print', {}) %]"><i class="fas fa-print" aria-hidden="true"></i> [% l('Print Title Details') %]</a>
-        <a class="dropdown-item" role="menuitem" tabindex="-1" href="[% mkurl(ctx.opac_root _ '/mylist/email', {}) %]"><i class="fas fa-envelope" aria-hidden="true"></i> [% l('Email Title Details') %]</a>
+        <a class="dropdown-item" role="menuitem"  href="[% mkurl(ctx.opac_root _ '/mylist', {}) %]"><i class="fas fa-glasses" aria-hidden="true"></i> [% l('View Basket') %]</a>
+        <a class="dropdown-item" role="menuitem"  href="[% mkurl(ctx.opac_root _ '/mylist/move', { action => 'place_hold', entire_list => 1 }) %]"><i class="fas fa-book" aria-hidden="true"></i> [% l('Place Holds') %]</a>
+        <a class="dropdown-item" role="menuitem"  href="[% mkurl(ctx.opac_root _ '/mylist/print', {}) %]"><i class="fas fa-print" aria-hidden="true"></i> [% l('Print Title Details') %]</a>
+        <a class="dropdown-item" role="menuitem"  href="[% mkurl(ctx.opac_root _ '/mylist/email', {}) %]"><i class="fas fa-envelope" aria-hidden="true"></i> [% l('Email Title Details') %]</a>
         [% IF !ctx.is_browser_staff %]
-        <a class="dropdown-item" role="menuitem" tabindex="-1" href="[% mkurl(ctx.opac_root _ '/myopac/lists', { move_cart_by_default => 1, from_basket => 1 }) %]"><i class="fas fa-list" aria-hidden="true"></i> [% l('Add Basket to Saved List') %]</a>
+        <a class="dropdown-item" role="menuitem"  href="[% mkurl(ctx.opac_root _ '/myopac/lists', { move_cart_by_default => 1, from_basket => 1 }) %]"><i class="fas fa-list" aria-hidden="true"></i> [% l('Add Basket to Saved List') %]</a>
         [% END %]
         [% IF ctx.is_browser_staff %]
-        <a class="dropdown-item" role="menuitem" tabindex="-1" href="add_cart_to_bucket"><i class="fab fa-bitbucket" aria-hidden="true"></i> [% l('Add Basket to Bucket') %]</a>
+        <a class="dropdown-item" role="menuitem"  href="add_cart_to_bucket"><i class="fab fa-bitbucket" aria-hidden="true"></i> [% l('Add Basket to Bucket') %]</a>
         [% END %]
-        <a class="dropdown-item" role="menuitem" tabindex="-1" href="[% mkurl(ctx.opac_root _ '/mylist/clear', {}) %]"><i class="fas fa-trash" aria-hidden="true"></i> [% l('Clear Basket') %]</a>
+        <a class="dropdown-item" role="menuitem"  href="[% mkurl(ctx.opac_root _ '/mylist/clear', {}) %]"><i class="fas fa-trash" aria-hidden="true"></i> [% l('Clear Basket') %]</a>
       </div>
     </div>
   </div>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/check_value_selector.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/check_value_selector.tt2
index 6de5ae11e6..e10ce979ce 100644
--- a/Open-ILS/src/templates-bootstrap/opac/parts/check_value_selector.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/check_value_selector.tt2
@@ -32,18 +32,7 @@ FOR o IN all_values;
         sorter.push({code => o.code, value  => (o.search_label ? o.search_label : o.value)});
     END;
 END;%]
-<ul class="adv_filters">
-[% FOR o IN simple_sorter.sort('value') %]
-<li>
-    <div class="form-check">
-      <label class="form-check-label">
-        <input type="checkbox" class="form-check-input" name='[% name %]' value='[% o.code | html | replace("'","&#39;") %]'[% values.grep('^' _ o.code _ '$').size ? ' checked' : '' %]>
-        [% o.value | html %]
-      </label>
-    </div>
-    </li>
-[%  END;%]
-</ul>
+
 [%IF simple_sorter.size && sorter.size %]
     <p disabled='true'>-----</p>
 [%  END; %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2
index e51a4ea7f7..e752366789 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2
@@ -1,31 +1,30 @@
 [% IF !ctx.is_staff %]
 <div id="footer-wrap" class="mt-auto">
 <div id="footer">
-<nav class="navbar navbar-expand-lg navbar-dark ">
-<!--Home-->
-
-
-
-  <!--Left Links-->
-  <div class="row w-100">
-    <div class="col-12">
-        <ul class="navbar-nav">
-            <!--Link 1-->
-        [% 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') %]">[%
-            l('Request Library Card') %]</a></li>
-        [% ELSE %]
-            <li class="nav-item"><a class="nav-link" href="#">[% l('Example Link 1') %]</a></li>
-        [% END %]
-            <li class="nav-item"><a class="nav-link" href="#">[% l('Example Link 2') %]</a></li>
-            <li class="nav-item"><a class="nav-link" href="#">[% l('Example Link 3') %]</a></li>
-            <li class="nav-item"><a class="nav-link" href="#">[% l('Example Link 4') %]</a></li>
-        </ul>
+<div class="row mx-0">
+<div class="col-12 col-lg-3">
+    
+</div>
+<div class="col-12 col-lg-6">
+    <nav class="navbar navbar-expand-lg navbar-dark ">
+    <div class="row w-100">
+        <div class="col-12">
+            <ul class="navbar-nav">
+                <!--Link 1-->
+            [% 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') %]">[%
+                l('Request Library Card') %]</a></li>
+            [% ELSE %]
+                <li class="nav-item"><a class="nav-link" href="#">[% l('Example Link 1') %]</a></li>
+            [% END %]
+                <li class="nav-item"><a class="nav-link" href="#">[% l('Example Link 2') %]</a></li>
+                <li class="nav-item"><a class="nav-link" href="#">[% l('Example Link 3') %]</a></li>
+                <li class="nav-item"><a class="nav-link" href="#">[% l('Example Link 4') %]</a></li>
+            </ul>
+        </div>
     </div>
- </div>
- </nav>
- </div>
-    [% IF ctx.timing %]
+    </nav>
+     [% IF ctx.timing %]
     <div id="timing">
         [% FOR event IN ctx.timing %]
         At <span class="timing-time">[% event.0 | format("%0.4f") %]</span>:
@@ -44,8 +43,12 @@
             />
         </a>
     </div>
-
     </div>
+   
+</div>
+ <div class="col-12 col-lg-3">[%- INCLUDE 'opac/parts/pref_locale_picker.tt2' %]</div>
 
+    </div>
+    </div>
 </div>
 [% END %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/js.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/js.tt2
index 6c86409dd9..aa20951c07 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/js.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/js.tt2
@@ -3,7 +3,7 @@
 
 <script  src="[% ctx.media_prefix %]/js/ui/default/opac/simple.js[% ctx.cache_key %]"></script>
 [% INCLUDE "opac/i18n_strings.tt2" %]
-
+ 
 
 
 
@@ -12,6 +12,7 @@
 <script >
   $(document).ready(function() {
     $('a').removeAttr('href');
+    $('a').removeAttr('data-toggle');
     $('a').click(function(event) { event.preventDefault(); });
     $('button').prop('disabled', true);
     $('button').click(function(event) { event.preventDefault(); });
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2
index 525dd38791..c90b16b5e3 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/login/form.tt2
@@ -23,8 +23,9 @@
 
     <div class="mx-auto row w-75 my-5">
         <div class='col-md-6'>
-            <label for='username_field' class="lbl1" >[% l('Library Card Number') %]<span title="[% INCLUDE "opac/parts/login/username_hint.tt2" %]" data-html="true" data-toggle="tooltip">
-            <i class="fas fa-question-circle"></i></span></label> <br>
+            <label for='username_field' class="lbl1" >[% l('Library Card Number') %]
+            <a href="#" title="[% INCLUDE "opac/parts/login/username_hint.tt2" %]" data-html="true" data-toggle="tooltip">
+            <i class="fas fa-question-circle"></i></a></label> <br>
             <div class="input_bg mb-2">
                 <input class="form-control" type='text' id="username_field" name="username"/>
             </div>
@@ -33,9 +34,10 @@
 
         </div>
         <div class='col-md-6'>
-            <label for="password_field" class="lbl1" >[% l('PIN') %]<span title="[% INCLUDE "opac/parts/login/password_hint.tt2" %]" data-html="true" data-toggle="tooltip">
+            <label for="password_field" class="lbl1" >[% l('PIN') %]
+            <a href="#" title="[% INCLUDE "opac/parts/login/password_hint.tt2" %]" data-html="true" data-toggle="tooltip">
                         <i class="fas fa-question-circle"></i>
-                    </span></label><br>
+                    </a></label><br>
 
             <div class="input_bg mb-2">
                 <input class="form-control" id="password_field" name="password" type="password"/>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2
index caded87c26..0a4daa2df2 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2
@@ -1,4 +1,4 @@
-<div class="modal fade" id="loginModal" tabindex="-1" role="dialog" aria-labelledby="loginModalLabel" aria-hidden="true">
+<div class="modal fade" id="loginModal" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog modal-dialog-centered" role="document">
     <div class="modal-content">
      <form method='post' action="/eg/opac/login?redirect_to=%2Feg%2Fopac%2Fmyopac%2Fmain">
@@ -28,8 +28,9 @@
 <div class='container'>
     <div class="mx-auto row py-4">
         <div class='col-md-6'>
-            <label for='username_field' class="lbl1" >[% l('Library Card Number') %]<span title="[% INCLUDE "opac/parts/login/username_hint.tt2" %]" data-html="true" data-toggle="tooltip">
-            <i class="fas fa-question-circle"></i></span></label> <br>
+            <label for='username_field' class="lbl1" >[% l('Library Card Number') %]
+            <a href="#" title="[% INCLUDE "opac/parts/login/username_hint.tt2" %]" data-html="true" data-toggle="tooltip">
+            <i class="fas fa-question-circle"></i></a></label> <br>
             <div class="input_bg mb-2">
                 <input class="form-control" type='text' id="username_field" name="username"/>
             </div>
@@ -38,9 +39,10 @@
 
         </div>
         <div class='col-md-6'>
-            <label for="password_field" class="lbl1" >[% l('PIN') %]<span title="[% INCLUDE "opac/parts/login/password_hint.tt2" %]" data-html="true" data-toggle="tooltip">
+            <label for="password_field" class="lbl1" >[% l('PIN') %]
+            <a href="#" title="[% INCLUDE "opac/parts/login/password_hint.tt2" %]" data-html="true" data-toggle="tooltip">
                         <i class="fas fa-question-circle"></i>
-                    </span></label><br>
+                    </a></label><br>
 
             <div class="input_bg mb-2">
                 <input class="form-control" id="password_field" name="password" type="password"/>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2
index 15bc33678a..0374be1548 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/myopac/base.tt2
@@ -43,7 +43,7 @@
     <hr />
     <div class="container">
         <div class="row">
-            <div class="col-md-3">
+            <div class="col-lg-3">
                 <div class="my_nav">
                 <div class="btn-group-vertical dropright">
 
@@ -57,7 +57,7 @@
 
                     [% IF page.parent == "parent" && page.children > 0; %]
                     <div class="dropdown dropright">
-                        <button class="btn btn-action text-left dropdown-toggle [% active %]" id="dropdownMenuLink-[% page.url %]" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <button class="w-100 btn btn-action text-left dropdown-toggle [% active %]" id="dropdownMenuLink-[% page.url %]" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             [% page.text; %]
                         </button>
 
@@ -91,7 +91,7 @@
                 </div>
            </div>
 	    </div><!-- myopac_tabs -->
-        <div class="col">
+        <div class="col-lg-9">
             [% content %]
 
         </div>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/pref_locale_picker.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/pref_locale_picker.tt2
index 61b09e26cd..63c8acc795 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/pref_locale_picker.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/pref_locale_picker.tt2
@@ -6,26 +6,46 @@
 
     set_locale = CGI.param('set_eg_locale') || CGI.cookie('eg_locale') || base_locale;
 %]
-<form id="pref_locale_picker_form" class="row" action="[% mkurl() %]" method="post">
-    <label for="pref_locale_picker" class="color_4 light_border col-3 text-left">[% l("Language:") %]</label>
+<style>.language_form button {
+    background:none;
+    border:none;
+    margin:0;
+    padding:0;
+    color:#fff;
+}
+.language_form button:disabled {
+    color:#000;
+}
+    .language_form ul{
+        list-style:none;
+       
+    }
+    .language_form h6{
+        color: #fff;
+            }
+    .language_form{
+        float: right;
+    padding: 15px;
+    }
+    
+</style>
+<form id="pref_locale_picker_form" class="language_form" action="[% mkurl() %]" method="post">
+    <h6><i class="fas fa-globe"></i> [% l("Language") %]</h6>
     [%- FOREACH param IN CGI.params(); -%]
         [%- NEXT IF param.key == 'set_eg_locale'; -%]
         <input type="hidden" name="[% param.key | html %]" value="[% param.value | html %]" />
     [%- END; -%]
-
-    <select id="pref_locale_picker" name="set_eg_locale" class="form-control form-control-sm col-6">
+    <ul style="list-style:none;padding:0px;">
     [%- FOREACH locale IN ctx.locales.keys %]
         [%- IF set_locale == locale;
-                selected = 'selected="selected"';
+                disabled = 'disabled="disabled"';
             ELSE;
-                selected = '';
+                disabled = '';
             END;
         %]
-        <option value="[% locale | html %]" [% selected %]>[% ctx.locales.$locale | html %]</option>
+        <li>
+        <button type="submit" name="set_eg_locale" value="[% locale | html %]" [% disabled %]>[% ctx.locales.$locale | html %]</button></li>
     [%- END %]
-    </select>
-    <div class="col-3">
-     <button type="submit" class="btn btn-sm btn-confirm float-right"/><i class="fas fa-save" aria-hidden="true"></i>[% l(" Save Changes") %]</button>
-    </div>
+    </ul>
 </form>
 [%- END %]
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2
index c433c76e7f..6ae5c9b68e 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/record/summary.tt2
@@ -348,63 +348,63 @@ ctx.metalinks.push('
                 && (ctx.holds_block.enabled != 'true' || !attrs.org_copy_counts.$search_ou.available)
                 )
                 %]
-                <div class="btn btn-action">
-                    <a href="[% mkurl(ctx.opac_root _ '/place_hold',
+                
+                    <a class="btn btn-action" role="button" href="[% mkurl(ctx.opac_root _ '/place_hold',
                     {hold_target => ctx.bre_id, hold_type => 'T', hold_source_page => mkurl()}, stop_parms) %]"
                         class="no-dec">
                         <span class="place_hold"><i class="fas fa-check" aria-hidden="true"></i> [% l('Place Hold') %]</span></a>
-                </div>
+              
                 [%- END -%]
 
                 [%- IF ebook_api.enabled == 'true' && args.ebook %]
-                <div class="btn btn-action">
+              
                     <div id="[%- ctx.bre_id -%]_ebook_checkout" class="rdetail_aux_utils ebook_action hidden">
-                        <a href="[% mkurl(ctx.opac_root _ '/myopac/ebook_checkout',
+                        <a class="btn btn-action" role="button" href="[% mkurl(ctx.opac_root _ '/myopac/ebook_checkout',
                     {title => args.ebook.ebook_id, vendor => args.ebook.vendor, action => 'checkout'}, stop_parms) %]"
                             class="no-dec" rel="nofollow" vocab="">
                             <span class="place_hold"><i class="fas fa-check" aria-hidden="true"></i> [% l('Check Out E-Item') %]</span></a>
                     </div>
-                </div>
-                <div class="btn btn-action">
+               
+               
                     <div id="[%- ctx.bre_id -%]_ebook_place_hold" class="rdetail_aux_utils ebook_action hidden">
-                        <a href="[% mkurl(ctx.opac_root _ '/myopac/ebook_place_hold',
+                        <a class="btn btn-action" role="button" href="[% mkurl(ctx.opac_root _ '/myopac/ebook_place_hold',
                     {title => args.ebook.ebook_id, vendor => args.ebook.vendor, action => 'place_hold'}, stop_parms) %]"
                             class="no-dec" rel="nofollow" vocab="">
                             <span class="place_hold"><i class="fas fa-check" aria-hidden="true"></i> [% l('Place Hold on E-Item') %]</span></a>
                     </div>
-                </div>
+               
                 [%- END -%]
 
 
-                <div class="btn btn-action">
+               
                     [% operation = ctx.mylist.grep('^' _ ctx.bre_id _ '$').size ? "delete" : "add";
                     addhref = mkurl(ctx.opac_root _ '/mylist/add', {record => ctx.bre_id}, stop_parms);
                     delhref = mkurl(ctx.opac_root _ '/mylist/delete', {record => ctx.bre_id}, stop_parms);
                     label = (operation == "add") ? l("Add to Basket") : l("Remove from Basket");
                     %]
                     <a href="[% addhref %]" id="mylist_add_[% ctx.bre_id %]"
-                        data-recid="[% ctx.bre_id %]" data-action="add"
-                        class="no-dec mylist_action [% IF ctx.mylist.grep('^' _ ctx.bre_id _ '$').size %]hidden[% END %]"
+                        data-recid="[% ctx.bre_id %]" data-action="add" role="button"
+                        class="btn btn-action mylist_action [% IF ctx.mylist.grep('^' _ ctx.bre_id _ '$').size %]hidden[% END %]"
                         title="[% l(" Add [_1] to basket", attrs.title) %]" rel="nofollow" vocab="">
                         <i class="fas fa-shopping-basket" aria-hidden="true"></i>
                         [% l("Add to basket") %]
                     </a>
                     <a href="[% delhref %]" id="mylist_delete_[% ctx.bre_id %]"
-                        data-recid="[% ctx.bre_id %]" data-action="delete"
-                        class="mylist_action [% IF !ctx.mylist.grep('^' _ ctx.bre_id _ '$').size %]hidden[% END %]"
+                        data-recid="[% ctx.bre_id %]" data-action="delete" role="button"
+                        class="btn btn-action mylist_action [% IF !ctx.mylist.grep('^' _ ctx.bre_id _ '$').size %]hidden[% END %]"
                         title="[% l(" Remove [_1] from basket", attrs.title) %]" rel="nofollow" vocab="">
                         <i class="fas fa-minus-circle" aria-hidden="true"></i>
                         [% l("Remove from basket") %]
                     </a>
-                </div>
+               
                 [% IF ctx.mylist.size %]
-                <div class="btn btn-action">
+               
                     [%- IF ctx.user; %]
-                    <a href="[% mkurl(ctx.opac_root _ '/myopac/lists') %]" class="no-dec" rel="nofollow" vocab=""><i class="fas fa-glasses" aria-hidden="true"></i> [% l(' View Basket') %]</a>
+                    <a href="[% mkurl(ctx.opac_root _ '/myopac/lists') %]" class="btn btn-action" role="button" rel="nofollow" vocab=""><i class="fas fa-glasses" aria-hidden="true"></i> [% l(' View Basket') %]</a>
                     [%- ELSE %]
-                    <a href="[% mkurl(ctx.opac_root _ '/mylist') %]" class="no-dec" rel="nofollow" vocab=""><i class="fas fa-glasses" aria-hidden="true"></i> [% l(' View My Basket') %]</a>
+                    <a href="[% mkurl(ctx.opac_root _ '/mylist') %]" class="btn btn-action" role="button" rel="nofollow" vocab=""><i class="fas fa-glasses" aria-hidden="true"></i> [% l(' View My Basket') %]</a>
                     [%- END %]
-                </div>
+              
                 [% END %]
 
                 [% IF !ctx.is_staff %]
@@ -413,45 +413,45 @@ ctx.metalinks.push('
                     [% END %]
                 [% END %]
 
-                <div class="btn btn-action">
-                    <i class="fas fa-envelope-open-text" aria-hidden="true"></i>
-                    <a href="[% mkurl(ctx.opac_root _ '/record/print/' _ ctx.bre_id) %]" class="no-dec" rel="nofollow"
-                        vocab="">[% l('Print') %]</a> /
-                    <a href="[% mkurl(ctx.opac_root _ '/record/email/' _ ctx.bre_id) %]" class="no-dec" rel="nofollow"
-                        vocab="">[% l('Email') %]</a>
-                </div>
+               
+                  
+                    <a href="[% mkurl(ctx.opac_root _ '/record/print/' _ ctx.bre_id) %]" class="btn btn-action" role="button" rel="nofollow"
+                        vocab=""><i class="fas fa-print" aria-hidden="true"></i>[% l('Print') %]</a> 
+                    <a href="[% mkurl(ctx.opac_root _ '/record/email/' _ ctx.bre_id) %]" class="btn btn-action" role="button" rel="nofollow"
+                        vocab=""> <i class="fas fa-envelope-open-text" aria-hidden="true"></i>[% l('Email') %]</a>
+                
                 [%- IF ctx.refworks.enabled == 'true' %]
                 [%- INCLUDE 'opac/parts/record/refworks.tt2' %]
                 [%- END %]
                 [% IF !ctx.is_staff %]
-                <div class="btn btn-action">
+                
                     <a href="[% mkurl('', {locg =>CGI.param('locg'), copy_depth =>CGI.param('copy_depth')}, 1) %]"
-                        class="no-dec">
+                        class="btn btn-action" role="button">
                         <i class="fas fa-link" aria-hidden="true"></i>
                         [% l('Permalink') %]
                     </a>
-                </div>
+              
                 [% END %]
                 [% IF !search.no_highlight %]
-                <div class="btn btn-action">
+               
                     [% IF CGI.param('no_highlight') %]
-                    <a href="[% mkurl('', {}, ['no_highlight']) %]" class="no-dec">
+                    <a class="btn btn-action" role="button" href="[% mkurl('', {}, ['no_highlight']) %]" class="no-dec">
                         [% ELSE %]
-                        <a href="[% mkurl('', {no_highlight => '1'}) %]" class="no-dec">
+                        <a href="[% mkurl('', {no_highlight => '1'}) %]" class="btn btn-action" role="button">
                             [% END %]
                             <i class="fas fa-highlighter" aria-hidden="true"></i>
                             [% CGI.param('no_highlight') ? l('Enable Highlighting') : l('Disable Highlighting') %]
                         </a>
-                </div>
+              
                 [% END %]
                 [%- IF ctx.is_staff %]
-                <div class="btn btn-action">
+                
                     <a href="[% ctx.media_prefix %]/opac/extras/ac/clearcache/all/r/[% ctx.bre_id | uri %]"
-                        class="no-dec" target="_blank">
+                        class="btn btn-action" role="button" target="_blank">
                         <i class="fas fa-sync-alt" aria-hidden="true"></i>
                         [% l('Clear Added Content Cache') %]
                     </a>
-                </div>
+                
                 [%- END %]
 
             </div>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2
index 7cffdccc7f..7f3ab3cd68 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/result/table.tt2
@@ -362,32 +362,32 @@
 
 
                                         <!--Place Hold Button -->
-                                        <div class="btn btn-action text-left">
-                                                <a href="[% mkurl(ctx.opac_root _ '/place_hold', add_parms, del_parms) %]"
-                                                    [% html_text_attr('title', l('Place Hold on [_1]', attrs.title)) %]
-                                                    class="no-dec" rel="nofollow" vocab="">
-                                                    <i class="fas fa-check" aria-hidden="true"></i>
-                                                    <span class="result_place_hold">[% l('Place Hold') %]</span>
-                                                </a>
-                                        </div>
+                                       
+                                        <a role="button" href="[% mkurl(ctx.opac_root _ '/place_hold', add_parms, del_parms) %]"
+                                            [% html_text_attr('title', l('Place Hold on [_1]', attrs.title)) %]
+                                            class="btn btn-action" rel="nofollow" vocab="">
+                                            <i class="fas fa-check" aria-hidden="true"></i>
+                                            <span class="result_place_hold">[% l('Place Hold') %]</span>
+                                        </a>
+                                       
                                         [%- END -%]
 
                                         <!-- eBook Buttons -->
                                         [%- IF ebook_api.enabled == 'true' && args.ebook %]
-                                        <div class="btn btn-action text-left">
+                                      
                                             <a href="[% mkurl(ctx.opac_root _ '/myopac/ebook_checkout',
                                                 {title => args.ebook.ebook_id, vendor => args.ebook.vendor, action => 'checkout'},
                                                 ['query','tag','subfield','term','_special','sort','page']) %]"
                                                 [% html_text_attr('title', l('Check Out [_1]', attrs.title)) %]
-                                                    class="no-dec" rel="nofollow" vocab=""><i class="fas fa-atlas" aria-hidden="true"></i> <span class="result_place_hold">[% l('Check Out E-Item') %]</span></a>
-                                        </div>
-                                        <div class="btn btn-action text-left">
+                                                    class="btn btn-action" role="button" rel="nofollow" vocab=""><i class="fas fa-atlas" aria-hidden="true"></i> <span class="result_place_hold">[% l('Check Out E-Item') %]</span></a>
+                                       
+                                       
                                             <a href="[% mkurl(ctx.opac_root _ '/myopac/ebook_place_hold',
                                                 {title => args.ebook.ebook_id, vendor => args.ebook.vendor, action => 'place_hold'},
                                                 ['query','tag','subfield','term','_special','sort','page']) %]"
                                                 [% html_text_attr('title', l('Place Hold on [_1]', attrs.title)) %]
-                                                    class="no-dec" rel="nofollow" vocab=""><i class="fas fa-book-reader" aria-hidden="true"></i> <span class="result_place_hold">[% l('Place Hold on E-Item') %]</span></a>
-                                        </div>
+                                                    class="btn btn-action" role="button" rel="nofollow" vocab=""><i class="fas fa-book-reader" aria-hidden="true"></i> <span class="result_place_hold">[% l('Place Hold on E-Item') %]</span></a>
+                                       
                                         [%- END -%]
 
                                         <!--Basket and My Lists Buttons -->
@@ -399,23 +399,23 @@
                                                     delhref = mkurl(ctx.opac_root _ '/mylist/delete',
                                                             {record => rec.id, anchor => 'record_' _ rec.id}, 1);
                                                 %]
-                                                <div class="btn btn-action text-left">
+                                                
                                                 <a href="[% addhref %]" id="mylist_add_[% rec.id %]"
                                                     data-recid="[% rec.id %]" data-action="add"
-                                                    class="mylist_action [% IF ctx.mylist.grep('^' _ rec.id _ '$').size %]hidden[% END %]"
+                                                    role="button" class="mylist_action btn btn-action [% IF ctx.mylist.grep('^' _ rec.id _ '$').size %]hidden[% END %]"
                                                     title="[% l("Add [_1] to basket", attrs.title) %]" rel="nofollow" vocab="">
                                                     <i class="fas fa-shopping-basket" aria-hidden="true"></i>
                                                     [% l("Add to basket") %]
                                                 </a>
 
                                                 <a href="[% delhref %]" id="mylist_delete_[% rec.id %]"
-                                                    data-recid="[% rec.id %]" data-action="delete"
-                                                    class="mylist_action text-left [% IF !ctx.mylist.grep('^' _ rec.id _ '$').size %]hidden[% END %]"
+                                                    data-recid="[% rec.id %]" data-action="delete" role="button"
+                                                    class="mylist_action btn btn-action [% IF !ctx.mylist.grep('^' _ rec.id _ '$').size %]hidden[% END %]"
                                                     title="[% l("Remove [_1] from basket", attrs.title) %]" rel="nofollow" vocab="">
                                                     <i class="fas fa-minus-circle" aria-hidden="true"></i>
                                                     [% l("Remove from basket") %]
                                                 </a>
-                                                </div>
+                                                
                                                 [%  IF ctx.user;
                                                     INCLUDE "opac/parts/bookbag_actions.tt2";
                                                     END;
@@ -426,7 +426,7 @@
                                         <!--Added Content - Content Cafe -->
                                         [% IF ENV.OILS_CONTENT_CAFE_USER %]
                                         [% ident = attrs.isbn_clean || attrs.upc %]
-                                            <div type="button" class="btn btn-action">
+                                         
                                                 <a target='_blank'
                                                     [% html_text_attr('title', l('Reviews and More for [_1]', attrs.title)) %]
                                                     href="[% ctx.ext_proto %]://contentcafe2.btol.com/ContentCafeClient/ContentCafe.aspx?UserID=[%-
@@ -435,7 +435,7 @@
                                                     <i class="fas fa-star" aria-hidden="true"></i>
                                                     <span class="results_reviews">[% l('Reviews &amp; More') %]</span>
                                                 </a>
-                                            </div>
+                                            
                                         [% END %]
                                         </div>
                                         </div>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2
index 79bb578a56..433b2faf44 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2
@@ -120,7 +120,7 @@ END;
         </div>
         [%- IF ctx.depth_sel_button AND NOT took_care_of_form %]
         <div class="col-auto mr-auto mr-md-1">
-        <button id='search-submit-go-depth' type="submit" value="[% ctx.depth_sel_depth %]" name="depth" class="[% #ctx.depth_sel_button_class %] btn btn-sm btn-opac"
+        <button id='search-submit-go-depth' type="submit" value="[% ctx.depth_sel_depth %]" name="depth" class="btn btn-sm btn-opac"
             onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"; $("search-submit-go-depth").className="hidden";}, 2000)' title="[% ctx.depth_sel_tooltip | html %]"><i class="fas fa-globe" aria-hidden="true"></i> [% ctx.depth_sel_button_label | html %]</button>
         [%- END %]
         <img id='search-submit-spinner' src='[% ctx.media_prefix %]/opac/images/progressbar_green.gif[% ctx.cache_key %]' style='height:16px;width:16px;' class='hidden' alt='[% l("Search In Progress") %]'/>
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 dda8e6dcd5..7d8745cd70 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2
@@ -26,7 +26,6 @@
         <a class="nav-link" href="[% ctx.link_four %]">Example Link 4</a>
       </li>
     </ul>
-    [%- INCLUDE "opac/parts/locale_picker.tt2" %]
     <!--Right Links-->
     <ul class="navbar-nav ml-auto nav-fr px-3">
       <!--If not signed in, show sign in button-->
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/topnav_subnav.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_subnav.tt2
index 59d476391c..faea851a26 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/topnav_subnav.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_subnav.tt2
@@ -21,6 +21,7 @@
         [% END %]
     </nav>
 </div>
+ 
     <div class="col-auto">
         [% INCLUDE 'opac/parts/cart_nav.tt2' %]
     </div>
-- 
2.11.0