From 6cb25c437f1cd52d4ba97db4902868af382582c1 Mon Sep 17 00:00:00 2001
From: Kyle Huckins <khuckins@catalyte.io>
Date: Tue, 30 Jan 2018 00:00:16 +0000
Subject: [PATCH] CAT-181 SCKO Wording Tweaks

- Change "Fees" to "Fines."
- Unbold Table Labels.
- Bold table contents.
- Add callnumber to Items ready for pickup.

Signed-off-by: Kyle Huckins <khuckins@catalyte.io>

 Changes to be committed:
	modified:   KCLS/openils/var/templates_kcls/circ/selfcheck/circ_page.tt2
	modified:   KCLS/openils/var/templates_kcls/circ/selfcheck/fines.tt2
	modified:   KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2
	modified:   KCLS/openils/var/templates_kcls/circ/selfcheck/holds_page.tt2
	modified:   Open-ILS/web/css/skin/kcls/selfcheck.css
	modified:   Open-ILS/web/js/ui/kcls/circ/selfcheck/selfcheck.js
---
 .../templates_kcls/circ/selfcheck/circ_page.tt2    | 12 ++++++------
 .../var/templates_kcls/circ/selfcheck/fines.tt2    | 10 +++++-----
 .../var/templates_kcls/circ/selfcheck/footer.tt2   |  2 +-
 .../templates_kcls/circ/selfcheck/holds_page.tt2   | 22 ++++++++++++----------
 Open-ILS/web/css/skin/kcls/selfcheck.css           |  5 ++++-
 .../web/js/ui/kcls/circ/selfcheck/selfcheck.js     |  1 +
 6 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/KCLS/openils/var/templates_kcls/circ/selfcheck/circ_page.tt2 b/KCLS/openils/var/templates_kcls/circ/selfcheck/circ_page.tt2
index 50c7301b40..4617a704f7 100644
--- a/KCLS/openils/var/templates_kcls/circ/selfcheck/circ_page.tt2
+++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/circ_page.tt2
@@ -32,13 +32,13 @@
           <table>
             <tr>
               <th rowspan="5"><input type="checkbox" name="renew_selector" class="oils-selfck-renewal-selector"></th>
-              <td class="scko-table-label">BARCODE:</td><td name="barcode"></td>
+              <td class="scko-table-label">BARCODE:</td><td class="scko-table-content" name="barcode"></td>
             </tr>
-            <tr><td class="scko-table-label">TITLE:</td><td name="title"></td></tr>
-            <tr><td class="scko-table-label">AUTHOR:</td><td name="author"></td></tr>
-            <tr><td class="scko-table-label">DUE DATE:</td><td name="due_date"></td></tr>
-            <tr><td class="scko-table-label">REMAINING RENEWALS:</td><td name="remaining_renewals"></td></tr>
-            <tr><td class="scko-table-label hideMe">FORMAT:</td><td class="hideMe" name="format"></td></tr>
+            <tr><td class="scko-table-label">TITLE:</td><td class="scko-table-content" name="title"></td></tr>
+            <tr><td class="scko-table-label">AUTHOR:</td><td class="scko-table-content" name="author"></td></tr>
+            <tr><td class="scko-table-label">DUE DATE:</td><td class="scko-table-content" name="due_date"></td></tr>
+            <tr><td class="scko-table-label">REMAINING RENEWALS:</td><td class="scko-table-content" name="remaining_renewals"></td></tr>
+            <tr><td class="scko-table-label hideMe">FORMAT:</td><td class="scko-table-content hideMe" name="format"></td></tr>
           </table>
         </td></tr>
       </tbody>
diff --git a/KCLS/openils/var/templates_kcls/circ/selfcheck/fines.tt2 b/KCLS/openils/var/templates_kcls/circ/selfcheck/fines.tt2
index b1e92856db..fe8aa4aa1d 100644
--- a/KCLS/openils/var/templates_kcls/circ/selfcheck/fines.tt2
+++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/fines.tt2
@@ -14,11 +14,11 @@
       <tbody id='oils-selfck-fines-tbody'>
         <tr id='oils-selfck-fines-row'><td>
             <table>
