From: Chris Burton <cburton@nflibrary.ca>
Date: Tue, 8 Sep 2020 23:03:59 +0000 (-0400)
Subject: LP#1778972 Last minute tweaks and updates
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=bfe13fdb96afea806bc84ecebd21eadf564d49e4;p=working%2FEvergreen.git

LP#1778972 Last minute tweaks and updates

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

diff --git a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
index 2c6467d2e1..4b0e8c51e7 100755
--- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
@@ -14,9 +14,7 @@
     column-gap: 20px;
     list-style: none;
 }
-.fas, .far{
-    margin: 5px 0px;
-}
+
 .top-divide{
         border-top: 1px solid rgba(0,0,0,.1);
 }
@@ -767,11 +765,7 @@ for now until a better color is picked - if needed.
 }
 
 #adv_special_block {
-    [% IF rtl == 't' -%]
-    float: right;
-    [%- ELSE %]
-    float: left;
-    [%- END %]
+    
     padding: 5px;
     margin-top: 5px;
 }
@@ -3015,8 +3009,12 @@ a.preflib_change {
     #nav-divide{
     	display:none !important;
     }
+    
 }
 @media only screen and (max-width: 800px) {
+    .adv_options{
+        width: 100% !important;
+    }
     .facet_sidebar_hidden, .result_block_hidden {
         display: none;
     }
@@ -3769,6 +3767,10 @@ label[for*=expert_]
     font-weight: bold;
     text-align: center;
 }
+
+.fas, .far{
+    margin: 0px 3px;
+}
 .carousel-entry {
     max-width: 150px;
 }
@@ -3861,4 +3863,8 @@ label[for*=expert_]
 
 .my_nav .fas, .mynav .far{
     min-width:20px;
+}
+
+.adv_options{
+    width: 50%;
 }
\ No newline at end of file
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2
index 52b3b5a28e..d05bd98203 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/charges.tt2
@@ -148,11 +148,11 @@
                 <tr>
                 
                      [% IF myopac_cc_allowed %]
-                    <td style="white-space:nowrap;">
+                    <th style="white-space:nowrap;">
                         <input id="pay_fines_box2" checked="checked"
                             type="checkbox" onclick="select_all_checkboxes('xact_misc', this.checked)"
                             aria-label="[% l('Check/Uncheck All') %]" />
-                    </td>
+                    </th>
                     [% END %]
                     <th >[% l("Owed") %]</th>
                     <th >[% l("Billing Type") %]</th>
@@ -179,7 +179,7 @@
                         <strong>
                             [% money(f.xact.balance_owed) %]
                         </strong>
-                         <input type="hidden" aria-label="Amount Owing" class="fineAmount" value="[% f.xact.balance_owed %]" hidden />
+                         <input type="hidden" class="fineAmount" value="[% f.xact.balance_owed %]" hidden />
                     </td>
                     
                     <td>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2
index d685903847..65b92b7e65 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2
@@ -50,9 +50,9 @@
         <table title="[% l('History of Items Checked Out') %]" id="acct_checked_hist_header" class="table table-hover table-bordered miniTable circHistTable my-3">
             <thead>
                 <tr>
-                    <th class="checkCell">
+                    <td class="checkCell">
                         <input type="checkbox" onclick="var inputs=document.getElementsByTagName('input'); for (i = 0; i < inputs.length; i++) { if (inputs[i].name == 'circ_id' && !inputs[i].disabled) inputs[i].checked = this.checked;}" aria-label="[% l('Click to (un)select all items') %]"/>
-                    </th>
+                    </td>
                     <th>[% sort_head("sort_title", l("Title")) %]</th>
                     <th>[% sort_head("author", l("Author")) %]</th>
                     <th>[% sort_head("callnum", l("Call Number")) %]</th>
@@ -127,7 +127,7 @@
                 FOR circ IN circ_items; %]
                     <tr>
             <td class="checkbox_column">
-                <input type="checkbox" name="circ_id" value="[% circ.circ.id %]" />
+                <input type="checkbox" name="circ_id" value="[% circ.circ.id %]" aria-label="Select Item"/>
             </td>
                         <td>
                             <a href="[% mkurl(ctx.opac_root _ '/record/' _
