JBAS-1981 SCKO Misc tweaks

Total/Session counts move to tab

Move the counts down into the checkouts tab so it's always visible.

SCKO label change Pickup -> Pick-up

JBAS-1984 SCKO Fines table extends horizontally

Remove unnecessary call to show() the fines tbody, since it
(unkowningly) changed the display attribute to 'block', breaking the
table flow.

JBAS-1984 SCKO Remove refs to undefined div

Avoid JS errors by avoiding attempts to dereference an undefined DOM
node with id 'oils-selfck-status-div3'.

JBAS-1984 SCKO Larger font-d option

JBAS-1984 SCKO unable to process message tweaks

Show original "unable to process item XYZ" message in non-batch checkout
and renewal mode.  Show generic see staff message for batch equivalents.

JBAS-1984 Bump high-contrast font sizes

JBAS-1984 More font tweaks for size d

JBAS-1984 SCKO bold item details during checkout

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 4617a70..aa6656f 100644 (file)
--- a/KCLS/openils/var/templates_kcls/circ/selfcheck/circ_page.tt2
+++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/circ_page.tt2
@@ -1,11 +1,5 @@
 <div class="row">
-  <div class="col-md-offset-2 col-xs-9 col-md-8">
-    <label>Items Checked Out</label>
-    <span style='padding-left: 10px'><b>Now: </b>
-      <span id='oils-selfck-circ-session-total'></span></span>
-    <span style='padding-left: 10px'><b>All: </b>
-      <span id='oils-selfck-circ-account-total'></span></span>
-  </div>
+  <div class="col-md-offset-4 col-xs-9 col-md-8"><label>Items Checked Out</label></div>
 </div>
 <div class="row">
   <div class="col-md-offset-1 col-md-5 pad-vert-btn">

diff --git a/KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2 b/KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2
index 9b4ce90..e78acc5 100644 (file)
--- a/KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2
+++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2
@@ -9,7 +9,13 @@
     <div class="col-xs-12 col-sm-3">
       <span id="sidebar_step3d2">
         <a href="javascript:;" class="btn btn-primary scko-footer-btn"
-          id='oils-selfck-items-out-details-link'>Your Check-outs</a>
+          id='oils-selfck-items-out-details-link'>
+          <div style="display:inline-block;">
+            Your Check-outs<br/>
+            Now: <span id='oils-selfck-circ-session-total'></span><br/>
+            All: <span id='oils-selfck-circ-account-total'></span>
+          </div>
+        </a>
       </span>
     </div>
     <div class="col-xs-12 col-sm-3">
@@ -19,7 +25,7 @@
           <div style="display:inline-block;">
             Your Holds<br/>
             <span id="oils-selfck-holds-total">0 Holds</span><br/>
-            <span id="oils-selfck-holds-ready">0</span> Ready for Pickup
+            <span id="oils-selfck-holds-ready">0</span> Ready for Pick-up
           </div>
         </a>
       </span>
@@ -31,4 +37,4 @@
       </span>
     </div>
   </div>
-</footer>
\ No newline at end of file
+</footer>

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 90c19f9..8a446fb 100644 (file)
--- a/KCLS/openils/var/templates_kcls/circ/selfcheck/holds_page.tt2
+++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/holds_page.tt2
@@ -3,7 +3,7 @@
 </div>
 <div class="row">
   <div class="col-md-offset-1 col-md-5 pad-vert-btn">
-    <a href="javascript:;" onclick="selfCheckMgr.printList('ready')" class="btn btn-success scko-action-btn">Print Ready for Pickup</a>
+    <a href="javascript:;" onclick="selfCheckMgr.printList('ready')" class="btn btn-success scko-action-btn">Print Ready for Pick-up</a>
   </div>
     <div class="col-xs-3 col-md-offset-1 col-md-5 pad-vert-btn">
     <a href="javascript:;" onclick="selfCheckMgr.printList('holds')" class="btn btn-success scko-action-btn">
@@ -12,7 +12,7 @@
 </div>
 <div class="scko-table">
 <div class="row">