-              <tr><td class="scko-table-label">TITLE:</td><td name="title"></td></tr>
-              <tr class="dueDate"><td class="scko-table-label">DUE DATE:</td><td name="due_date"></td></tr>
-              <tr class="dateReturn"><td class="scko-table-label">DATE RETURN:</td><td name="date_return"></td></tr>
-              <tr class="billingType"><td class="scko-table-label">LAST CHARGE:</td><td name="btype"></td></tr>
-              <tr><td class="scko-table-label">BALANCE OWED:</td><td style="color:red;">$<span name="balance"></span></td></tr>
+              <tr><td class="scko-table-label">TITLE:</td><td class="scko-table-content" name="title"></td></tr>
+              <tr class="dueDate"><td class="scko-table-label">DUE DATE:</td><td class="scko-table-content" name="due_date"></td></tr>
+              <tr class="dateReturn"><td class="scko-table-label">DATE RETURN:</td><td class="scko-table-content" name="date_return"></td></tr>
+              <tr class="billingType"><td class="scko-table-label">LAST CHARGE:</td><td class="scko-table-content" name="btype"></td></tr>
+              <tr><td class="scko-table-label">BALANCE OWED:</td><td style="color:red;">$<span class="scko-table-content" name="balance"></span></td></tr>
             </table>
         </td></tr>
       </tbody>
diff --git a/KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2 b/KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2
index a67bac20fd..9b4ce90101 100644
--- a/KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2
+++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2
@@ -27,7 +27,7 @@
     <div class="col-xs-12 col-sm-3">
       <span id="sidebar_step3c">
         <a href="javascript:;" class="btn btn-primary scko-footer-btn"
-          id='oils-selfck-view-fines-link'>Fees</a>
+          id='oils-selfck-view-fines-link'>Fines</a>
       </span>
     </div>
   </div>
diff --git a/KCLS/openils/var/templates_kcls/circ/selfcheck/holds_page.tt2 b/KCLS/openils/var/templates_kcls/circ/selfcheck/holds_page.tt2
index e58a00265e..90c19f908b 100644
--- a/KCLS/openils/var/templates_kcls/circ/selfcheck/holds_page.tt2
+++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/holds_page.tt2
@@ -25,11 +25,13 @@
         </td></tr>
         <tr id='oils-selfck-rdy-row'><td>
           <table>
-            <tr><td class="scko-table-label scko-table-ready">TITLE:</td><td name="title" class="scko-table-ready"></td></tr>
-            <tr><td class="scko-table-label scko-table-ready">AUTHOR:</td><td name="author" class="scko-table-ready"></td></tr>
-            <tr><td class="scko-table-label scko-table-ready">STATUS:</td><td name="status" class="scko-table-ready"></td></tr>
+            <tr><td class="scko-table-label scko-table-ready">TITLE:</td><td name="title" class="scko-table-ready scko-table-content"></td></tr>
+            <tr><td class="scko-table-label scko-table-ready">AUTHOR:</td><td name="author" class="scko-table-ready scko-table-content"></td></tr>
+            <tr><td class="scko-table-label scko-table-ready">CALL NUMBER:</td>
+              <td name="call_number" class="scko-table-ready scko-table-content"></td>
+            <tr><td class="scko-table-label scko-table-ready">STATUS:</td><td name="status" class="scko-table-ready scko-table-content"></td></tr>
             <tr><td class="scko-table-label scko-table-ready">LOCATION:</td>
-              <td name="pickup_lib" class="scko-table-ready"></td>
+              <td name="pickup_lib" class="scko-table-ready scko-table-content"></td>
             </tr>
           </table>
         </td></tr>