@@ -137,10 +137,12 @@
                                 [%- circ.ATTRS.title.substr(circ.ATTRS.nonfiling_characters) | html %]</a>
                         </td>
                         <td>
+                            [% IF circ.ATTRS.author %]
                             <a href="[% mkurl(ctx.opac_root _ '/results',
                                 {qtype => 'author', query => circ.ATTRS.author.replace('[,\.:;]', '')},
                                 1
                             ) %]">[% circ.ATTRS.author | html %]</a>
+                            [%END; %]
                         </td>
                         <td>[% circ.circ.target_copy.call_number.label | html %]</td>
                         <td>
@@ -174,7 +176,7 @@
                     [%- INCLUDE "opac/parts/preserve_params.tt2" %]
                     [% IF ctx.circs.size > 0 %]
                     <input type="hidden" name="filename" value="[% l('circ_history.csv') %]"/>
-                    <button type="submit" class="btn btn-primary"><i class="fas fa-file-download"></i> [% l('Download CSV') %]</button>
+                    <button type="submit" class="btn btn-action"><i class="fas fa-file-download"></i> [% l('Download CSV') %]</button>
                     [% END %]
                 </div>
             </form>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2
index 4a9e18908a..5dd46f12a4 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circs.tt2
@@ -30,7 +30,7 @@
                 <button name="action" class="btn btn-confirm" id="renew" value="renew" type="submit"><i class="fas fa-redo-alt"></i> Renew Selected</button>
         </div>
         <div class="d-block d-md-none">
-            <input id="check_all_checked" aria-label="[% l('Select All Items') %]" checked="checked" type="checkbox" onclick="var inputs=document.getElementsByTagName('input'); for (i = 0; i < inputs.length; i++) { if (inputs[i].name == 'circ' &amp;&amp; !inputs[i].disabled) inputs[i].checked = this.checked;}"/>
+            <input id="check_all_checked_alt" aria-label="[% l('Select All Items') %]" checked="checked" type="checkbox" onclick="var inputs=document.getElementsByTagName('input'); for (i = 0; i < inputs.length; i++) { if (inputs[i].name == 'circ' &amp;&amp; !inputs[i].disabled) inputs[i].checked = this.checked;}"/>
 
             <label for="check_all_checked">[% l('Check/Uncheck All') %]</label>  
         </div>       
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2
index a75427aa68..175381a1a8 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/hold_history.tt2
@@ -14,36 +14,32 @@
   
 <div>
     <div>
-        <ul class='start_end_links_span pagination d-inline-flex'>    
-            [% IF offset != 0 %]        
-            
-             <li class="page-item"> <a class='np_nav_link classic_link btn btn-action' title='[% l("Previous Page") %]'
-            href='[% mkurl('hold_history', {limit => limit,offset => (offset - limit)}) %]'><span class="nav_arrow_fix">&#9668;</span> <span class="d-none d-md-inline-block">[% l('Previous') %]</span></a></li>
-           [% END; %]
-            [% IF offset > 0 || count > limit;
-                curpage = 0;
-                WHILE curpage * limit < count;
-                    IF curpage * limit == offset;
-            %]
-                        <li class="page-item active"><a href="[% mkurl('hold_history', {limit => limit, offset => (curpage * limit)}) %]"  class="results-paginator-selected btn page-link disabled">[% curpage + 1%]</a></li>
+        <div>   
+          [% IF offset != 0 %]<a href='[% mkurl('hold_history', {limit => limit,offset => (offset - limit)}) %]'
+              ><span class="np_nav_link classic_link btn btn-action">&#9668;[% l('Previous') %]</span></a> [% END %]
+
+             [% IF offset > 0 || count > limit; curpage = 0; WHILE curpage * limit < count; IF curpage * limit == offset; %]
+                  <span class="np_nav_link classic_link btn btn-action disabled">[% curpage + 1 %]</span>
 
-            
                     [%- ELSE %]