-  <div class="col-md-12 text-center"><label class="scko-table-header">Items Ready for Pick-Up</label></div>
+  <div class="col-md-12 text-center"><label class="scko-table-header">Items Ready for Pick-up</label></div>
 </div>
 <div class="row">
   <div class="col-xs-12">
@@ -20,7 +20,7 @@
       <tbody id='oils-selfck-rdy-tbody'>
         <tr id='oils-selfck-noready'><td>
           <table>
-            <tr><td>There are currently no holds ready for pickup.</tr></td>
+            <tr><td>There are currently no holds ready for pick-up.</tr></td>
           </table>
         </td></tr>
         <tr id='oils-selfck-rdy-row'><td>

diff --git a/KCLS/openils/var/templates_kcls/circ/selfcheck/main.tt2 b/KCLS/openils/var/templates_kcls/circ/selfcheck/main.tt2
index f460ef9..f58c55e 100644 (file)
--- a/KCLS/openils/var/templates_kcls/circ/selfcheck/main.tt2
+++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/main.tt2
@@ -5,7 +5,10 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <link rel="stylesheet" href="[% ctx.media_prefix %]/js/ui/default/staff/build/css/bootstrap.min.css" />
 <link rel='stylesheet' type='text/css' href='[% ctx.media_prefix %]/css/skin/kcls/selfcheck.css'/>
+<!--
 <link rel='stylesheet' id="style" type='text/css' href='[% ctx.media_prefix %]/css/skin/kcls/selfcheck-default.css' title="default">
+-->
+<link rel='stylesheet' id="style" type='text/css' href='[% ctx.media_prefix %]/css/skin/kcls/selfcheck-font-d.css' title="default">
 <script src="[% ctx.media_prefix %]/js/ui/default/common/build/js/jquery.min.js"></script>
 
 <!-- Global site tag (gtag.js) - Google Analytics -->
@@ -144,7 +147,7 @@ function switchTo(str,subpage) {
           </div>
           <div class="row">
             <div class="col-md-5 pad-vert-btn">
-              <a href="javascript:;" class="btn btn-success scko-action-btn">Print Ready for Pickup</a>
+              <a href="javascript:;" class="btn btn-success scko-action-btn">Print Ready for Pick-up</a>
             </div>
               <div class="col-xs-3 col-md-5 pad-vert-btn">
               <a href="javascript:;" onclick="selfCheckMgr.printList('holds')" class="btn btn-success scko-action-btn">

diff --git a/KCLS/openils/var/templates_kcls/circ/selfcheck/patron_login.tt2 b/KCLS/openils/var/templates_kcls/circ/selfcheck/patron_login.tt2
index f556ad9..54d3b6a 100644 (file)
--- a/KCLS/openils/var/templates_kcls/circ/selfcheck/patron_login.tt2
+++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/patron_login.tt2
@@ -59,7 +59,7 @@
           <div class="col-md-offset-3 col-xs-6 pad-vert">
             <button id="scko-contrast-toggle-button" class="btn btn-lg btn-default btn-high-contrast"
             onclick="swapStyleSheet('[% ctx.media_prefix %]/css/skin/kcls/selfcheck-high-contrast.css',
-              '[% ctx.media_prefix %]/css/skin/kcls/selfcheck-default.css');"><span id="scko-contrast-toggle">Turn on High Contrast Mode</span></button>
+              '[% ctx.media_prefix %]/css/skin/kcls/selfcheck-font-d.css');"><span id="scko-contrast-toggle">Turn on High Contrast Mode</span></button>
           </div>
         </div>
       </div>

diff --git a/KCLS/openils/var/templates_kcls/circ/selfcheck/summary.tt2 b/KCLS/openils/var/templates_kcls/circ/selfcheck/summary.tt2
index acdec0e..727a7bc 100644 (file)
--- a/KCLS/openils/var/templates_kcls/circ/selfcheck/summary.tt2
+++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/summary.tt2
@@ -9,19 +9,30 @@
       <tbody id='oils-selfck-circ-tbody'>
         <tr id='oils-selfck-circ-row'><td>
           <table>