@@ -47,9 +49,9 @@
       <tbody id='oils-selfck-hold-tbody'>
         <tr id='oils-selfck-hold-row'><td>
           <table>
-            <tr><td class="scko-table-label scko-table-holds">TITLE:</td><td name="title" class="scko-table-holds"></td></tr>
-            <tr><td class="scko-table-label scko-table-holds">AUTHOR:</td><td name="author" class="scko-table-holds"></td></tr>
-            <tr><td class="scko-table-label scko-table-holds">STATUS:</td><td name="status" class="scko-table-holds"></td></tr>
+            <tr><td class="scko-table-label scko-table-holds">TITLE:</td><td name="title" class="scko-table-holds scko-table-content"></td></tr>
+            <tr><td class="scko-table-label scko-table-holds">AUTHOR:</td><td name="author" class="scko-table-holds scko-table-content"></td></tr>
+            <tr><td class="scko-table-label scko-table-holds">STATUS:</td><td name="status" class="scko-table-holds scko-table-content"></td></tr>
           </table>
         </td></tr>
       </tbody>
@@ -66,9 +68,9 @@
       <tbody id='oils-selfck-suspended-tbody'>
         <tr id='oils-selfck-suspended-row'><td>
           <table>
-            <tr><td class="scko-table-label scko-table-suspended">TITLE:</td><td name="title" class="scko-table-suspended"></td></tr>
-            <tr><td class="scko-table-label scko-table-suspended">AUTHOR:</td><td name="author" class="scko-table-suspended"></td></tr>
-            <tr><td class="scko-table-label scko-table-suspended">STATUS:</td><td name="status" class="scko-table-suspended"></td></tr>
+            <tr><td class="scko-table-label scko-table-suspended">TITLE:</td><td name="title" class="scko-table-suspended scko-table-content"></td></tr>
+            <tr><td class="scko-table-label scko-table-suspended">AUTHOR:</td><td name="author" class="scko-table-suspended scko-table-content"></td></tr>
+            <tr><td class="scko-table-label scko-table-suspended">STATUS:</td><td name="status" class="scko-table-suspended scko-table-content"></td></tr>
           </table>
         </td></tr>
       </tbody>
diff --git a/Open-ILS/web/css/skin/kcls/selfcheck.css b/Open-ILS/web/css/skin/kcls/selfcheck.css
index 6c083719a4..4d6855b639 100644
--- a/Open-ILS/web/css/skin/kcls/selfcheck.css
+++ b/Open-ILS/web/css/skin/kcls/selfcheck.css
@@ -224,13 +224,16 @@ h2 {
 }
 
 .scko-table-label {
-    font-weight:bold;
     text-transform: uppercase;
     text-align: right;
     white-space:nowrap;
     padding-right:10px;
 }
 
+.scko-table-content {
+    font-weight:bold;
+}
+
 .checkout .item_table table td {
     border:none;
     width:100%;
diff --git a/Open-ILS/web/js/ui/kcls/circ/selfcheck/selfcheck.js b/Open-ILS/web/js/ui/kcls/circ/selfcheck/selfcheck.js
index 1b4c2b95cb..b6726ad309 100644
--- a/Open-ILS/web/js/ui/kcls/circ/selfcheck/selfcheck.js
+++ b/Open-ILS/web/js/ui/kcls/circ/selfcheck/selfcheck.js
@@ -944,6 +944,7 @@ SelfCheckManager.prototype.drawHolds = function(holds) {
             var row2 = this.readyTemplate.cloneNode(true);
             this.byName(row2, 'title').innerHTML = readyHolds[hold].mvr.title();
             this.byName(row2, 'author').innerHTML = readyHolds[hold].mvr.author();
+            this.byName(row2, 'call_number').innerHTML = readyHolds[hold].volume.label();
             this.byName(row2, 'status').innerHTML = "Ready for pickup";
             this.byName(row2, 'pickup_lib').innerHTML = 
                 fieldmapper.aou.findOrgUnit(
-- 
2.11.0