-            <li class="page-item"><a href="[% mkurl('hold_history', {limit => limit, offset => (curpage * limit)}) %]" class="btn page-link">[% curpage + 1%]</a></li>
+                <a href='[% mkurl('hold_history', {limit => limit, offset => (curpage * limit)}) %]' class="np_nav_link classic_link btn btn-action">[% curpage + 1 %]</a>
+                    [%- END; curpage = curpage + 1; END; END %]
+               
+            
+              
+                [% IF count > limit + offset %]<a href='[% mkurl('hold_history', {limit => limit, offset => (offset + limit)}) %]'
+                  ><span class="np_nav_link classic_link btn btn-action">[% l('Next') %]&#9658;</span></a>[% END %]
+           </div>
+
+
 
-                    [%- END;
-                    curpage = curpage + 1;
-                END;
-            END %]
-            [% IF count >= limit + offset %]
-            <li class="page-item"><a class='np_nav_link classic_link btn btn-action' title='[% l("Next Page") %]'
-            href='[% mkurl('hold_history', {limit => limit, offset => (offset + limit)}) %]'><span class="d-none d-md-inline-block">[% l('Next') %]</span> <span class="nav_arrow_fix">&#9658;</span></a></li>
-        
-[% END; %]
-</ul>
-        <span style="float:right;">
+           
+          <p style="padding-left:5px;" class='error'>
+                    [%  IF ctx.hold_suspend_post_capture; l('One or more holds could not be suspended because the item is at (or en route to) the pickup library.'); END; %]
+                </p>
+        <p style="float:right;">
             <a class="hide_me" href="#">[% l('Export List') %]</a>
-        </span>
+        </p>
     </div>
 
     <div id='holds_main'>
@@ -77,17 +73,21 @@
                         </div>
                     </td>
                     <td>
+                     [% IF attrs.author; %]
                     <span class="sr-only">Author</span>
                         <div>
+                       
                             <a href="[% mkurl(ctx.opac_root _ '/results',
                                 {qtype => author, query => attrs.author.replace('[,\.:;]', '')}
                             ) %]">[% attrs.author | html %]</a>
+                          
                         </div>
+                          [% END %]
                     </td>
                     <td>
                         <div>
                             [% IF attrs.format_icon %]
-                            <img title="[% attrs.format_label | html %]" alt="[% attrs.format_label | html %]" src="[% attrs.format_icon %][% ctx.cache_key %]" />
+                            <img alt="[% attrs.format_label | html %]" src="[% attrs.format_icon %][% ctx.cache_key %]" />
                             [% END %]
                              <span>[% attrs.format_label | html %]</span>
                         </div>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
index 8d7cd5c7c9..e206819d80 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/holds.tt2
@@ -23,7 +23,7 @@
                 
                     <div>
             <button name="action" class="btn btn-action my-2" id="suspend" value="suspend" type="submit"><i class="fas fa-hand-paper"></i> [% l("Suspend") %]</button>
-            <button name="action" class="btn btn-success my-2" id="activate" value="activate" type="submit"><i class="fas fa-play"></i> [% l("Activate") %] </button>
+            <button name="action" class="btn btn-opac my-2" id="activate" value="activate" type="submit"><i class="fas fa-play"></i> [% l("Activate") %] </button>
             <button name="action" class="btn btn-danger my-2" id="cancel" value="cancel" type="submit" onclick="return confirm('[% l("Are you sure you wish to cancel the selected hold(s)?") %]');"><i class="fas fa-ban"></i> [% l("Cancel") %]</button>
                  <p class="my-2">
                     [% IF CGI.param("available") -%]
@@ -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 -%]
-                     <a href="#" title="This option will show all items available for pickup." data-toggle="tooltip">
+                     <span title="This option will show all items available for pickup." data-toggle="tooltip">
                         <i class="fas fa-question-circle"></i>
-                    </a>
+                    </span>
                </p>
                 
           </div>       
@@ -76,10 +76,10 @@
         class="table table-hover table-bordered miniTable activeHoldstable w-100 my-3">
             <thead>
             <tr>
-                <th class="checkCell"> 
-                    <input type="checkbox" title="[% l('Select All Holds') %]"
+                <td class="checkCell"> 
+                    <input type="checkbox" aria-label="[% l('Select All Holds') %]"
                       onclick="var inputs=document.getElementsByTagName('input'); for (i = 0; i < inputs.length; i++) { if (inputs[i].name == 'hold_id' &amp;&amp; !inputs[i].disabled) inputs[i].checked = this.checked;}"/>
