[Koha-patches] [PATCH] Cleaning up Self-Checkout interface, adding some basic formatting based on other standard styles.
Owen Leonard
oleonard at myacpl.org
Wed Nov 26 21:46:07 CET 2008
Patch also removes a hard-coded English string from the script and some unused functions from sco.js.
---
koha-tmpl/opac-tmpl/prog/en/css/sco.css | 335 +++++++++++---------
koha-tmpl/opac-tmpl/prog/en/js/sco.js | 15 -
koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tmpl | 27 +-
.../opac-tmpl/prog/en/modules/sco/sco-main.tmpl | 114 ++++----
opac/sco/sco-main.pl | 3 +-
5 files changed, 255 insertions(+), 239 deletions(-)
diff --git a/koha-tmpl/opac-tmpl/prog/en/css/sco.css b/koha-tmpl/opac-tmpl/prog/en/css/sco.css
index 6d48abf..eb1c019 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/sco.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/sco.css
@@ -1,194 +1,215 @@
-input.focus {
+ at import url("../../en/lib/yui/reset-fonts-grids.css");
+ at import url("../../en/lib/yui/skin.css");
+
+a {
+ font-weight : bold;
+}
+
+a, a:visited {
+ color : #006699;
+}
+
+a:hover,input.editshelf:hover,a.editshelf:hover,input.deleteshelf:hover {
+ color : #990033;
+}
+
+body {
+ background-color : white;
+ text-align : left;
+ padding : 0 0 2.5em 0;
+}
+
+caption {
+ font-size : 110%;
+ text-align : left;
+ font-weight : bold;
+}
+
+fieldset {
background-color: #FFF;
- border-bottom: 2px dashed #993300;
+ border : 2px solid #EEEEEE;
+ margin : 1em 1em 1em 0;
+ padding : 1em;
}
-input.unfocus {
- background-color : #FFF;
+h1,h2,h3,h4,h5,h6 {
+ font-weight : bold;
+ margin : .5em 0;
}
-div.sco_head {
- font-weight: bold;
- width: 75%;
- margin: 15px auto;
- padding-left: 10px;
+h1 {
+ font-size : 138.5%;
}
-div#sco_main {
- text-align: center;
- }
-div#newcheckout {
-/* margin : 20px 30px;
-/* text-align: center;
-*/ padding: 10px 10px 10px 40px;
-/* width: 80%;
-/* min-width: 300px;
-*/ }
+h2 {
+ font-size : 134%;
+}
-div#checkout h3 {
-/* background: url(/opac-tmpl/npl/en/sco/images/checkout-top-right.gif) top right no-repeat;
-/* border : 1px solid yellow;*/
- font-size:1.3em;
- padding: 15px 15px 0px 15px;
- margin:0;
- }
+h3 {
+ font-size : 123.1%;
+}
-div#borrowerdetails {
- margin: 10px 5px 5px 5px;
- }
-
-div#borrowerdetails h2 {
- font-style: italic;
- border-bottom: 1px;
- border-color: red;
- margin: 5px;
- }
+h4 {
+ font-size : 116%;
+}
-.submit {
- font-size: smaller;
- }
+h5 {
+ font-size : 108%;
+}
-.sco_entry {
- background-color : #FFE;
- text-align: left;
- width : 75%;
- margin: 15px auto;!important
- padding: 10px;
- border : 2px solid #CC3333;
-}
-
-p.checkout {
-/* background: url(/opac-tmpl/npl/en/sco/images/checkout-right.gif) top right repeat-y;
-/* border : 1px solid lime;*/
- margin: 5px;
- padding: 5px 15px;
- text-align: center;
- }
+h6 {
+ font-size : 100%;
+}
-div#checkouthelp p {
- text-align: center;
-
+input[type=submit], input[type=button], input[type=reset] {
+ background : #b8d0e6 url(../../images/submit-bg.gif) repeat-x 0 0;
+ background-color : #b8d0e6;
+ border-top: 1px solid #cccccc;
+ border-left: 1px solid #cccccc;
+ border-right: 1px solid #eeeeee;
+ border-bottom: 1px solid #eeeeee;
+ color : #333;
+ font-size : 93%;
+ font-weight : bold;
+ padding : 4px;
}
-div#checkoutfooter {
-/* background: url(/opac-tmpl/npl/en/sco/images/checkout-bottom-left.gif) bottom left no-repeat;
-*/ border-top : 1px solid red;
- }
-div#footerbody {
-/* background: url(/opac-tmpl/npl/en/sco/images/checkout-bottom-right.gif) bottom right no-repeat;
-*/ padding:15px;
- display:block;
- margin: -1.1em 0 0 0;
+
+input[type=submit]:active, input[type=button], input[type=reset] {
+ border: 1px inset #666666;
+ float : none;
+}
+.dialog {
+ border: 1px solid #bcbcbc;
+ padding : .5em;
+ margin : 1em auto;
+ width: 65%;
}
- input.confirm {
- background-color: #009900;
- color : #FFFFCC;
- font-weight: bold;
-}
-
-input.reject {
- background-color: #CC3333;
- color : #FFFFCC;
- font-weight: bold;
-}
-
-div.sco_head p.alert {
- width: 50%;
- font-weight: bold;
- background-color : #FFFF99;
- font-size : 105%;
- margin: 5px auto;
- margin-bottom : 15px;
- padding: 5px;
- border :1px solid #CC3333;
- }
-p.alert a{
- font-weight: bold;
-}
-div.error {
- background-color : #FFFF99;
- font-size : 105%;
-/* width : 50%;
-*/ margin: 5px auto;
- margin-bottom : 15px;
- padding: 5px;
- border : 2px dashed #CC3333;
+.dialog h2, .dialog h3, .dialog h4 {
+ margin : auto;
+ text-align : center;
+ }
+
+div.alert {
+ background : #FFC url(../../images/alert-bg.gif) repeat-x left 0;
+ text-align : center;
}
-div.error h3 {
- color: #CC3333;
- font-size : 110%;
- padding-left : 63px;
- height : 46px;
+div.alert strong {
+ color : #900;
}
-div.error p {
- margin-top : 0px;
- margin-left : 10px;
-}
+.dialog input {
+ background : #FFF none;
+ border : 1px solid #bcbcbc;
+ margin : .4em;
+ padding : .4em;
+ }
+
+
+.dialog input.back {
+ background : #FFF url(../../famfamfam/silk/arrow_left.png) no-repeat 4px center;
+ padding : .4em .4em .4em 25px;
+ }
+
+.dialog input.return {
+ background : #FFF url(../../famfamfam/silk/book_previous.png) no-repeat 4px center;
+ padding : .4em .4em .4em 25px;
+ }
+
+.dialog input.renew {
+ background : #FFF url(../../famfamfam/silk/arrow_refresh.png) no-repeat 4px center;
+ padding : .4em .4em .4em 25px;
+ }
+
+.dialog input.cancel {
+ background : #FFF url(../../famfamfam/silk/cancel.png) no-repeat 4px center;
+ padding : .4em .4em .4em 25px;
+ }
-div#footerbody p {
- background-color : #EFF1DC;
- font-size : 80%;
- width : 60%;
- margin: 5px auto;
- padding: 3px;
- border : 1px dashed #CCCC99;
- text-align: center;
+input.finish {
+ background : #dbe7ff url(../../famfamfam/silk/stop.png) no-repeat 4px center;
+ border : 1px outset #666;
+ padding : .2em .2em .2em 25px;
+}
+
+table {
+ background-color: #FFF;
+ border-collapse : collapse;
+ margin : 1em 0;
+ border-right : 1px solid #dddddd;
+ border-top : 1px solid #dddddd;
}
-div#complete {
- float : right;
- border : 0px solid lime;
+td,th {
+ background-color: #FFF;
+ border-left : 1px solid #dddddd;
+ border-bottom : 1px solid #dddddd;
+ padding : 3px 3px;
}
-div#complete input {
- background-color : #009900;
- color : #FEEDDB;
- font-family : verdana,arial,hevetica;
- font-size : small;
+th {
+ background-color:#EEE;
font-weight : bold;
- margin: 0;
- padding : 2px 32px 2px 2px;
+ padding : 2px 23px;
+ text-align : center;
}
-div#abort {
- margin: 5px auto;
- border : 0;
- text-align : center;
+tr.highlight td, tr.highlight th, tr.odd td {
+ background-color : #F3F3F3;
+ border-top : 1px solid #DDDDDD;
+ border-bottom : 1px solid #DDDDDD;
}
-div#abort input, .warning input {
- background-color : #993300;
- color : #FEEDDB;
- font-family : verdana,arial,hevetica;
- font-size : small;
- font-weight : bold;
- margin: 0;
- padding : 2px 32px 2px 2px;
+tr.even td, tr.even.highlight td {
+ background-color: #FFF;
}
-.warning-header {
- display : block;
- color: #CC3333;
- font-size : 110%;
+p {
+ margin: .7em 0;
}
-input.back {
- background-color : #936;
- color : #ffffcc;
- font-family : verdana,arial,hevetica;
- font-size : small;
+strong {
font-weight : bold;
- margin: 0;
- padding : 2px 2px 2px 32px;
}
-p.checkout .warning {
- display : block;
- padding : 15px;
- margin : 10px;
- margin-bottom : 15px;
- background-color : #FFFFCC;
- border : 3px dashed #cc0000;
+em {
+ font-style : italic;
}
+#borrowerdetails {
+ margin-top : 1em;
+}
+#barcode,
+#userid {
+ font-size : 125%;
+ padding-bottom : 3px;
+}
+input.focus {
+ background-color : #FFC;
+ border : 2px inset #336699;
+}
+#checkouthelp {
+ background : #FFF url("../../famfamfam/silk/help.png") no-repeat 4px center;
+ padding : 3px 3px 3px 26px;
+ position : absolute;
+ top : 0;
+ right : 0;
+}
+div.button {
+ float : left;
+ margin-top : 2em;
+ padding : .4em 0;
+}
+div.button a:link,
+div.button a:visited,
+div.button a:hover,
+div.button a:active {
+ background : #FFF url(../../famfamfam/silk/book_previous.png) no-repeat 4px center;
+ border : 1px outset #666;
+ color : #000;
+ padding : .4em .4em .4em 25px;
+ text-decoration : none;
+}
+div.button a:active {
+ border : 1px inset #666;
+}
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/en/js/sco.js b/koha-tmpl/opac-tmpl/prog/en/js/sco.js
index 978ce2a..add307e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/js/sco.js
+++ b/koha-tmpl/opac-tmpl/prog/en/js/sco.js
@@ -1,20 +1,5 @@
-function focusOnFirst(){
- ; // FIXME: do something here?
-}
-
function sco_init(valid_session) {
if (valid_session == 1) {
setTimeout("location.href='/cgi-bin/koha/sco/sco-main.pl?op=logout';",120000);
}
- if(document.forms['mainform']){
- document.forms['mainform'].elements[0].focus();
- }
-}
-
-function confirmDelete(message) {
- return (confirm(message) ? true : false);
-}
-
-function Dopop(link) {
- newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
}
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tmpl
index 7d3ba64..ba4f665 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tmpl
@@ -1,12 +1,18 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> -- Self Checkout
-<!-- TMPL_INCLUDE NAME="doc-head-close-sco.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead-sco.inc" -->
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> › Self Checkout</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Koha <!-- TMPL_VAR NAME="Version" -->" /> <!-- leave this for stats -->
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
+
+<!-- <script type="text/javascript" src="<TMPL_VAR NAME="themelang">/js/sco.js"></script> -->
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/css/sco.css" />
+</head>
<body>
-<div id="content-block">
+<div id="doc" class="yui-t7">
+ <div id="bd">
+ <div class="yui-g">
+
-<br />
-<h2>Self Checkout Help</h2>
+<h1>Self Checkout Help</h1>
<p>If this is your first time using the self checkout system, or if the system
is not behaving as expected, you may want to refer to this guide to get
@@ -22,10 +28,11 @@ The Submit button only needs to be clicked if you enter the barcode manually.</p
<h3>Step Three: Click the 'Click here if done' link when done.</h3>
-<br />
<div class="button">
-<a href="javascript:history.go(-1)" onMouseOver="self.status=document.referrer;return true">Return to the Self-Checkout.</a>
-</div></div>
+<a href="javascript:history.go(-1)">Return to the Self-Checkout</a>
+</div>
+
+</div></div></div>
</body>
</html>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tmpl
index 845abc5..f362df9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tmpl
@@ -1,64 +1,76 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> -- Self Checkout
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> › Self Checkout </title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Koha <!-- TMPL_VAR NAME="Version" -->" /> <!-- leave this for stats -->
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/jquery.js"></script>
<script type="text/javascript" src="<TMPL_VAR NAME="themelang">/js/sco.js"></script>
+<script type="text/javascript">//<![CDATA[
+ $(document).ready(function(){
+ sco_init(1);
+ $(".unfocus").focus();
+ });
+//]]>
+</script>
<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/css/sco.css" />
-<body <!-- TMPL_IF NAME="redirect" --> onload="openWindow('<!-- TMPL_VAR NAME ="redirect" -->')"<!-- TMPL_ELSE --> onload="sco_init(1);"<!-- /TMPL_IF -->>
-<br />
-<div id="masthead"><h1><!-- TMPL_IF NAME="opacsmallimage" --><img alt="<!-- TMPL_VAR NAME="LibraryName" -->" src="<!-- TMPL_VAR NAME='opacsmallimage' -->" /><!-- /TMPL_IF -->
-<!-- TMPL_VAR NAME="LibraryName" --> Self Checkout System </h1>
-<br />
-</div>
-<div id="main">
+</head>
+<body>
+
+<div id="doc" class="yui-t7">
+
+<div id="masthead"><h1><!-- TMPL_VAR NAME="LibraryName" --> Self Checkout System </h1></div>
+
+ <div id="bd">
+ <div class="yui-g">
<!-- TMPL_IF NAME="impossible" --><!-- We tried to issue, but failed. -->
-<div class="error"><h3>Item cannot be issued.</h3><p>Sorry, This item cannot be checked out at this station. </p>
-<p><em>Title:</em> <!-- TMPL_VAR NAME="title" escape="html" --> </p>
+<div class="dialog alert"><h3>Item cannot be checked out.</h3><p>Sorry, This item cannot be checked out at this station. </p>
+<!-- TMPL_IF NAME="title" --><p>Title: <em><!-- TMPL_VAR NAME="title" escape="html" --></em> </p><!-- /TMPL_IF -->
<p><em>Error type:</em> <!-- TMPL_VAR NAME="impossible" --></p>
<form action="/cgi-bin/koha/sco/sco-main.pl" name="errorForm" method="post">
<input type="hidden" name="op" value="login" />
-<input type="hidden" name="userid" value='<!-- TMPL_VAR NAME="userid" -->' />
+<input type="hidden" name="userid" value="<!-- TMPL_VAR NAME="userid" -->" />
<!-- TMPL_IF NAME="returnitem" -->
-<input type="hidden" name="barcode" value='<!-- TMPL_VAR NAME="barcode" -->' />
-<input type="button" name="returnbook" value="Return this item" class="submit" onclick="this.form.op.value='returnbook';this.form.submit();" />
+<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
+<input type="button" name="returnbook" value="Return this item" class="return" onclick="this.form.op.value='returnbook';this.form.submit();" />
<!-- /TMPL_IF -->
-<input type="submit" name= "confirm" value="Return to Account Summary" class="submit" />
+<input type="submit" name= "confirm" value="Return to Account Summary" class="back" />
</div>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="confirm" --><!-- We need to confirm the issue.. -->
-<div class="error"><h3>Please confirm the issue:</h3>
-<p><em><!-- TMPL_VAR NAME="confirm" --></em></p>
-<br />
+<div class="dialog alert"><h3>Please confirm the checkout:</h3>
+<p><!-- TMPL_IF NAME="confirm_renew_issue" -->This item is already checked out to you. Return it?<!-- /TMPL_IF --></p>
+
<form action="/cgi-bin/koha/sco/sco-main.pl" name="confirmForm" method="post">
<input type="hidden" id="op" name="op" value="checkout" />
-<input type="hidden" name="userid" value='<!-- TMPL_VAR NAME="userid" -->' />
-<input type="hidden" name="barcode" value='<!-- TMPL_VAR NAME="barcode" -->' />
+<input type="hidden" name="userid" value="<!-- TMPL_VAR NAME="userid" -->" />
+<input type="hidden" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->" />
<input type="hidden" id="confirmation" name="confirmed" value="" />
<!-- TMPL_IF NAME="renew" -->
-<input type="button" value="Return Item" name="confirm" class="submit" onclick="this.form.op.value='returnbook';this.form.submit();" />
+<input type="button" value="Return Item" name="confirm" class="return" onclick="this.form.op.value='returnbook';this.form.submit();" />
<!-- /TMPL_IF -->
-<input type="button" value="Renew Item" <!-- TMPL_UNLESS NAME="renew" --> name="confirm"<!-- /TMPL_UNLESS --> class="submit" onclick="this.form.confirmed.value='1';this.form.submit();" />
-<input type="button" value="Cancel" class="submit" onclick="this.form.op.value='';this.form.submit();return true;" />
+<input type="button" value="Renew Item" <!-- TMPL_UNLESS NAME="renew" --> name="confirm"<!-- /TMPL_UNLESS --> class="renew" onclick="this.form.confirmed.value='1';this.form.submit();" />
+<input type="button" value="Cancel" class="cancel" onclick="this.form.op.value='';this.form.submit();return true;" />
</form>
</div>
<!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="nopermission" --><!-- This is what is displayed if user doesnt have permission --><div class="error"><h3>Access Denied</h3>
+<!-- TMPL_IF NAME="nopermission" --><!-- This is what is displayed if user doesnt have permission --><div class="dialog alert"><h3>Access Denied</h3>
Sorry, This Self-Checkout Station has lost authentication. Please contact the administrator to resolve this problem. </div>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="timed_out" --><!-- This is what is displayed if login has timed out -->
-<div class="error"><h3>Session timed out</h3>Sorry, your session has timed out, please login again.</div><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="different_ip" --><!-- This is what is displayed if user doesnt have permission --><div class="error"><h3>Session Lost</h3>You are accessing koha from a different ip address! please login again.</div><!-- /TMPL_IF -->
+<div class="dialog alert"><h3>Session timed out</h3>Sorry, your session has timed out, please log in again.</div><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="different_ip" --><!-- This is what is displayed if user doesnt have permission --><div class="dialog alert"><h3>Session Lost</h3>You are accessing Self-Checkout from a different IP address! please log in again.</div><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="invalid_username_or_password" -->
-<!-- This is what is displayed if user doesnt have permission --><div class="error"><h3>Record not found</h3><p>Your Userid was not found in the database. Please try again.</p></div><!-- /TMPL_IF -->
+<!-- This is what is displayed if user doesnt have permission --><div class="dialog alert"><h3>Record not found</h3><p>Your userid was not found in the database. Please try again.</p></div><!-- /TMPL_IF -->
<!-- TMPL_UNLESS NAME="hide_main" -->
- <div id="content-block">
<div class="sco_head">
<!-- TMPL_UNLESS NAME="validuser" -->
<h3> <!-- TMPL_VAR NAME="libraryname" --> Self Checkout </h3>
<!-- /TMPL_UNLESS -->
<div id="checkouthelp">
- <p><a href="/cgi-bin/koha/sco/help.pl">HELP</a> with the self checkoutsystem</p>
+ <a href="/cgi-bin/koha/sco/help.pl">HELP</a> with the self checkout system
</div>
<!-- TMPL_IF NAME="userid" -->
@@ -77,42 +89,39 @@ Sorry, This Self-Checkout Station has lost authentication. Please contact the a
<!-- /TMPL_IF -->
<!-- TMPL_UNLESS NAME="validuser" -->
<div class="sco_entry" >
- <form id="mainform" action="/cgi-bin/koha/sco/sco-main.pl" name="myForm" method="post">
+ <form id="mainform" action="/cgi-bin/koha/sco/sco-main.pl" name="mainform" method="post">
<input type="hidden" name="koha_login_context" value="sco" />
- <p class="checkout"><label for="userid">Please enter your cardnumber:</label>
- <input type="text" id="userid" class="firstField" size="10" name="userid" onblur="ValidateCode();" />
+ <fieldset class="checkout"><label for="userid">Please enter your card number:</label>
+ <input type="text" id="userid" class="unfocus" size="20" name="userid" />
<!-- TMPL_LOOP NAME="INPUTS" --><input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->"><!-- /TMPL_LOOP -->
<input type="hidden" name="op" value="login" />
- <input type="submit" value="Submit" class="submit" /></p></form>
+ <input type="submit" value="Submit" class="submit" /></fieldset></form>
</div>
<!-- /TMPL_UNLESS -->
<!-- TMPL_IF NAME="validuser" -->
<div id="newcheckout" class="sco_entry">
- <form id='mainform' name="scan_form" method="post" action="/cgi-bin/koha/sco/sco-main.pl" onsubmit=" if(this.valid_session == 0) { if(confirm('Session has expired. Click \'OK\' to continue processing this item. Click Cancel if you are not <!-- TMPL_VAR NAME="userid" -->.')){ this.op.value='logout'; this.userid.value=''; } return true;}; " >
- <h4> Check out or return an item: </h4>
+ <form id="mainform" name="scan_form" method="post" action="/cgi-bin/koha/sco/sco-main.pl" onsubmit=" if(this.valid_session == 0) { if(confirm('Session has expired. Click \'OK\' to continue processing this item. Click Cancel if you are not <!-- TMPL_VAR NAME="userid" -->.')){ this.op.value='logout'; this.userid.value=''; } return true;}; " >
+ <fieldset><legend> Check out or return an item: </legend>
<label for="barcode">Scan a new item or enter its barcode:</label>
- <input id="barcode" name="barcode" size="14" maxlength="14" class="unfocus" onfocus="this.className='focus';" onblur="this.className='unfocus';" />
+ <input id="barcode" name="barcode" size="20" class="unfocus" onfocus="this.className='focus';" onblur="this.className='unfocus';" />
<input type="hidden" name="op" value="checkout" />
<input type="hidden" name="userid" value="<!-- TMPL_VAR name="userid" -->" />
<input type="hidden" name="valid_session" value="1">
- <input type="submit" value="Submit" class="submit" />
+ <input type="submit" value="Submit" class="submit" /></fieldset>
</form>
- <p class='alert'><form method="post" action="/cgi-bin/koha/sco/sco-main.pl?op=logout" >Scan next item, or <input type="submit" value="Click here if done." class="submit" /></form></p>
- </div> <!-- sco_entry -->
- </div> <!-- newcheckout -->
+ <p class="alert"><form method="post" action="/cgi-bin/koha/sco/sco-main.pl?op=logout" >Scan next item, or <input type="submit" value="Click here if done." class="finish" /></form></p>
+ </div> <!-- sco_entry --> <!-- newcheckout -->
<div id="borrowerdetails">
- <h2>Issues for <!-- TMPL_VAR NAME='borrowername' --></h2>
<!-- TMPL_IF NAME="issues_count" -->
- <div class="table"><table><caption>Issues <span class="count">(<!-- TMPL_VAR NAME="issues_count" --> total)</span></caption>
+ <table><caption>Issues for <!-- TMPL_VAR NAME='borrowername' --> <span class="count">(<!-- TMPL_VAR NAME="issues_count" --> total)</span></caption>
<!-- ISSUES TABLE ROWS -->
- <tr><th colspan="2">Title</th><th>Call No.</th><th>Due</th><th>Renew</th><!-- TMPL_UNLESS NAME="nofines" --><th>Fines</th><!-- /TMPL_UNLESS --></tr>
+ <tr><th>Title</th><th>Call No.</th><th>Due</th><th>Renew</th><!-- TMPL_UNLESS NAME="nofines" --><th>Fines</th><!-- /TMPL_UNLESS --></tr>
<!-- TMPL_LOOP NAME="ISSUES" -->
- <!-- TMPL_IF NAME="overdue" --><tr class="overdue"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
- <td><!-- TMPL_IF NAME="itemtypeimages" --> <img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_IF --></td>
- <td><!-- TMPL_IF NAME="amazonimages" --> <!-- TMPL_IF NAME="isbn" --><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.THUMBZZZ.jpg" alt="Book Cover Image" class="thumbnail" /></a><!-- /TMPL_IF --> <!-- /TMPL_IF --><!-- TMPL_UNLESS NAME="noitemlinks" --><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="title" escape="html" --><!-- /TMPL_UNLESS --><span class="item-details">
- <!-- TMPL_VAR NAME="author" --></span></td>
- <td><!-- TMPL_VAR NAME="classification" --></td>
+ <!-- TMPL_UNLESS name="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
+ <td><!-- TMPL_IF NAME="amazonimages" --> <!-- TMPL_IF NAME="isbn" --><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.THUMBZZZ.jpg" alt="Book Cover Image" class="thumbnail" /></a><!-- /TMPL_IF --> <!-- /TMPL_IF --><!-- TMPL_UNLESS NAME="noitemlinks" --><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a><!-- TMPL_ELSE --><strong><!-- TMPL_VAR NAME="title" escape="html" --></strong><!-- /TMPL_UNLESS --><span class="item-details">
+ <!-- TMPL_VAR NAME="author" --></span> (<!-- TMPL_VAR NAME="barcode" -->)</td>
+ <td><!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- TMPL_ELSE --> <!-- /TMPL_IF --></td>
<!-- TMPL_IF NAME="overdue" --><td class="overdue"><!-- TMPL_VAR NAME="date_due" --></td><!-- TMPL_ELSE --><td><!-- TMPL_VAR NAME="date_due" --></td><!-- /TMPL_IF -->
<td>
<!-- TMPL_IF NAME="status" -->
@@ -123,7 +132,6 @@ Sorry, This Self-Checkout Station has lost authentication. Please contact the a
<!-- TMPL_UNLESS NAME="nofines" --><td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td><!-- /TMPL_UNLESS --></tr>
<!-- /TMPL_LOOP -->
</table>
- </div>
<!-- TMPL_ELSE -->
<h3>You currently have nothing checked out.</h3>
<!-- /TMPL_IF -->
@@ -131,14 +139,8 @@ Sorry, This Self-Checkout Station has lost authentication. Please contact the a
<!-- /TMPL_IF -->
<!-- /TMPL_UNLESS --> <!-- ( / hide main) -->
- <div id="checkoutfooter">
-
</div>
+ </div>
</div>
-</body>
-</html>
-
-
-
-
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl
index 1979758..12e1a3e 100755
--- a/opac/sco/sco-main.pl
+++ b/opac/sco/sco-main.pl
@@ -94,7 +94,8 @@ if ($op eq "logout") {
#warn "renew confirmation";
$template->param( renew => 1,
barcode => $barcode,
- confirm => $confirmation_strings{RENEW_ISSUE},
+ confirm => 1,
+ confirm_renew_issue => 1,
hide_main => 1,
);
}
--
1.5.5.GIT
More information about the Koha-patches
mailing list