LP#1312297 remove selfcheck.xml legacy selfcheck
authorBill Erickson <berickxx@gmail.com>
Wed, 13 May 2015 18:25:48 +0000 (14:25 -0400)
committerJeff Godin <jgodin@tadl.org>
Wed, 19 Aug 2015 17:04:48 +0000 (13:04 -0400)
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>
Open-ILS/examples/apache/eg_vhost.conf.in
Open-ILS/examples/apache_24/eg_vhost.conf.in
Open-ILS/web/opac/extras/selfcheck/selfcheck.css [deleted file]
Open-ILS/web/opac/extras/selfcheck/selfcheck.js [deleted file]
Open-ILS/web/opac/extras/selfcheck/selfcheck.xml [deleted file]
Open-ILS/web/opac/extras/selfcheck/selfcheck_print.css [deleted file]

index 1144f4c..8530e6b 100644 (file)
@@ -538,22 +538,6 @@ RewriteRule .? - [E=locale:%{HTTP:Accept-Language}]
 </Location>
 
 # ----------------------------------------------------------------------------------
-# Selfcheck interface
-# ----------------------------------------------------------------------------------
-<LocationMatch .*/selfcheck.xml>
-    AuthType Basic
-    AuthName "Self-check Login"
-    PerlOptions +GlobalRequest
-    PerlSetVar OILSProxyPermissions "STAFF_LOGIN"
-    PerlAuthenHandler OpenILS::WWW::Proxy::Authen
-    require valid-user
-    Options +ExecCGI
-    PerlSendHeader On
-    allow from all
-</LocationMatch>
-
-
-# ----------------------------------------------------------------------------------
 # Reports GUI
 # ----------------------------------------------------------------------------------
 <LocationMatch /reports>
index 851db16..6e8980e 100644 (file)
@@ -537,21 +537,6 @@ RewriteRule .? - [E=locale:%{HTTP:Accept-Language}]
 </Location>
 
 # ----------------------------------------------------------------------------------
-# Selfcheck interface
-# ----------------------------------------------------------------------------------
-<LocationMatch .*/selfcheck.xml>
-    AuthType Basic
-    AuthName "Self-check Login"
-    PerlOptions +GlobalRequest
-    PerlSetVar OILSProxyPermissions "STAFF_LOGIN"
-    PerlAuthenHandler OpenILS::WWW::Proxy::Authen
-    Require valid-user
-    Options +ExecCGI
-    PerlSendHeader On
-</LocationMatch>
-
-
-# ----------------------------------------------------------------------------------
 # Reports GUI
 # ----------------------------------------------------------------------------------
 <LocationMatch /reports>