-            <tr><td class="scko-table-label" style="color:black">BARCODE:</td><td name="barcode"></td></tr>
-            <tr><td class="scko-table-label" style="color:black">TITLE:</td><td name="title"></td></tr>
-            <tr><td class="scko-table-label" style="color:black" nowrap="nowrap">DUE DATE:</td><td name="due_date"></td>
-            <td><div class="hideMe">
-                <div name='checkout' class='hidden'>Check out</div>
-                <div name='renew' class='hidden'>Renewal</div>
-              </div></td></tr>
-              <tr><td></tr></td>
-            </td></tr>
+            <tr>
+              <td class="scko-table-label" style="color:black">BARCODE:</td>
+              <td class="scko-table-content" name="barcode"></td>
+            </tr>
+            <tr>
+              <td class="scko-table-label" style="color:black">TITLE:</td>
+              <td class="scko-table-content" name="title"></td>
+            </tr>
+            <tr>
+              <td class="scko-table-label" style="color:black" nowrap="nowrap">DUE DATE:</td>
+              <td class="scko-table-content" name="due_date"></td>
+              <td class="scko-table-content">
+                <div class="hideMe">
+                  <div name='checkout' class='hidden'>Check out</div>
+                  <div name='renew' class='hidden'>Renewal</div>
+                </div>
+              </td>
+            </tr>
+            <!-- unsure why this is here, leaving for now -->
+            <tr><td></td><td></td> </tr>
           </table>
         </td></tr>
       </tbody>
     </table>
   </div>
 </div>
-</div>
\ No newline at end of file
+</div>

