From 51b98e0c61009feefea60cbd59cedd1a738f3d2a Mon Sep 17 00:00:00 2001 From: Kyle Huckins Date: Wed, 8 Mar 2017 14:43:55 -0800 Subject: [PATCH] CAT-112 Unified SCKO Refactor SCKO interface with bootstrap styling and scaffolding. Separate different portions of the interface out into their own files for readability. Refactor sidebar into bottom button bar. Remove pay fines front-end functionality. Remove unnecessary images. Replace images with newer, updated ones. Cleanup selfcheck.js. Add thank-you page with a 5-second timeout. Create scrollable tables in data itnerfaces. Convert tabs to spaces. Display message when there are no available holds. Center and style "Staff Login Required" text. Prevent Double-scan of Checkout barcodes. Doesn't show transactions in the fines list that have a negative balance. Doesn't show total balance owed. Separate Theme-based css information into selfcheck-default.css. Add High contrast theme css file. Signed-off-by: Kyle Huckins Signed-off-by: Victoria Lewis Changes to be committed: modified: KCLS/openils/var/templates_kcls/circ/selfcheck/banner.tt2 modified: KCLS/openils/var/templates_kcls/circ/selfcheck/circ_page.tt2 modified: KCLS/openils/var/templates_kcls/circ/selfcheck/fines.tt2 new file: KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2 modified: KCLS/openils/var/templates_kcls/circ/selfcheck/holds_page.tt2 modified: KCLS/openils/var/templates_kcls/circ/selfcheck/main.tt2 modified: KCLS/openils/var/templates_kcls/circ/selfcheck/patron_login.tt2 modified: KCLS/openils/var/templates_kcls/circ/selfcheck/summary.tt2 modified: Open-ILS/src/templates/base.tt2 new file: Open-ILS/web/css/skin/kcls/selfcheck-default.css new file: Open-ILS/web/css/skin/kcls/selfcheck-high-contrast.css modified: Open-ILS/web/css/skin/kcls/selfcheck.css deleted: Open-ILS/web/images/selfcheck/arrow.gif new file: Open-ILS/web/images/selfcheck/arrow.png new file: Open-ILS/web/images/selfcheck/kcls-logo.png new file: Open-ILS/web/images/selfcheck/libcard.jpg modified: Open-ILS/web/images/selfcheck/libcard_barcode.jpg modified: Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js modified: Open-ILS/web/js/ui/kcls/circ/selfcheck/selfcheck.js --- .../var/templates_kcls/circ/selfcheck/banner.tt2 | 18 +- .../templates_kcls/circ/selfcheck/circ_page.tt2 | 53 +- .../var/templates_kcls/circ/selfcheck/fines.tt2 | 49 +- .../var/templates_kcls/circ/selfcheck/footer.tt2 | 34 + .../templates_kcls/circ/selfcheck/holds_page.tt2 | 92 ++- .../var/templates_kcls/circ/selfcheck/main.tt2 | 393 +++++------- .../templates_kcls/circ/selfcheck/patron_login.tt2 | 51 +- .../var/templates_kcls/circ/selfcheck/summary.tt2 | 52 +- Open-ILS/src/templates/base.tt2 | 3 +- Open-ILS/web/css/skin/kcls/selfcheck-default.css | 136 ++++ .../web/css/skin/kcls/selfcheck-high-contrast.css | 253 ++++++++ Open-ILS/web/css/skin/kcls/selfcheck.css | 305 +++++---- Open-ILS/web/images/selfcheck/arrow.gif | Bin 366 -> 0 bytes Open-ILS/web/images/selfcheck/arrow.png | Bin 0 -> 17751 bytes Open-ILS/web/images/selfcheck/kcls-logo.png | Bin 0 -> 7519 bytes Open-ILS/web/images/selfcheck/libcard.jpg | Bin 0 -> 35408 bytes Open-ILS/web/images/selfcheck/libcard_barcode.jpg | Bin 6861 -> 16262 bytes Open-ILS/web/js/dojo/openils/circ/nls/selfcheck.js | 1 + .../web/js/ui/kcls/circ/selfcheck/selfcheck.js | 696 ++++++++++----------- 19 files changed, 1320 insertions(+), 816 deletions(-) create mode 100644 KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2 create mode 100644 Open-ILS/web/css/skin/kcls/selfcheck-default.css create mode 100644 Open-ILS/web/css/skin/kcls/selfcheck-high-contrast.css delete mode 100644 Open-ILS/web/images/selfcheck/arrow.gif create mode 100644 Open-ILS/web/images/selfcheck/arrow.png create mode 100644 Open-ILS/web/images/selfcheck/kcls-logo.png create mode 100644 Open-ILS/web/images/selfcheck/libcard.jpg diff --git a/KCLS/openils/var/templates_kcls/circ/selfcheck/banner.tt2 b/KCLS/openils/var/templates_kcls/circ/selfcheck/banner.tt2 index cda4866c91..a319f2a091 100644 --- a/KCLS/openils/var/templates_kcls/circ/selfcheck/banner.tt2 +++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/banner.tt2 @@ -1,10 +1,8 @@ -
-
- -
-
-
- -
-
- + \ No newline at end of file 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 868f5f9e35..13e5622d02 100644 --- a/KCLS/openils/var/templates_kcls/circ/selfcheck/circ_page.tt2 +++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/circ_page.tt2 @@ -1,30 +1,27 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - +
+
+
+ + Print List +
+
+ +
+
+
+
BarcodeTitleAuthorDue DateType
- - -
+ + +
+ + + + + + +
BARCODE:
TITLE:
AUTHOR:
DUE DATE:
FORMAT:
+
+
+ \ No newline at end of file diff --git a/KCLS/openils/var/templates_kcls/circ/selfcheck/fines.tt2 b/KCLS/openils/var/templates_kcls/circ/selfcheck/fines.tt2 index 0c270479ae..931efcce99 100644 --- a/KCLS/openils/var/templates_kcls/circ/selfcheck/fines.tt2 +++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/fines.tt2 @@ -1,26 +1,27 @@ - - -
- - - - - - - - - - - - - - - - - - - - - +
+
+
+ + Print List + +
+
+ +
+
+
+
TypeDetailsTotal BilledTotal PaidBalance Owed
+ + +
+ + + + + +
TITLE:
DUE DATE:
DATE RETURN:
BALANCE OWED:$
+
+
+ \ No newline at end of file diff --git a/KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2 b/KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2 new file mode 100644 index 0000000000..a67bac20fd --- /dev/null +++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/footer.tt2 @@ -0,0 +1,34 @@ + \ 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 333624948d..bcf67c7aaa 100644 --- a/KCLS/openils/var/templates_kcls/circ/selfcheck/holds_page.tt2 +++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/holds_page.tt2 @@ -1,20 +1,76 @@ -
- - - - - - - - - - - - - - - - - +
+
+
+
+
+ Print Ready for Pickup +
+
+ + Print Holds +
+
+
+
+
+
+
+
+
TitleAuthorStatus
+ + + + +
+ + +
There are currently no holds ready for pickup.
+
+ + + + +
TITLE:
AUTHOR:
STATUS:
+
+
+ + +
+
+
+
+
+ + + + +
+ + + + +
TITLE:
AUTHOR:
STATUS:
+
+
+
+ +
+
+
+
+
+ + + +
+ + + + +
TITLE:
AUTHOR:
STATUS:
+
+
+ + \ No newline at end of file diff --git a/KCLS/openils/var/templates_kcls/circ/selfcheck/main.tt2 b/KCLS/openils/var/templates_kcls/circ/selfcheck/main.tt2 index d70874cba2..390e3add05 100644 --- a/KCLS/openils/var/templates_kcls/circ/selfcheck/main.tt2 +++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/main.tt2 @@ -2,251 +2,198 @@ [% WRAPPER base.tt2 %] + + + + + -
+ sidebarLinks['sidebar_step3c'] = document.getElementById('sidebar_step3c'); + sidebarLinks['sidebar_step3d'] = document.getElementById('sidebar_step3d'); + sidebarLinks['sidebar_step3d'] = document.getElementById('sidebar_step3d2'); + sidebarLinks['sidebar_step3e'] = document.getElementById('sidebar_step3e'); + for(var i in pages) { if(!pages[i]) continue; pages[i].style.display="none"; } + for(var i in sidebarLinks) { if(!sidebarLinks[i]) continue; sidebarLinks[i].className=""; } + if(subpage) { + pages[subpage].style.display="block"; + sidebarLinks['sidebar_'+subpage].className="selected"; + } + pages[str].style.display="block"; + if(str=='step3' && !subpage) pages['step3a'].style.display="block"; + try{dojo.byId('selfckScanBox').focus();dojo.byId('selfckScanBox').select();}catch(e){} +} + +
+[% INCLUDE "circ/selfcheck/banner.tt2" %]
- +
+
+
+
- + - [% INCLUDE 'circ/selfcheck/audio_config.tt2' %] [% INCLUDE 'circ/selfcheck/logout_dialog.tt2' %] - -
Staff login required
- -
+ +
+
-[% END %] +[% END %] \ No newline at end of file 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 da65d791de..e1861dfa6c 100644 --- a/KCLS/openils/var/templates_kcls/circ/selfcheck/patron_login.tt2 +++ b/KCLS/openils/var/templates_kcls/circ/selfcheck/patron_login.tt2 @@ -1,7 +1,48 @@ -
Please login using your library barcode
-