From d23ef891fa721911574f6df360823ec08f5ba3e2 Mon Sep 17 00:00:00 2001
From: Jason Boyer <JBoyer@equinoxOLI.org>
Date: Thu, 6 Apr 2023 10:46:54 -0400
Subject: [PATCH] LP2015481: Re-align Labels for Circ History

Move Call number to the end of the Circ History table to match Items Out
and also correct the label order for narrow screen CSS.

Signed-off-by: Jason Boyer <JBoyer@equinoxOLI.org>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
---
 .../opac/myopac/circ_history.tt2                   |   36 ++++++++++----------
 1 files changed, 18 insertions(+), 18 deletions(-)

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 e18bdf5..5944e86 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2
@@ -56,11 +56,11 @@
                     <th>[% l("Cover") %]</th>
                     <th>[% sort_head("sort_title", l("Title")) %]</th>
                     <th>[% sort_head("author", l("Author")) %]</th>
-                    <th>[% sort_head("callnum", l("Call Number")) %]</th>
                     <th>[% sort_head("checkout", l("Checkout Date")) %]</th>
                     <th>[% sort_head("due", l("Due Date")) %]</th>
                     <th>[% sort_head("returned", l("Date Returned")) %]</th>
                     <th>[% sort_head("barcode", l("Barcode")) %]</th>
+                    <th>[% sort_head("callnum", l("Call Number")) %]</th>
                 </tr>
             </thead>
             <tbody>
@@ -173,23 +173,6 @@
                             [% END; %]
                         </td>
                         <td>
-                              [%-
-                                   cnlist = [];
-                                   FOREACH element IN [circ.circ.target_copy.call_number.prefix.label
-                                                circ.circ.target_copy.call_number.label
-                                                circ.circ.target_copy.call_number.suffix.label];
-                                       IF (element);
-                                         cnlist.push(element);
-                                       END;
-                                   END;
-                                   cn = cnlist.join(' ');
-                              %]
-                              [% cn | html %]
-                              [%- IF circ.circ.target_copy.parts.0.label %]
-                                    </BR>[% circ.circ.target_copy.parts.0.label | html -%]
-                              [%- END %]
-                        </td>
-                        <td>
                             [% date.format(ctx.parse_datetime(circ.circ.xact_start),DATE_FORMAT); %]
                         </td>
                         <td>
@@ -208,6 +191,23 @@
                             [% END %]
                         </td>
                         <td>[% circ.circ.target_copy.barcode | html %]</td>
+                        <td>
+                              [%-
+                                   cnlist = [];
+                                   FOREACH element IN [circ.circ.target_copy.call_number.prefix.label
+                                                circ.circ.target_copy.call_number.label
+                                                circ.circ.target_copy.call_number.suffix.label];
+                                       IF (element);
+                                         cnlist.push(element);
+                                       END;
+                                   END;
+                                   cn = cnlist.join(' ');
+                              %]
+                              [% cn | html %]
+                              [%- IF circ.circ.target_copy.parts.0.label %]
+                                    </BR>[% circ.circ.target_copy.parts.0.label | html -%]
+                              [%- END %]
+                        </td>
 
                     </tr>
                 [% END %]
-- 
1.7.2.5