From: Bill Erickson Date: Fri, 9 Feb 2018 16:28:58 +0000 (-0500) Subject: JBAS-1981 SCKO Misc tweaks X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=18eff108ad0d4baa159fa30415428ba9de5f7a01;p=working%2FEvergreen.git 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 4617a704f7..aa6656ff56 100644 --- 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 @@
-
- - Now: - - All: - -
+
diff --git a/KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2 b/KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2 index 9b4ce90101..e78acc51ea 100644 --- a/KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2 +++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2 @@ -9,7 +9,13 @@
Your Check-outs + id='oils-selfck-items-out-details-link'> +
+ Your Check-outs
+ Now:
+ All: +
+
@@ -19,7 +25,7 @@
Your Holds
0 Holds
- 0 Ready for Pickup + 0 Ready for Pick-up
@@ -31,4 +37,4 @@
- \ No newline at end of file + 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 90c19f908b..8a446fb2bf 100644 --- 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 @@
- Print Ready for Pickup + Print Ready for Pick-up
@@ -12,7 +12,7 @@
-
+
@@ -20,7 +20,7 @@ - +
There are currently no holds ready for pickup.
There are currently no holds ready for pick-up.
diff --git a/KCLS/openils/var/templates_kcls/circ/selfcheck/main.tt2 b/KCLS/openils/var/templates_kcls/circ/selfcheck/main.tt2 index f460ef98d5..f58c55ee3d 100644 --- a/KCLS/openils/var/templates_kcls/circ/selfcheck/main.tt2 +++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/main.tt2 @@ -5,7 +5,10 @@ + + @@ -144,7 +147,7 @@ function switchTo(str,subpage) {
- Print Ready for Pickup + Print Ready for Pick-up
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 f556ad97e8..54d3b6a3c1 100644 --- 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 @@
+ '[% ctx.media_prefix %]/css/skin/kcls/selfcheck-font-d.css');">Turn on High Contrast Mode
diff --git a/KCLS/openils/var/templates_kcls/circ/selfcheck/summary.tt2 b/KCLS/openils/var/templates_kcls/circ/selfcheck/summary.tt2 index acdec0ec85..727a7bc004 100644 --- a/KCLS/openils/var/templates_kcls/circ/selfcheck/summary.tt2 +++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/summary.tt2 @@ -9,19 +9,30 @@ - - - - - - + + + + + + + + + + + + + + +
BARCODE:
TITLE:
DUE DATE:
- - -
BARCODE:
TITLE:
DUE DATE: +
+ + +
+
-
\ No newline at end of file + 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 index 0000000000..abf5e04c4c --- /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 f8614a8666..17451095c3 100644 --- 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 0a9f2f1823..41154ff77d 100644 --- 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 bf11cd57b9..a3aba4d25b 100644 --- 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 {