-                </th>
+                </td>
                 <th>[% sort_head("sort_title", l('Title')) %]</th>
                 <th>[% sort_head("author", l('Author')) %]</th>
                 <th>[% sort_head("format", l('Format')) %]</th>
@@ -87,7 +87,7 @@
                 <th>[% l('Cancel if not filled by') %]</th>
                 <th>[% l('Status') %]</th>
                 <th>[% l('Notes') %]</th>
-                <th></th>
+                <th>[% l('Edit') %]</th>
             </tr>
             </thead>
             <tbody id="holds_temp_parent">
@@ -152,7 +152,7 @@
 
                     <span class="sr-only">Hold Number [%  cnt; %]</span>
                         <input type="checkbox" name="hold_id" value="[% ahr.id %]" 
-                            [% html_text_attr('title', l('Select hold [_1]', attrs.title)) %]/>
+                         aria-label="Select Hold"/>
                     </td>
                     <td>
                     <span class="sr-only">Title</span>
@@ -196,8 +196,7 @@
                             FOR format IN formats 
                           %]
                           <span class="sr-only">[% format.label | html %]</span>
-                            <img title="[% format.label | html %]" 
-                              alt="[% format.label | html %]" src="[% format.icon %][% ctx.cache_key %]" />
+                            <img alt="[% format.label | html %]" src="[% format.icon %][% ctx.cache_key %]" />
                             [% END %]
                         </div>
                     </td>
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
index 4cb82285b0..c5aed2dc07 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/lists.tt2
@@ -18,7 +18,7 @@
 
     <!-- new list creation -->
     <form action="[% mkurl(ctx.opac_root _ '/myopac/list/update') %]" method="post" id="create_form">
-        <h5>[% l('Create New List') %]</h5><a id="createnewlist"></a>
+        <h4>[% l('Create New List') %]</h4><a id="createnewlist"></a>
         <table class="table" >
             <tr>
                 <td class="list_create_table_label">
@@ -53,9 +53,9 @@
                         <option value="0">[% l('No') %]
                         <option value="1">[% l('Yes') %]
                     </select>
-                    <a href="#" title="Allows the list to be shared through a link or RSS." data-toggle="tooltip">
+                    <span title="Allows the list to be shared through a link or RSS." data-toggle="tooltip">
                         <i class="fas fa-question-circle"></i>
-                    </a>
+                    </span>
                 </td>
             </tr>
             [% IF ctx.mylist.size %]
@@ -154,7 +154,7 @@
                     ltitle = l("Hide items in list");
                 END %]
                 <h2 class="bookbag-name"><a title="[% ltitle %]" href="[% url %]">[% bbag.name | html %]</a>[% IF bbag.pub == 't'; %]
-                <a target='_blank' href='/opac/extras/feed/bookbag/rss2-full/[% bbag.id %]'>
+                <a target='_blank' href='/opac/extras/feed/bookbag/rss2-full/[% bbag.id %]' aria-label="RSS Feed">
                 <i class="fas fa-rss-square"></i></a>
                 [% END %]</h2>
                 [% IF bbag.description %]<div class="bookbag-description">[% bbag.description | html %]</div>[% END %]
@@ -235,7 +235,7 @@
             [% IF bbag.pub == 't'; %]
             <div class="bookbag-controls">
                 