diff --git a/Open-ILS/web/opac/extras/selfcheck/selfcheck.css b/Open-ILS/web/opac/extras/selfcheck/selfcheck.css
deleted file mode 100644 (file)
index 3db3dd7..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-.hide_me {
-    visibility: hidden;
-    display: none;
-}
-table { border-collapse:collapse; }
-body { font-size: 12pt; }
-.container:after {content: ""; display: block; height: 0; clear: both; }
-
-.biglabel {
-    font-size: 13pt;
-    margin: 5px;
-}
-
-.selfck-link-span {
-    padding: 2px 4px 2px 4px;
-}
-
-#selfck-items-out-table {
-    width: 100%;
-}
-.form_div {
-    width:100%;
-}
-.form_div span {
-    padding: 5px;
-}
-
-#selfck-item-barcode-form {
-    margin-top:20px;
-}
-#selfck-items-out-table thead td {
-    font-weight: bold;
-}
-#selfck-items-out-table thead tr {
-    border-bottom: 2px solid #808080;
-}
-#selfck-items-out-table {
-    margin-top: 20px;
-}
-#selfck-items-out-tbody td { 
-    padding: 4px 0px 4px 0px;
-}
-#selfck-items-out-tbody tr { 
-    border-bottom: 1px solid #808080;
-}
-#selfck-pic-cell { width: 43px;}
-.jacket { height: 50px; width: 40px;  border: none;}
-
-#selfck-logout-div {
-    width: 100%;
-    margin: 0px 0px 0px 0px;
-    padding: 3px;
-    /*border-bottom:2px solid #e0f0e0;*/
-    text-align: right;
-}
-
-#selfck-patron-info-div {
-    text-align: left;
-    float:left;
-}
-#selfck-logout-link-div {
-    text-align: right;
-    float:right;
-}
-
-#selfck-message-div {
-    border: 1px solid #e0f0e0;
-    height: 1.5em;
-    overflow: auto;
-    margin-bottom: 20px;
-}
-#selfck-item-barcode-form-div {
-    text-align: center;
-}
-
-.print {
-    display: none;
-    visibility: hidden;
-}
-.noprint {
-    display: block;
-    visibility: visible;
-}
-#selfck-items-out-done-div {
-    width: 100%;
-    text-align: center;
-    margin-top: 20px;
-}
-
-.selfck-done-link {
-    font-size: 12pt;
-    font-weight: bold;
-}
-
-#selfck-print-queuing {
-    font-size: 110%;
-    border: 2px solid #808080;
-    width: 100%;
-    text-align: center;
-    padding: 10px;
-    margin: 5px;
-}
diff --git a/Open-ILS/web/opac/extras/selfcheck/selfcheck.js b/Open-ILS/web/opac/extras/selfcheck/selfcheck.js
deleted file mode 100644 (file)
index d1b9f08..0000000
+++ /dev/null
@@ -1,504 +0,0 @@
-/* -----------------------------------------------------------------
-* Copyright (C) 2008  Equinox Software, Inc.
-* Bill Erickson <erickson@esilibrary.com>
-* 
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
-* 02110-1301, USA
------------------------------------------------------------------ */
-
-var STAFF_SES_PARAM = 'ses';
-var PATRON_BARCODE_COOKIE = 'pbcc';
-var patron = null
-var itemBarcode = null;
-var itemsOutTemplate = null;
-var isRenewal = false;
-var pendingXact = false;
-var patronTimeout = 600000; /* 10 minutes */
-var timerId = null;
-var printWrapper;
-var printTemplate;
-var successfulItems = {};
-var scanTimeout = 800;
-var scanTimeoutId;
-var patronBarcodeRegex;
-var orgUnit;
-var orgUnitAddress;
-var orgUnitHours;
-var alertOnCheckoutEvent = false;
-var overrideCircEvents = [];
-var SET_PATRON_TIMEOUT = 'circ.selfcheck.patron_login_timeout';
-var SET_BARCODE_REGEX = 'opac.barcode_regex';
-var SET_ALERT_ON_CHECKOUT_EVENT = 'circ.selfcheck.alert_on_checkout_event';
-var SET_AUTO_OVERRIDE_EVENTS = 'circ.selfcheck.auto_override_checkout_events';
-
-
-function selfckInit() {
-    dojo.require('dojo.cookie');
-    var cgi = new CGI();
-    var staff = grabUser(dojo.cookie(STAFF_SES_PARAM) || cgi.param(STAFF_SES_PARAM));
-
-    selfckSetupPrinter();
-
-    orgUnit = findOrgUnitSN(cgi.param('l')) || globalOrgTree;
-    selfckFetchOrgDetails();
-
-    // fetch the relevent org-unit setting
-    var settings = fetchBatchOrgSetting(orgUnit.id(), 
-        [SET_PATRON_TIMEOUT, SET_BARCODE_REGEX, SET_ALERT_ON_CHECKOUT_EVENT, SET_AUTO_OVERRIDE_EVENTS]);
-    if(settings[SET_PATRON_TIMEOUT])
-        patronTimeout = parseInt(settings[SET_PATRON_TIMEOUT].value) * 1000;
-    if(settings[SET_BARCODE_REGEX])
-        patronBarcodeRegex = new RegExp(settings[SET_BARCODE_REGEX].value);
-    if(settings[SET_ALERT_ON_CHECKOUT_EVENT])
-        alertOnCheckoutEvent = (settings[SET_ALERT_ON_CHECKOUT_EVENT].value) ? true : false;
-    if(settings[SET_AUTO_OVERRIDE_EVENTS])
-        overrideCircEvents = settings[SET_AUTO_OVERRIDE_EVENTS].value;
-
-    if(!staff) {
-        // should not happen when behind the proxy
-        return alert('Staff must login');
-    }
-
-    unHideMe($('selfck-patron-login-container'));
-    $('selfck-patron-login-input').focus();
-
-    $('selfck-patron-login-input').onkeypress = function(evt) {
-        if(userPressedEnter(evt)) 
-            selfckPatronLogin();
-    };
-
-    $('selfck-item-barcode-input').onkeypress = selfckItemBarcodeKeypress;
-
-    // for debugging, allow passing the user barcode via param
-    var urlbc = new CGI().param('patron');
-    if(urlbc)
-        selfckPatronLogin(urlbc);
-
-    selfckStartTimer();
-
-    printWrapper = $('selfck-print-items-list');
-    printTemplate = printWrapper.removeChild($n(printWrapper, 'selfck-print-items-template'));
-    itemsOutTemplate = $('selfck-items-out-tbody').removeChild($('selfck-items-out-row'));
-
-    selfckTryPatronCookie();
-
-//    selfckMkDummyCirc(); // testing only
-    
-}
-
-function selfckFetchOrgDetails() {
-    var hreq = new Request('open-ils.actor:open-ils.actor.org_unit.hours_of_operation.retrieve', G.user.session, orgUnit.id());
-    hreq.callback(function(r) { orgUnitHours = r.getResultObject(); });
-    hreq.send();
-
-    var areq = new Request('open-ils.actor:open-ils.actor.org_unit.address.retrieve', orgUnit.mailing_address());
-    areq.callback(function(r) { orgUnitAddress = r.getResultObject(); });
-    areq.send();
-}
-
-function selfckSetupPrinter() {
-    try { // Mozilla only
-               netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead");
-        netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-        netscape.security.PrivilegeManager.enablePrivilege('UniversalPreferencesRead');
-        netscape.security.PrivilegeManager.enablePrivilege('UniversalPreferencesWrite');
-        var pref = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
-        if (pref)
-            pref.setBoolPref('print.always_print_silent', true);
-    } catch(E) {
-        
-    }
-}
-
-function selfckTryPatronCookie() {
-    var pb = dojo.cookie(PATRON_BARCODE_COOKIE);
-    if(pb) {
-        dojo.cookie(PATRON_BARCODE_COOKIE, null, {'expires':-1});
-        $('selfck-patron-login-input').value = pb;
-        selfckPatronLogin();
-    }
-}
-
-
-function selfckItemBarcodeKeypress(evt) {
-    if(userPressedEnter(evt)) {
-        clearTimeout(scanTimeoutId);
-        selfckCheckout();
-    } else {
-        /*  If scanTimeout milliseconds have passed and there is
-            still data in the input box, it's a likely indication
-            of a partial scan. Select the text so the next scan
-            will replace the value */
-        clearTimeout(scanTimeoutId);
-        scanTimeoutId = setTimeout(
-            function() {
-                if($('selfck-item-barcode-input').value) {
-                    $('selfck-item-barcode-input').select();
-                }
-            },
-            scanTimeout
-        );
-    }
-}
-
-/*
- * Start the logout timer
- */
-function selfckStartTimer() {
-    timerId = setTimeout(
-        function() {
-            selfckLogoutPatron();
-        },
-        patronTimeout
-    );
-
-}
-
-/*
- * Reset the logout timer
- */
-function selfckResetTimer() {
-    clearTimeout(timerId);
-    selfckStartTimer();
-}
-
-/*
- * Clears fields and "logs out" the patron by reloading the page
- */
-function selfckLogoutPatron() {
-    $('selfck-item-barcode-input').value = ''; // prevent browser caching
-    $('selfck-patron-login-input').value = '';
-    if(patron) {
-        var numItems = selfckPrint();
-        var sleepTime = 1000;
-        if(numItems > 0) sleepTime += (numItems / 2) * 1000;
-        setTimeout(
-            function() { location.href = location.href; },
-            sleepTime // give the browser time to send the page to the printer
-        );
-    }
-}
-
-/*
- * Fetches the user by barcode and displays the item barcode input
- */
-
-function selfckPatronLogin(barcode) {
-    barcode = barcode || $('selfck-patron-login-input').value;
-    if(!barcode) return;
-
-    var bcReq = new Request(
-        'open-ils.actor:open-ils.actor.user.fleshed.retrieve_by_barcode',
-        G.user.session, barcode);
-
-       bcReq.request.alertEvent = false;
-
-    bcReq.callback(function(r) {
-        patron = r.getResultObject();
-        if(checkILSEvent(patron)) {
-            if(patron.textcode == 'ACTOR_USER_NOT_FOUND') {
-                unHideMe($('selfck-patron-not-found'));
-                $('selfck-patron-login-input').select();
-                return;
-            }
-
-            if(patron.textcode == 'NO_SESSION') 
-                return selfckLogoutStaff();
-
-            return alert(patron.textcode);
-        }
-
-        if(!isTrue(patron.active())) {
-            unHideMe($('selfck-patron-not-found'));
-            $('selfck-patron-login-input').select();
-            return;
-        }
-        for (var i =0; i < patron.cards().length; i++) {
-            if (patron.cards()[i].barcode() == barcode) {
-                if (!isTrue(patron.cards()[i].active())) {
-                    unHideMe($('selfck-patron-not-found'));
-                    $('selfck-patron-login-input').select();
-                    return;
-                }
-            }
-        }
-
-        $('selfck-patron-login-input').value = ''; // reset the input
-        hideMe($('selfck-patron-login-container'));
-        unHideMe($('selfck-patron-checkout-container'));
-        $('selfck-patron-name-span').appendChild(text(patron.usrname()));
-        $('selfck-item-barcode-input').focus();
-    });
-
-    bcReq.send();
-}
-
-function selfckLogoutStaff() {
-    dojo.cookie(STAFF_SES_PARAM,null,{'expires':-1});
-    location.reload(true);
-}
-
-/**
-  * If a user barcode was scanned into the item barcode
-  * input, log out the current user and log in the new user
-  */
-function selfckCheckPatronBarcode(itemBc) {
-    if(patronBarcodeRegex) {
-        if(itemBc.match(patronBarcodeRegex)) {
-            dojo.cookie(PATRON_BARCODE_COOKIE, itemBc);
-            selfckLogoutPatron();
-            return true;
-        }
-    }
-    return false;
-}
-
-/**
-  * Sends the checkout request
-  */
-function selfckCheckout(override) {
-    if(pendingXact) return;
-    selfckResetTimer();
-    pendingXact = true;
-    isRenewal = false;
-
-    removeChildren($('selfck-event-time'));
-    removeChildren($('selfck-event-span'));
-
-    itemBarcode = $('selfck-item-barcode-input').value;
-    if(!itemBarcode) return;
-
-    if(selfckCheckPatronBarcode(itemBarcode))
-        return;
-
-    if (itemBarcode in successfulItems) {
-        selfckShowMsgNode({textcode:'dupe-barcode'});
-        $('selfck-item-barcode-input').select();
-        pendingXact = false;
-        return;
-    }
-
-    var coReq = new Request(
-        'open-ils.circ:open-ils.circ.checkout.full' + ((override) ? '.override' : ''),
-        G.user.session, {patron_id:patron.id(), copy_barcode:itemBarcode});
-
-       coReq.request.alertEvent = false;
-    coReq.callback(selfckHandleCoResult);
-    coReq.send();
-}
-
-/**
-  * Handles the resulting event.  If the item is already checked out,
-  * attempts renewal.  Any other events will display a message
-  */
-function selfckHandleCoResult(r) {
-    var evt;
-
-    try {
-        evt = r.getResultObject();
-    } catch(E) {
-        pendingXact = false;
-        selfckShowMsgNode({textcode:'UNKNOWN'});
-        appendClear($('selfck-errors'), text(E.toString()));
-        return;
-    }
-
-    if(evt.textcode == 'SUCCESS') {
-        selfckDislplayCheckout(evt);
-        selfckShowMsgNode(evt);
-        successfulItems[itemBarcode] = 1;
-
-    } else if(evt.textcode == 'OPEN_CIRCULATION_EXISTS') {
-        selfckRenew();
-
-    } else if(evt.textcode == 'NO_SESSION') {
-        
-        return selfckLogoutStaff();
-
-    } else {
-        pendingXact = false;
-
-        if(!evt.length) evt = [evt];
-        if(overrideCircEvents.length) {
-
-            // see if the events we received are all in the list of 
-            // events to override
-            var override = true;
-            for(var i = 0; i < evt.length; i++) {
-                var match = overrideCircEvents.filter(
-                    function(e) { return (e == evt[i].textcode); })[0];
-                if(!match) {
-                    override = false;
-                    break;
-                }
-            }
-
-            if(override)
-                return selfckCheckout(true);
-        }
-
-        selfckShowMsgNode(evt);
-        $('selfck-item-barcode-input').select();
-    }
-}
-
-/**
-  * Display event text in the messages block
-  */
-function selfckShowMsgNode(evt) {
-    var code = evt.textcode;
-    var msgspan = $('selfck-event-span');
-
-    // if we're not explicitly handling the event, just say "copy cannot circ"
-    if(!$('selfck-event-' + code)) 
-        code = 'COPY_CIRC_NOT_ALLOWED';
-
-    appendClear($('selfck-event-time'), text(new Date().toLocaleString()));
-    appendClear($('selfck-event-span'), text($('selfck-event-' + code).innerHTML));
-
-    if(code != 'SUCCESS' && alertOnCheckoutEvent)
-        alert($('selfck-event-' + code).innerHTML);
-}
-
-/**
-  * Renders a row in the checkouts table for the current circulation
-  */
-function selfckDislplayCheckout(evt) {
-    unHideMe($('selfck-items-out-table-wrapper'));
-
-    var template = itemsOutTemplate.cloneNode(true);
-    var copy = evt.payload.copy;
-    var record = evt.payload.record;
-    var circ = evt.payload.circ;
-
-    if(record.isbn()) {
-           var pic = $n(template, 'selfck.jacket');
-           pic.setAttribute('src', '../ac/jacket/small/'+cleanISBN(record.isbn()));
-    }
-    $n(template, 'selfck.barcode').appendChild(text(copy.barcode()));
-    $n(template, 'selfck.title').appendChild(text(record.title()));
-    $n(template, 'selfck.author').appendChild(text(record.author()));
-    $n(template, 'selfck.due_date').appendChild(text(circ.due_date().replace(/T.*/,'')));
-    $n(template, 'selfck.remaining').appendChild(text(circ.renewal_remaining()));
-    if(isRenewal) {
-        hideMe($n(template, 'selfck.cotype_co'));
-        unHideMe($n(template, 'selfck.cotype_rn'));
-    }
-
-    var tbody = $('selfck-items-out-tbody');
-    tbody.insertBefore(template, tbody.getElementsByTagName('tr')[0]);
-    $('selfck-item-barcode-input').value = '';
-
-
-    // flesh out the printable version of the page as well
-    var ptemplate = printTemplate.cloneNode(true);
-    $n(ptemplate, 'title').appendChild(text(record.title()));
-    $n(ptemplate, 'barcode').appendChild(text(copy.barcode()));
-    $n(ptemplate, 'due_date').appendChild(text(circ.due_date().replace(/T.*/,'')));
-    printWrapper.insertBefore(ptemplate, printWrapper.getElementsByTagName('li')[0]);
-
-    pendingXact = false;
-}
-
-/**
-  * Checks to see if this item is checked out to the current patron.  If so, 
-  * this sends the renewal request.
-  */
-function selfckRenew() {
-
-    // first, make sure the item is checked out to this patron
-    var detailReq = new Request(
-        'open-ils.circ:open-ils.circ.copy_details.retrieve.barcode',
-        G.user.session, itemBarcode);
-
-    detailReq.callback(
-        function(r) {
-            var details = r.getResultObject();
-            if(details.circ.usr() == patron.id()) {
-                // OK, this is our item, renew it
-                isRenewal = true;
-                var rnReq = new Request(
-                    'open-ils.circ:open-ils.circ.renew',
-                    G.user.session, {copy_barcode:itemBarcode});
-                rnReq.request.alertEvent = false;
-                rnReq.callback(selfckHandleCoResult);
-                rnReq.send();
-            } else {
-                pendingXact = false;
-                selfckShowMsgNode({textcode:'already-out'});
-            }
-        }
-    );
-
-    detailReq.send();
-}
-
-/**
-  * Sets the print date and prints the page
-  */
-function selfckPrint() {
-
-    var numItems = 0;
-    for(var x in successfulItems)  
-        numItems++;
-
-    if(numItems > 0) {
-        hideMe($('selfck-patron-checkout-container'));
-        unHideMe($('selfck-print-queuing'));
-        appendClear($('selfck-print-date'), text(new Date().toLocaleString()));
-        appendClear($('selfck-print-lib-name'), text(orgUnit.name()));
-        if(orgUnitAddress) {
-            appendClear($('selfck-print-lib-addr-street'), text(orgUnitAddress.street1()+' '+orgUnitAddress.street2()));
-            appendClear($('selfck-print-lib-addr-city'), text(orgUnitAddress.city()));
-            appendClear($('selfck-print-lib-addr-state'), text(orgUnitAddress.state()));
-            appendClear($('selfck-print-lib-addr-post-code'), text(orgUnitAddress.post_code()));
-        }
-        appendClear($('selfck-print-lname'), text(patron.family_name()));
-        appendClear($('selfck-print-fname'), text(patron.first_given_name()));
-        appendClear($('selfck-print-lib-phone'), text(orgUnit.phone()));
-        if(orgUnitHours) {
-            for(var i in [0, 1, 2, 3, 4, 5, 6]) {
-                appendClear($('selfck-print-dow_'+i+'_open'), text(orgUnitHours['dow_'+i+'_open']()));
-                appendClear($('selfck-print-dow_'+i+'_close'), text(orgUnitHours['dow_'+i+'_close']()));
-            }
-        }
-        window.print();
-    }
-
-    return numItems;
-}
-
-
-/**
-  * Test method for generating dummy data in the checkout tables
-  */
-function selfckMkDummyCirc() {
-    unHideMe($('selfck-items-out-table'));
-
-    var template = itemsOutTemplate.cloneNode(true);
-    $n(template, 'selfck.barcode').appendChild(text('123456789'));
-    $n(template, 'selfck.title').appendChild(text('Test Title'));
-    $n(template, 'selfck.author').appendChild(text('Test Author'));
-    $n(template, 'selfck.due_date').appendChild(text('2008-08-01'));
-    $n(template, 'selfck.remaining').appendChild(text('1'));
-    $('selfck-items-out-tbody').appendChild(template);
-
-    // flesh out the printable version of the page as well
-    var ptemplate = printTemplate.cloneNode(true);
-    $n(ptemplate, 'title').appendChild(text('Test Title'));
-    $n(ptemplate, 'barcode').appendChild(text('123456789'));
-    $n(ptemplate, 'due_date').appendChild(text('2008-08-01'));
-    printWrapper.appendChild(ptemplate);
-}
diff --git a/Open-ILS/web/opac/extras/selfcheck/selfcheck.xml b/Open-ILS/web/opac/extras/selfcheck/selfcheck.xml
deleted file mode 100644 (file)
index d78f05e..0000000
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ***********************************************************************
-* Copyright (C) 2008  Equinox Software, Inc.
-* Bill Erickson <erickson@esilibrary.com>
-* 
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
-* 02110-1301, USA
-************************************************************************ -->
-
-<!DOCTYPE html PUBLIC 
-       "-//W3C//DTD XHTML 1.0 Transitional//EN" 
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" [
-       <!--#include virtual="/opac/locale/${locale}/opac.dtd" -->
-]>
-
-<!--#include virtual="../../skin/default/xml/setenv.xml"-->
-
-<html xmlns='http://www.w3.org/1999/xhtml'>
-
-    <head>
-       <script type="text/javascript" src='/js/dojo/dojo/dojo.js'></script>
-
-        <script language='javascript' type='text/javascript' 
-            src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/utils.js'></script>
-           <script language='javascript' type='text/javascript' 
-            src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/config.js'></script>
-           <script language='javascript' type='text/javascript' 
-            src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/CGI.js'></script>
-           <script language='javascript' type='text/javascript' 
-            src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/md5.js'></script>
-        <script language='javascript' type='text/javascript' 
-            src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/JSON_v1.js'></script>
-        <script language='javascript' type='text/javascript' 
-            src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/fmcore.js'></script>
-        <script language='javascript' type='text/javascript' 
-            src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/fmgen.js'></script>
-        <script language='javascript' type='text/javascript' 
-            src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/opac_utils.js'></script>
-        <script language='javascript' type='text/javascript' 
-            src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/<!--#echo var="locale"-->/OrgTree.js'></script>
-        <script language='javascript' type='text/javascript' 
-            src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/OrgLasso.js'></script>
-        <script language='javascript' type='text/javascript' 
-            src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/org_utils.js'></script>
-        <script language='javascript' type='text/javascript' 
-            src='<!--#echo var="OILS_OPAC_JS_HOST"-->/common/js/RemoteRequest.js'></script>
-        <script language='javascript' type='text/javascript' 
-            src='<!--#echo var="OILS_OPAC_JS_HOST"-->/extras/selfcheck/selfcheck.js'></script>
-        <link type='text/css' rel='stylesheet' title='Regular'
-            href="<!--#echo var='OILS_OPAC_CSS_HOST'-->/extras/selfcheck/selfcheck.css"/>
-        <link type='text/css' rel='stylesheet' media='print'
-            href="<!--#echo var='OILS_OPAC_CSS_HOST'-->/extras/selfcheck/selfcheck_print.css"/>
-        <link type='text/css' rel='alternate stylesheet' title='Printable'
-            href="<!--#echo var='OILS_OPAC_CSS_HOST'-->/extras/selfcheck/selfcheck_print.css"/>
-    </head>
-
-    <body onload='selfckInit();'>
-
-        <div class='noprint'>
-
-            <!--***********************************************************************
-                Form for patron "login"
-                *********************************************************************** -->
-            <div id='selfck-patron-login-container' class='hide_me form_div'>
-                <span>&selfck.patron_barcode_label;</span>
-                <span><input type='text' id='selfck-patron-login-input'> </input></span>
-                <span><button onclick='selfckPatronLogin();'>&selfck.submit;</button></span>
-                <span id='selfck-patron-not-found' class='hide_me'>&selfck.event.patron_not_found;</span>
-            </div>
-
-            <div id='selfck-print-queuing' class='hide_me'>
-                <div><img src='../../../images/small_logo.jpg'/></div>
-                <div>&selfck.printing;</div>
-            </div>
-
-            <!--***********************************************************************
-                Checkout form
-                *********************************************************************** -->
-            <div id='selfck-patron-checkout-container' class='hide_me'>
-
-                <!--***********************************************************************
-                    Header
-                    *********************************************************************** -->
-                <div id='selfck-logout-div' class='container'>
-                    <div id='selfck-patron-info-div'> 
-                        <!-- not really i18n friendly, but better than nothing -->
-                        &selfck.welcome; <span id='selfck-patron-name-span'></span>!
-                    </div>
-                    <div id='selfck-logout-link-div'>
-                        <span class='selfck-link-span'>
-                            <a href='javascript:void(0);' class='selfck-done-link' 
-                                onclick='selfckLogoutPatron();'>&selfck.done;</a>
-                        </span>
-                    </div>
-                </div>
-
-                <!--***********************************************************************
-                    Display messages here
-                    *********************************************************************** -->
-                <div id='selfck-message-div' class='form_div'>
-                    <span class='' id='selfck-event-time'></span>
-                    <span class='biglabel' id='selfck-event-span'> </span>
-                    <span class='hide_me'>
-                        <span id='selfck-event-SUCCESS'>&selfck.event.co_success;</span>
-                        <span id='selfck-event-UNKNOWN'>&selfck.event.co_unknown;</span>
-                        <span id='selfck-event-ACTOR_USER_NOT_FOUND'>&selfck.event.patron_not_found;</span>
-                        <span id='selfck-event-COPY_CIRC_NOT_ALLOWED'>&selfck.event.item_nocirc;</span>
-                        <span id='selfck-event-ITEM_NOT_CATALOGED'>&selfck.event.item_noncat;</span>
-                        <span id='selfck-event-already-out'>&selfck.event.already_out;</span>
-                        <span id='selfck-event-dupe-barcode'>&selfck.event.dupe_barcode;</span>
-                    </span>
-                </div>
-
-                <!--***********************************************************************
-                    This is where patrons scan in the item barcodes
-                    *********************************************************************** -->
-                <div id='selfck-item-barcode-form-div' class='form_div'>
-                    <div>
-                        <img src='../../../images/small_logo.jpg'/>
-                        <div class='biglabel'>&selfck.item_barcode_label;</div>
-                        <div id='selfck-item-barcode-form'>
-                            <span><input type='text' id='selfck-item-barcode-input'> </input></span>
-                            <span><button onclick='selfckCheckout();'>&selfck.submit;</button></span>
-                            <span><button onclick='$("selfck-item-barcode-input").value = "";'>&selfck.clear;</button></span>
-                        </div>
-                    </div>
-                </div>
-
-                <!--***********************************************************************
-                    This is where patrons scan in the item barcodes
-                    *********************************************************************** -->
-                <div id='selfck-items-out-table-wrapper' class='hide_me'>
-                    <table id='selfck-items-out-table'>
-                        <thead>
-                            <tr>
-                                <td id='selfck-pic-cell'></td>
-                                <td>&selfck.barcode;</td>
-                                <td>&selfck.title;</td>
-                                <td>&selfck.author;</td>
-                                <td>&selfck.due_date;</td>
-                                <td>&selfck.remaining;</td>
-                                <td>&selfck.cotype;</td>
-                            </tr>
-                        </thead>
-                        <tbody id='selfck-items-out-tbody'>
-                            <tr id='selfck-items-out-row'>
-                                <td><img class='jacket' name='selfck.jacket'></img></td>
-                                <td name='selfck.barcode'></td>
-                                <td name='selfck.title'></td>
-                                <td name='selfck.author'></td>
-                                <td name='selfck.due_date'></td>
-                                <td name='selfck.remaining'></td>
-                                <td>
-                                    <span name='selfck.cotype_co'>&selfck.cotype_co;</span>
-                                    <span name='selfck.cotype_rn' class='hide_me'>&selfck.cotype_rn;</span>
-                                </td>
-                            </tr>
-                            <tr class='hide_me'> </tr>
-                        </tbody>
-                    </table>
-                    <div id='selfck-items-out-done-div'>
-                        <a href='javascript:void(0);' id='selfck-print-co-button' 
-                            class='selfck-done-link' onclick='selfckLogoutPatron();'>&selfck.done;</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class='hide_me' id='selfck-errors'/>
-
-        <!--***********************************************************************
-            Generate the printable version of the checked out list here
-            *********************************************************************** -->
-        <div class='print' id='selfck-print-div'>
-            <div>
-                <div id='selfck-print-date'/>
-                <div id='selfck-print-lib-name'/>
-                <div id='selfck-print-lib-addr-street'/>
-                <div>
-                    <span id='selfck-print-lib-addr-city'/>
-                    <span id='selfck-print-lib-addr-state'/> 
-                    <span id='selfck-print-lib-addr-post-code'/>
-                </div>
-                <br/>
-                <div id='selfck-print-patron-info'>
-                    <div><span id='selfck-print-lname'/>, <span id='selfck-print-fname'/></div>
-                    &selfck.items_out;
-                    <ol id='selfck-print-items-list'>
-                        <li name='selfck-print-items-template'>
-                            <div name='title'/>
-                            &selfck.barcode;: <span name='barcode'/>
-                            &selfck.due_date;: <span name='due_date'/>
-                        </li>
-                        <li class='hide_me'> </li>
-                    </ol>
-                </div>
-                <br/>
-                <div>&selfck.org_phone; <span id='selfck-print-lib-phone'/></div>
-                <br/>
-                <div>
-                    <div>&selfck.org_hours;</div>
-                    <table id='selfck-print-hours'>
-                        <tr><td>&selfck.day0;</td><td id='selfck-print-dow_0_open'/><td id='selfck-print-dow_0_close'/></tr>
-                        <tr><td>&selfck.day1;</td><td id='selfck-print-dow_1_open'/><td id='selfck-print-dow_1_close'/></tr>
-                        <tr><td>&selfck.day2;</td><td id='selfck-print-dow_2_open'/><td id='selfck-print-dow_2_close'/></tr>
-                        <tr><td>&selfck.day3;</td><td id='selfck-print-dow_3_open'/><td id='selfck-print-dow_3_close'/></tr>
-                        <tr><td>&selfck.day4;</td><td id='selfck-print-dow_4_open'/><td id='selfck-print-dow_4_close'/></tr>
-                        <tr><td>&selfck.day5;</td><td id='selfck-print-dow_5_open'/><td id='selfck-print-dow_5_close'/></tr>
-                        <tr><td>&selfck.day6;</td><td id='selfck-print-dow_6_open'/><td id='selfck-print-dow_6_close'/></tr>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </body>
-</html>
-
diff --git a/Open-ILS/web/opac/extras/selfcheck/selfcheck_print.css b/Open-ILS/web/opac/extras/selfcheck/selfcheck_print.css
deleted file mode 100644 (file)
index c5ea5e2..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-.noprint {
-    display: none;
-    visibility: hidden;
-}
-.print {
-    display: block;
-    visibility: visible;
-    width: 100%;
-    font-size: 7pt;
-    color: black;
-    font-family: Arial;
-    background-color: white;
-    page-break-after: always;
-}
-#selfck-print-patron-info { font-size: 8pt; }
-
-/* strange that the table does not inherit the .print css */
-#selfck-print-hours { 
-    font-size: 7pt; 
-    font-family: Arial;
-}
-