diff --git a/Open-ILS/web/css/skin/kcls/selfcheck-font-d.css b/Open-ILS/web/css/skin/kcls/selfcheck-font-d.css
new file mode 100644 (file)
index 0000000..abf5e04
--- /dev/null
+++ b/Open-ILS/web/css/skin/kcls/selfcheck-font-d.css
@@ -0,0 +1,141 @@
+/*
+       Basic Colors for Self-checkout interface
+ */
+html, body {
+    font-size: 26px;
+}
+a {
+    color: #003399;
+}
+
+label {
+    font-size:24px;
+}
+
+h1 {
+    font-size: 30px;
+}
+
+h2 {
+    font-size: 28px;
+}
+
+#header {
+    color: #bda964;
+}
+
+#main-content-scko h1 {
+    font-size: 28px;
+}
+
+#main-content-scko h1 {
+    font-size: 24px;
+}
+
+#main-content-scko li {
+    margin-top: 16px;
+}
+
+.navbar-scko {
+    background:#D2232A
+}
+
+.navbar-text-scko {
+    color:white;
+    font-size:29px;
+}
+
+.scko-container {
+    color: #585d5e;
+    font-size: 21px;
+    background-color: #FFF;
+}
+
+.scko-table-suspended {
+    color:#A8A8A8;
+}
+
+.btn-high-contrast {
+    color: #FFF;
+    background-color: #353535;
+    border-color: #ccc
+}
+
+.btn {
+    font-size: 22px;
+}
+
+
+.container-background {
+    background: #353535;
+}
+
+.checkout .header1 {
+    border-bottom:1px solid #a83135;
+}
+
+.checkout .userid {
+    border:2px solid black !important;
+}
+
+.checkout {
+    font-size:22px;
+}
+
+.checkout h1 {
+    font-size:28px;
+}
+
+.checkout h2 {
+    font-size:24px;
+}
+
+.checkout .userid {
+    font-size:26px;
+}
+
+.checkout .item_table td {
+    font-size:26px;
+    border:2px solid black;
+}
+
+.scko-table-striped>tbody>tr:nth-of-type(odd) {
+    background-color: #f3f3f3
+}
+
+.checkout .status_box {
+    color:red;
+}
+
+.checkout .oils-selfck-status-div {
+    color: blue;
+}
+
+.checkout_failure {
+    color: red !important;
+}
+@media screen and (min-width:768px) {
+    .scko-footer-btn {
+        background:-webkit-gradient(linear, left top, left bottom, color-stop(0.05, #008ec2), color-stop(1, #023a4f));
+        background:-moz-linear-gradient(top, #008ec2 5%, #023a4f 100%);
+        background:-webkit-linear-gradient(top, #008ec2 5%, #023a4f 100%);
+        background:-o-linear-gradient(top, #008ec2 5%, #023a4f 100%);
+        background:-ms-linear-gradient(top, #008ec2 5%, #023a4f 100%);
+        background:linear-gradient(to bottom, #008ec2 5%, #023a4f 100%);
+        font-size:24px;
+        filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#008ec2', endColorstr='#023a4f',GradientType=0);
+        background-color:#02729E;
+        color:#ffffff;
+        text-shadow:0px 1px 5px #000000;
+    }
+
+    .scko-footer-btn:hover {
+        background:-webkit-gradient(linear, left top, left bottom, color-stop(0.05, #023a4f), color-stop(1, #008ec2));
+        background:-moz-linear-gradient(top, #023a4f 5%, #008ec2 100%);
+        background:-webkit-linear-gradient(top, #023a4f 5%, #008ec2 100%);
+        background:-o-linear-gradient(top, #023a4f 5%, #008ec2 100%);
+        background:-ms-linear-gradient(top, #023a4f 5%, #008ec2 100%);
+        background:linear-gradient(to bottom, #023a4f 5%, #008ec2 100%);
+        background-color:#02729E;
+    }
+}

diff --git a/Open-ILS/web/css/skin/kcls/selfcheck-high-contrast.css b/Open-ILS/web/css/skin/kcls/selfcheck-high-contrast.css
index f8614a8..1745109 100644 (file)
--- a/Open-ILS/web/css/skin/kcls/selfcheck-high-contrast.css
+++ b/Open-ILS/web/css/skin/kcls/selfcheck-high-contrast.css
@@ -3,7 +3,7 @@
  */
 html, body {
     font-weight: 800;
-    font-size: 20px;
+    font-size: 28px;
 }
 
 a {
@@ -11,11 +11,11 @@ a {
 }
 
 h1 {
-    font-size: 24px;
+    font-size: 32px;
 }
 
 h2 {
-    font-size: 22px;
+    font-size: 30px;
 }
 
 input::-webkit-input-placeholder {
@@ -29,7 +29,7 @@ input::-moz-placeholder {
 }
 
 label {
-    font-size:18px;
+    font-size:26px;
 }
 
 .table {
@@ -55,11 +55,11 @@ label {
 }
 
 #main-content-scko h1 {
-    font-size: 22px;
+    font-size: 30px;
 }
 
 #main-content-scko h1 {
-    font-size: 18px;
+    font-size: 26px;
 }
 
 #main-content-scko li {
@@ -67,7 +67,7 @@ label {
 }
 
 .navbar-text-scko {
-    font-size:27px;
+    font-size:35px;
 }
 
 label {
@@ -125,7 +125,7 @@ label {
 
 .scko-container {
     color: #ffffff;
-    font-size: 15px;
+    font-size: 23px;
     background-color: #000000;
 }
 
@@ -175,19 +175,19 @@ label {
 }
 
 .checkout {
-    font-size:16px;
+    font-size:24px;
 }
 
 .checkout h1 {
-    font-size:22px;
+    font-size:30px;
 }
 
 .checkout h2 {
-    font-size:18px;
+    font-size:26px;
 }
 
 .checkout .userid {
-    font-size:18px;
+    font-size:26px;
 }
 
 .checkout .header1 {
@@ -199,7 +199,7 @@ label {
 }
 
 .checkout .item_table td {
-    font-size:18px;
+    font-size:26px;
     border:2px solid #ffffff;
 }
 
@@ -234,7 +234,7 @@ label {
         background:-o-linear-gradient(top, #008ec2 5%, #023a4f 100%);
         background:-ms-linear-gradient(top, #008ec2 5%, #023a4f 100%);
         background:linear-gradient(to bottom, #008ec2 5%, #023a4f 100%);
-        font-size:18px;
+        font-size:26px;
         filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#008ec2', endColorstr='#023a4f',GradientType=0);
         background-color:#02729E;
         color:#ffffff;
@@ -250,4 +250,4 @@ label {
         color:#008ec2 !important;
         border-bottom:0 !important;
     }
-}
\ No newline at end of file
+}

diff --git a/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js b/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js
index 0a9f2f1..41154ff 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js
+++ b/Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js
@@ -10,7 +10,8 @@
     "RENEW_SUCCESS" : "Renewal of item ${0} succeeded",
     "ALREADY_OUT" : "Item ${0} is already checked out",
     "OPEN_CIRCULATION_EXISTS" : "Item ${0} is already checked out to another user",
-    "GENERIC_CIRC_FAILURE" : "Unable to process some items. Please see staff.",
+    "GENERIC_CIRC_FAILURE" : "Unable to process item ${0}. Please see staff.",
+    "GENERIC_BATCH_CIRC_FAILURE" : "Please see staff.",
     "BATCH_RENEW_SUCCESS" : "Successfully renewed ${0} items",
     "BATCH_RENEW_FAILURE" : "Some items failed to renew.  Please see staff.",
     "LOGIN_FAILED" : "Login for ${0} failed",

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 bf11cd5..a3aba4d 100644 (file)
--- a/Open-ILS/web/js/ui/kcls/circ/selfcheck/selfcheck.js
+++ b/Open-ILS/web/js/ui/kcls/circ/selfcheck/selfcheck.js
@@ -198,7 +198,6 @@ SelfCheckManager.prototype.init = function() {
         'oils-selfck-hold-details-link' : function() { self.drawHoldsPage(); },
         'oils-selfck-view-fines-link' : function() {
             self.drawFinesPage();
-            openils.Util.show('oils-selfck-fines-tbody');
         },
         'oils-selfck-nav-logout' : function() { self.logoutPatron(); },
         'oils-selfck-nav-logout-print' : function() { self.logoutPatron(true); },
@@ -459,7 +458,7 @@ SelfCheckManager.prototype.handleAlert = function(message, shouldPopup, sound) {
     dojo.byId('oils-selfck-status-div').innerHTML = message;
     if(!this.patron){
         dojo.byId('oils-selfck-status-div2').innerHTML = message;
-        dojo.byId('oils-selfck-status-div3').innerHTML = message;
+        //dojo.byId('oils-selfck-status-div3').innerHTML = message;
     }
 
 
@@ -1373,8 +1372,15 @@ SelfCheckManager.prototype.handleXactResult = function(action, item, result, isB
 
                 if (!(displayText = this.failPartMessage(result))) {
                     if (action == 'checkout' || action == 'renew') {
-                        displayText = dojo.string.substitute(
-                            localeStrings.GENERIC_CIRC_FAILURE, [item]);
+                        if (isBatch) {
+                            // show generic 'see staff' message
+                            displayText = dojo.string.substitute(
+                                localeStrings.GENERIC_BATCH_CIRC_FAILURE);
+                        } else {
+                            // show item-specific error message
+                            displayText = dojo.string.substitute(
+                                localeStrings.GENERIC_CIRC_FAILURE, [item]);
+                        }
                     } else {
                         displayText = dojo.string.substitute(
                             localeStrings.UNKNOWN_ERROR, [result.textcode]);
@@ -1823,7 +1829,7 @@ function cancelLogin() {
     SelfCheckManager.fail_count = 0;
     dojo.byId('oils-selfck-status-div').innerHTML = '';
     dojo.byId('oils-selfck-status-div2').innerHTML = '';
-    dojo.byId('oils-selfck-status-div3').innerHTML = '';
+    //dojo.byId('oils-selfck-status-div3').innerHTML = '';
     dojo.byId('patron-login-password').value = '';
     switchTo('step1');
     try {