-                <a class="btn btn-sm btn-primary m-1" href='[%-
+                <a class="btn btn-sm btn-opac m-1" href='[%-
                     mkurl(
                         ctx.opac_root _ '/results',
                         {page => '0', bookbag => bbag.id, depth => 0, locg => ctx.search_ou},
diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2
index fb5afdc535..deb65ae652 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/main.tt2
@@ -29,36 +29,41 @@
                         </span>
                         [% END %]
                     </div>
+                    <br>
                     <div class="col-12">
                      <a href="[% mkurl(ctx.opac_root _ '/myopac/circs') %]"
                             title="[% l('View My Checked Out Items') %]">
                             [% l("Items Currently Checked out ([_1])", ctx.user_stats.checkouts.total_out) %]
                         </a>
                     </div>
+                     <div class="col-12">
+                     <a href="[% mkurl(ctx.opac_root _ '/myopac/holds') %]"
+                            title="[% l('View My Holds') %]">
+                            [% l('Items Currently on Hold ([_1])', ctx.user_stats.holds.total) %]
+                        </a>
+                    </div>
                     <div class="col-12">
-                     <a href="[% mkurl(ctx.opac_root _ '/myopac/ebook_circs') %]"
-                            title="[% l('View My Checked Out E-Items') %]">
-                            [% l("E-Items Currently Checked out") %] (<span id="acct_sum_ebook_circ_total">-</span>)
+                     <a href="[% mkurl(ctx.opac_root _ '/myopac/holds', {available => 1}) %]"
+                            title="[% l('View My Holds Ready for Pickup') %]">
+                            [% l('Items ready for pickup ([_1])', ctx.user_stats.holds.ready) %]
                         </a>
                     </div>
+                    <br><br>
+
                     <div class="col-12">
-                     <a href="[% mkurl(ctx.opac_root _ '/myopac/holds') %]"
-                            title="[% l('View My Holds') %]">
-                            [% l('Items Currently on Hold ([_1])', ctx.user_stats.holds.total) %]
+                     <a href="[% mkurl(ctx.opac_root _ '/myopac/ebook_circs') %]"
+                            title="[% l('View My Checked Out E-Items') %]">
+                            [% l("E-Items Currently Checked out") %] (<span id="acct_sum_ebook_circ_total">-</span>)
                         </a>
                     </div>
+                   
                     <div class="col-12">
                      <a href="[% mkurl(ctx.opac_root _ '/myopac/ebook_holds') %]"
                             title="[% l('View My E-Items On Hold') %]">
                             [% l("E-Items Currently on Hold") %] (<span id="acct_sum_ebook_hold_total">-</span>)
                         </a>
                     </div>
-                    <div class="col-12">
-                     <a href="[% mkurl(ctx.opac_root _ '/myopac/holds', {available => 1}) %]"
-                            title="[% l('View My Holds Ready for Pickup') %]">
-                            [% l('Items ready for pickup ([_1])', ctx.user_stats.holds.ready) %]
-                        </a>
-                    </div>
+                    
                     <div class="col-12">
                      <a href="[% mkurl(ctx.opac_root _ '/myopac/ebook_holds_ready') %]"
                             title="[% l('View My E-Items Ready for Pickup') %]">
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 3042aa8027..1b4420e1b5 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>
-                       <a href="#" title="Change the amount of items shown while viewing a 'My List'." data-toggle="tooltip">
+                       <span title="Change the amount of items shown while viewing a 'My List'." data-toggle="tooltip">
                         <i class="fas fa-question-circle"></i>
-                    </a>
+                    </span>
                     </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 a161d66e4a..5e749c10b0 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/advanced/search.tt2
@@ -41,7 +41,7 @@
                     [% IF adv_chunk.id != 'adv_copy_location_selector';%]
                         <div class="card-body">
                         <fieldset>
-                        <legend> [% adv_chunk.adv_label %]</legend>
+                        <legend class="sr-only"> [% adv_chunk.adv_label %]</legend>
                        [% END; %]  
                             [% IF adv_chunk.adv_attr;
                                         INCLUDE "opac/parts/check_value_selector.tt2"
@@ -66,14 +66,15 @@
     </div>       
          
     <!--Bottom Content (Library/Pub Year/Sort and Limit/Format Checkboxes -->
-    <div class="row">
+    <div class="row adv_options">
         [% FOR adv_chunk IN search.adv_config; NEXT IF adv_chunk.adv_hide || adv_chunk.adv_special == 'copy_location';%]                  
         [%	IF adv_chunk.adv_special;%]
-        <div class='col-md-4 col-sm-6 col-xs-12 pt-3'>
-            <div [% IF adv_chunk.js_only %] id='adv_chunk_[% adv_chunk.adv_special %]' class='hidden mx-auto' [%ELSE%] class='mx-auto' [% END %]>
-                <strong><label for="[% adv_chunk.id %]"> [% adv_chunk.adv_label %] </label></strong><br />
+        <div class='col-12 my-2'>
+            <div [% IF adv_chunk.js_only %] id='adv_chunk_[% adv_chunk.adv_special %]' class='hidden' [% END %]>
+                <strong><label for="[% adv_chunk.id %]"> [% adv_chunk.adv_label %] </label></strong>
                     [% IF adv_chunk.adv_special == "lib_selector"; PROCESS "opac/parts/org_selector.tt2"; INCLUDE build_org_selector show_loc_groups=1 id=adv_chunk.id %]
                     [% ELSIF adv_chunk.adv_special == "pub_year"; %]
+                    <div id='adv_special_block' class="text-center form-inline">
                             <select name='pubdate' class='form-control' id="[% adv_chunk.id %]" onchange='if(this.selectedIndex == 3) $("#adv_global_pub_date_2_span").removeClass("hide_me"); else $("#adv_global_pub_date_2_span").addClass("hide_me");'>
                             [%  FOR opt IN [
                                     {"code" => "is", "label" => l("Is")},
@@ -84,17 +85,25 @@
                             [%  END %]
                             </select>
                             
-                          
-                            <br/>
-                            <div id='adv_special_block' class="text-center">
+                            <div class="mx-3">
                                 <input title="[% l('Search date') %]" class='form-control' placeholder='Year'
                                   name='date1' type='text' size='4' maxlength='4' value="[% CGI.param('date1') | html %]" />
                                 <span id='adv_global_pub_date_2_span' class='[% CGI.param("pubdate") == "between" ? "" : "hide_me" %]'>
                                    [% l("AND") %] <input name='date2' class='form-control' placeholder='Year'
                                     title="[% l('Secondary search date') %]" type='text' size='4' maxlength='4' value="[% CGI.param('date2') | html %]" />
                                 </span>
+                                </div>
                             </div>
 
+                          
+                            
+                    [% ELSIF adv_chunk.adv_special == "sort_selector"; default_sort=ctx.default_sort;
+                    IF CGI.param('sort'); default_sort=CGI.param('sort'); END;
+                    INCLUDE "opac/parts/filtersort.tt2"
+                        id=adv_chunk.id
+                        value=default_sort class='results_header_sel form-control'; %]
+                         
+                            <div class="pt-5">
                             [% IF ctx.exclude_electronic_checkbox %]
                             <div class="adv_search_available">
                                 <input type='checkbox' name="fi:-search_format" value="electronic"
@@ -104,17 +113,9 @@
                                 <label for='opac.result.excludeelec'>
                                     [% l("Exclude Electronic Resources") %]
                                 </label>
-                            </div>a
+                            </div>
                             [% END %]
-                            
-                    [% ELSIF adv_chunk.adv_special == "sort_selector"; default_sort=ctx.default_sort;
-                    IF CGI.param('sort'); default_sort=CGI.param('sort'); END;
-                    INCLUDE "opac/parts/filtersort.tt2"
-                        id=adv_chunk.id
-                        value=default_sort class='results_header_sel form-control'; %]
-
-                            <div class="mt-5">
-                                [% IF NOT metarecords.disabled %]<br/>
+                                [% IF NOT metarecords.disabled %]
                                 <div>
                                     <input type='checkbox' name="modifier" value="metabib"
                                     [%- CGI.param('modifier').grep('metabib').size || search.metarecord_default ?
@@ -138,7 +139,6 @@
         [% END; %]
     [% END; %]
     </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"
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/css/colors.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/css/colors.tt2
index 5f48fcca0b..41d6f50498 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/css/colors.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/css/colors.tt2
@@ -29,7 +29,7 @@
         text = "black", # black 
         text_alert = "#c50202", # red
         text_attention = "#ffcc33", # pumpkin orange
-        text_badnews = "#f41d36", # cherry red
+        text_badnews = "#c50202", # cherry red
         text_goodnews = "#1dd93c", # lime green
         text_greatnews = "green", # green
         text_invert = "#fff", # white
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2
index 4fd5d71ef6..b11ac1c516 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2
@@ -39,10 +39,10 @@ END;
     [% IF (ctx.page == 'place_hold' || ctx.page == 'myopac' || ctx.page == 'home' || ctx.page == 'record') && search.metarecord_default %]
     <input type="hidden" name="modifier" value="metabib"/>
     [% END %]
-    <div class="container py-3">
+    <div class="m-5">
     <div class="row">
      <!--Keyword-->
-    	<div class="col-xs-12 col-sm-12 col-md-6 col-lg-3">
+    	<div class="col-xs-12 col-sm-12 col-lg-6 col-xl-3">
         <span class='search_box_wrapper'>
             [%- # autosuggest breaks accessibility, as the aria-label
                 # attribute is removed when the Dijit is created. :(  %]
@@ -64,7 +64,7 @@ END;
         </div>
         
         <!--Type-->
-        <div class="col-xs-12 col-sm-12 col-md-6 col-lg-3">
+        <div class="col-xs-12 col-sm-12 col-lg-6 col-xl-2">
         <label id="search_qtype_label" for="qtype" class="w-100">
         [%- 
             l('Type: ');
@@ -74,7 +74,7 @@ END;
         </div>
         
          <!--Format-->
-        <div class="col-xs-12 col-sm-12 col-md-6 col-lg-3">
+        <div class="col-xs-12 col-sm-12 col-lg-6 col-xl-2">
         <label id="search_itype_label" for="search_itype_selector" class="w-100">
         [%-
             l('Format: ');
@@ -94,7 +94,7 @@ END;
         </div>
         
          <!--Library-->
-        <div class="col-xs-12 col-sm-12 col-md-6 col-lg-3">
+        <div class="col-xs-12 col-sm-12 col-lg-6 col-xl-2">
         <label id="search_locg_label" for="search_org_selector" class="w-100">
         [%- 
             l('Library: ');
@@ -104,20 +104,21 @@ END;
         -%]
         </label>
         </div>
-      </div>
-      <div class="row">
-      <span class="mx-auto mt-3">
-        <input id="detail" type="hidden" name="detail_record_view" value="[% show_detail_view %]"/>
-        <button id='search-submit-go' type="submit" class="btn btn-opac m-2"
-            onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden";[% IF ctx.depth_sel_button AND NOT took_care_of_form %] $("search-submit-go-depth").className="hidden";[% END %]}, 2000)'><i class="fas fa-search"></i> [% l('Search') %]</button>
-        [%- IF ctx.depth_sel_button AND NOT took_care_of_form %]
-        <button id='search-submit-go-depth' type="submit" value="[% ctx.depth_sel_depth %]" name="depth" class="[% #ctx.depth_sel_button_class %] btn btn-opac m-2"
-            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"></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") %]'/>
-        </span>
+         <div class="col-xs-12 col-sm-12 col-lg-12 col-xl-3">
+            <div class="vertMid text-center">
+            <input id="detail" type="hidden" name="detail_record_view" value="[% show_detail_view %]"/>
+            <button id='search-submit-go' type="submit" class="btn btn-opac m-2"
+                onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden";[% IF ctx.depth_sel_button AND NOT took_care_of_form %] $("search-submit-go-depth").className="hidden";[% END %]}, 2000)'><i class="fas fa-search"></i> [% l('Search') %]</button>
+            [%- IF ctx.depth_sel_button AND NOT took_care_of_form %]
+            <button id='search-submit-go-depth' type="submit" value="[% ctx.depth_sel_depth %]" name="depth" class="[% #ctx.depth_sel_button_class %] btn btn-opac m-2"
+                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"></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") %]'/>
+            </div>
           
             </div>
+      </div>
+     
            
           
       
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 89005cab4b..9af65c6153 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2
@@ -46,13 +46,14 @@
       	</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']) %]">[% l('Messages') %]
+          <a class="nav-link  [% IF ctx.user_stats.messages.unread %] active [% END %]" href="[% mkurl(ctx.opac_root _ '/myopac/messages', {}, ['single', 'message_id']) %]">
                       [% IF ctx.user_stats.messages.unread %]
-                          <sup class="badge badge-danger">
+                          <span class="badge badge-danger" style="font-size:unset;">
                               [%- ctx.user_stats.messages.unread -%]
                               <span class="sr-only">[% l('unread') %]</span>
-                          </sup>
+                          </span>
                       [% END %]
+                      [% l('Messages') %]
             </a>
       	</li>
       	<!--My Account-->