From 614c1b984e2e20696d96063e0c7574d26b355696 Mon Sep 17 00:00:00 2001
From: Garry Collum <gcollum@gmail.com>
Date: Fri, 5 Aug 2022 17:54:28 +0000
Subject: [PATCH] lp1979831 Logical order of copies in Opac

Moves the Shelving Location column in the Bootstrap opac to display before
the Call Number column.  So that there's a logical sequence of
Location - Shelving Location - Call Number - Part.

To test:
1. In the opac view a copy table and notice the Shelving Location is
displayed after the barcode.
2. Apply the patch.
3. The Shelving Location should now be displayed between the Location
and Call Number.

Signed-off-by: Garry Collum <gcollum@gmail.com>
---
 Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2      | 6 +++---
 Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2           | 6 +++---
 Open-ILS/src/templates-bootstrap/opac/parts/record/copy_table.tt2 | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2 b/Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2
index e8db387267..5664f30caa 100644
--- a/Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/css/mediaQuery.css.tt2
@@ -61,9 +61,9 @@ only screen and (max-width: 650px)  {
     .copyTable tr:nth-of-type(10):before { content: "Copy #10"; display: block; text-align:center;}
 
     .copyTable td:nth-of-type(1):before { content: "Library"; display: flex; }
-    .copyTable td:nth-of-type(2):before { content: "Call Number"; display: flex; }
-    .copyTable td:nth-of-type(3):before { content: "Barcode"; display: flex;}
-    .copyTable td:nth-of-type(4):before { content: "Shelving Location"; display: flex;}
+    .copyTable td:nth-of-type(2):before { content: "Shelving Location"; display: flex;}
+    .copyTable td:nth-of-type(3):before { content: "Call Number"; display: flex; }
+    .copyTable td:nth-of-type(4):before { content: "Barcode"; display: flex;}
     .copyTable td:nth-of-type(5):before { content: "Status"; display: flex;}
     .copyTable td:nth-of-type(6):before { content: "Due Date"; display: flex;}
     .copyTable td:nth-of-type(7):before { content: "[% l('Distance') %]"; display: flex;}
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 06c67ecac7..1ee238b148 100755
--- a/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
@@ -82,9 +82,9 @@ only screen and (max-width: 650px)  {
     .copyTable tr:nth-of-type(10):before { content: "Copy #10"; display: block; text-align:center;}
 
     .copyTable td:nth-of-type(1):before { content: "Library"; display: flex; }
-    .copyTable td:nth-of-type(2):before { content: "Call Number"; display: flex; }
-    .copyTable td:nth-of-type(3):before { content: "Barcode"; display: flex;}
-    .copyTable td:nth-of-type(4):before { content: "Shelving Location"; display: flex;}
+    .copyTable td:nth-of-type(2):before { content: "Shelving Location"; display: flex;}
+    .copyTable td:nth-of-type(3):before { content: "Call Number"; display: flex; }
+    .copyTable td:nth-of-type(4):before { content: "Barcode"; display: flex;}
     .copyTable td:nth-of-type(5):before { content: "Status"; display: flex;}
     .copyTable td:nth-of-type(6):before { content: "Due Date"; display: flex;}
     .copyTable td:nth-of-type(7):before { content: "[% l('Distance') %]"; display: flex;}
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 9d9251346e..372a58807e 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
@@ -89,12 +89,12 @@ IF has_copies or ctx.foreign_copies;
             [%- ELSE -%]
             <th scope='col'>[% l("Location") %]</th>
             [%- END %]
+            <th scope='col'>[% l("Shelving Location") %]</th>
             <th scope='col'>[% l("Call Number / Copy Notes") %]</th>
             [%- IF has_parts == 'true' %]
             <th scope='col'>[% l("Part") %]</th>
             [%- END %]
             <th scope='col'>[% l("Barcode") %]</th>
-            <th scope='col'>[% l("Shelving Location") %]</th>
             [%- IF ctx.is_staff || ctx.use_courses %]
             <th scope='col'>[% l("Circulation Modifier") %]</th>
             [%- END %]
@@ -129,9 +129,9 @@ IF has_copies or ctx.foreign_copies;
             </a>
         </li></ul>
     </td>
+    <td>[% bib.target_copy.location.name | html %]</td>
     <td>[% bib.target_copy.call_number.label | html %]</td>
     <td>[% bib.target_copy.barcode | html %]</td>
-    <td>[% bib.target_copy.location.name | html %]</td>
     <td>[% bib.target_copy.status.name | html %]</td>
     <td>[% date.format(ctx.parse_datetime(copy_info.due_date, copy_info.circ_circ_lib),DATE_FORMAT) %]</td>
     [%- IF ctx.geo_sort && ctx.has_valid_coords %]
@@ -166,6 +166,7 @@ END; # FOREACH bib
                 <link property="businessFunction" href="http://purl.org/goodrelations/v1#LeaseOut">
                 <meta property="price" content="0.00">
             </td>[% END %]
+            <td property="availableAtOrFrom">[%- INCLUDE "opac/parts/location_name_link.tt2"; -%]</td>
             <td><span property="sku">[% callnum | html %]</span> [% IF ctx.get_org_setting(CGI.param('loc')
                 OR ctx.aou_tree.id, 'sms.enable') == 1 %](<a href="[% mkurl(ctx.opac_root _ '/sms_cn',
                {copy_id => copy_info.id}) %];rec=[%- ctx.bre_id -%]" rel="nofollow" vocab="">Text</a>)[% END %]
@@ -224,7 +225,6 @@ END; # FOREACH bib
                     '<meta property="gtin13" content="' _ attrs.gtin13 _ '" />';
                 END; -%]
             </td>
-            <td property="availableAtOrFrom">[%- INCLUDE "opac/parts/location_name_link.tt2"; -%]</td>
             [% IF copy_info.courses.size > 0 || ctx.is_staff %]
             <td>[% copy_info.circ_modifier | html %]</td>
             [% ELSIF ctx.use_courses %]
-- 
2.11.0