Owen Leonard
4577950900
This patch builds on Bug 22318 to move the OpacNav system
preference into the "Additional contents" system, making it possible to
have language- and library-specific content.
To test you should have some content in the OpacNav system
preference. To make testing easier it's also a good idea to have content
in the OpacNavBottom preference.
- Apply the patch and run the database update process.
- In the staff client, go to Tools -> HTML customizations and verify
that the content from OpacNav is now stored there. When you
edit the entry you should see content for each of the enabled
translations in your system under each tab.
- Confirm that the previous contents of OpacNav were added
correctly.
- Go to Administration -> System preferences -> OPAC and verify that
the OpacNav preference has been removed.
- Update and reinstall active translations (for instance fr-FR):
- cd misc/translator/
- perl translate update fr-FR
- perl translate install fr-FR
- View the OPAC and confirm that the contents of the OpacNav system
preference displays in the left-hand sidebar.
- Test as many pages as possible to confirm that wherever the
OpacNavBottom content is displayed, OpacNav is also displayed.
- Test also using the updated translation.
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Bug 24223: (follow-up) Add date to OpacNav additional content entries
This follow-up modifies the atomic update so that it inserts today's
date as the "Published on" date. Without that information the system
considers the item unpublished and will not display the content.
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Bug 24223: (follow-up) Make logged-in user's branchcode available to template
This patch makes a couple of corrections for problems I discovered
while working on Bug 24224: The variables required for correct display
of news items by branch and language were not consistently available to
the templates.
In opac-readingrecord.pl, the "lang" variable was being overwritten. On
this and other pages the logged-in patron's brachcode was not made
available. I've corrected instances of KohaNews.get() to use the
globally-available "logged_in_user.branchcode" instead.
To test, apply the patch and follow the original test plan, with the
addition of instances of the OpacNav additional contents item which
have a specific library selected.
Confirm that such items are correctly displayed according to the
logged-in user's home library. If there is no logged-in user the
library-specific OpacNav should not display.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Bug 24223: (follow-up) Updates to conform to new practices
- The patch now works with new "Additional contents" system
- The database update follows new skeleton.pl
- Add "OpacNav" option to the additional contents template
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Bug 24223: (follow-up) Add missing "return" to atomicupdate
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Bug 24223: (QA follow-up) Link OpacNav to HTML customizations now
In the pref description of OpacNavBottom. (Before obsoleting that
one too somewhere soon.)
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
270 lines
14 KiB
Text
270 lines
14 KiB
Text
[% USE raw %]
|
|
[% USE Asset %]
|
|
[%# Includes %]
|
|
[% USE Koha %]
|
|
[% USE KohaDates %]
|
|
[% USE AdditionalContents %]
|
|
[%# Helper template functions %]
|
|
[% BLOCK error_message %]
|
|
[% IF messages.BadBarcode %]
|
|
<span>(Barcode not found on the database, please see library staff for assistance)</span>
|
|
[% ELSIF messages.Wrongbranch %]
|
|
<span>(The item cannot be checked in at this library, please see library staff for assistance)</span>
|
|
[% ELSIF messages.withdrawn %]
|
|
<span>(Item is withdrawn and check-in blocked by policy, please see library staff for assistance)</span>
|
|
[% ELSIF messages.NotIssued %]
|
|
<span>(The book is not currently on loan, please see library staff for assistance)</span>
|
|
[% ELSIF messages.additional_materials %]
|
|
<span>(The item cannot be checked in at a self service terminal, please see library staff for assistance)</span>
|
|
[% ELSE %]
|
|
<span>(There was a problem checking in this item, please see library staff for assistance)</span>
|
|
[% END %]
|
|
[% END %]
|
|
[% PROCESS 'html_helpers.inc' %]
|
|
[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
|
|
<title>Self check-in › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha [% END %]</title>
|
|
|
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
|
<meta name="generator" content="Koha [% Version | html %]" /> <!-- leave this for stats -->
|
|
|
|
[% IF ( Koha.Preference('OpacFavicon') ) %]
|
|
<link rel="shortcut icon" href="[% Koha.Preference('OpacFavicon') | url %]" type="image/x-icon" />
|
|
[% ELSE %]
|
|
<link rel="shortcut icon" href="[% interface | html %]/[% theme | html %]/images/favicon.ico" type="image/x-icon" />
|
|
[% END %]
|
|
[% IF ( bidi ) %]
|
|
[% Asset.css("lib/jquery/jquery-ui-rtl-1.12.1.min.css") | $raw %]
|
|
[% Asset.css("css/sco-rtl.css") | $raw %]
|
|
[% ELSE %]
|
|
[% Asset.css("lib/jquery/jquery-ui-1.12.1.css") | $raw %]
|
|
[% Asset.css("css/sco.css") | $raw %]
|
|
[% END %]
|
|
[% IF ( Koha.Preference('OPACUserCSS') ) %]<style>[% Koha.Preference('OPACUserCSS') | $raw %]</style>[% END %]
|
|
[% IF ( Koha.Preference('SelfCheckInUserCSS') ) %]<style>[% Koha.Preference('SelfCheckInUserCSS') | $raw %]</style>[% END %]
|
|
<script>
|
|
function _(s) { return s } // dummy function for gettext
|
|
</script>
|
|
[% Asset.js("lib/modernizr.min.js") | $raw %]
|
|
</head>
|
|
<body id="sci_main" class="sci" onload="dofocus();" onunload="mungeHistory();">
|
|
[% INCLUDE 'masthead-sci.inc' %]
|
|
|
|
<div class="main">
|
|
<div class="container-fluid">
|
|
<div class="row">
|
|
<div class="col order-first order-md-first order-lg-2">
|
|
<div id="masthead">
|
|
<h1>[% LibraryName | html %] Self check-in</h1>
|
|
</div>
|
|
|
|
[% IF ( nopermission ) %]
|
|
[%# This is what is displayed if user doesn't have permission %]
|
|
<div class="alert alert-warning">
|
|
<h2>Access denied</h2>
|
|
<p>Sorry, this self check-in station has lost authentication. Please contact the administrator to resolve this problem.</p>
|
|
</div>
|
|
[% ELSIF ( different_ip ) %]
|
|
[%# This is what is displayed if user doesn't have permission %]
|
|
<div class="alert alert-warning">
|
|
<h2>Session lost</h2>
|
|
<p>You are accessing self check-in from a different IP address! Please log in again.</p>
|
|
</div>
|
|
[% ELSIF ( checkins ) %]
|
|
[%# We have results from a check-in attempt %]
|
|
<div id="checkins" class="sci_results_list">
|
|
[% IF ( success && success.size > 0 || errors && errors.size > 0 ) %]
|
|
<table id="sci_bcheckins_table" class="table table-bordered table-striped dataTable no-footer">
|
|
<caption><h2>Results</h2></caption>
|
|
<thead>
|
|
<th>Barcode</th>
|
|
<th>Status</th>
|
|
</thead>
|
|
<tbody>
|
|
[% FOREACH success_line IN success %]
|
|
<tr>
|
|
<td>[% success_line.barcode | html %]</td>
|
|
<td>Checked in</td>
|
|
</tr>
|
|
[% END %]
|
|
[% FOREACH error IN errors %]
|
|
<tr>
|
|
<td>[% error.barcode | html %]</td>
|
|
<td>Not checked in [% PROCESS error_message messages=error.messages %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
<div>
|
|
<form method="post" action="#" id="finish_form">
|
|
<legend class="sr-only">Finish</legend>
|
|
<button id="sci_finish_button" type="submit" class="btn btn-primary"><i class="fa fa-check" aria-hidden="true"></i> Finish</button>
|
|
</form>
|
|
</div>
|
|
[% ELSE %]
|
|
<div class="alert alert-warning">
|
|
<p>Your request included no check-ins.</p>
|
|
</div>
|
|
[% END %]
|
|
</div>
|
|
[% ELSE %]
|
|
[%# Prompt for barcodes %]
|
|
<div id="new_checkins" class="sci_entry">
|
|
<form id="scan_form" name="scan_form" method="post" action="/cgi-bin/koha/sci/sci-main.pl">
|
|
<legend class="sr-only">Scan</legend>
|
|
<div class="row">
|
|
<div class="col-auto">
|
|
<label for="barcode_input">Scan the item or enter its barcode:</label>
|
|
</div>
|
|
<div class="col-4">
|
|
<input id="barcode_input" name="barcode_input" size="20" type="text" class="focus form-control" autocomplete="off" />
|
|
</div>
|
|
<div class="col-auto">
|
|
<button id="sci_append_button" type="submit" class="btn btn-primary">
|
|
Submit
|
|
</button>
|
|
</div>
|
|
</div> <!-- /.row -->
|
|
<div class="row">
|
|
<div class="col">
|
|
<div class="sci_input_append">
|
|
<table id="sci_barcodes_table" class="table table-bordered table-striped dataTable no-footer" style="display: none;">
|
|
<caption class="sr-only">Barcodes</caption>
|
|
<thead>
|
|
<th class="barcodes_column">Barcode</th>
|
|
</thead>
|
|
<tbody>
|
|
</tbody>
|
|
</table> <!-- /#sci_barcodes_table -->
|
|
</div> <!-- .sci_input_append -->
|
|
<input type="hidden" name="op" value="check_in" />
|
|
<div id="button_bar">
|
|
<button id="sci_checkin_button" type="submit" class="btn btn-primary" style="display: none;">
|
|
<i class="fa fa-check-square-o" aria-hidden="true"></i> <span>Check in</span>
|
|
</button>
|
|
<a href="/cgi-bin/koha/sci/sci-main.pl" class="btn btn-danger" role="button" style="display: none;" id="sci_refresh_button">
|
|
<i class="fa fa-times" aria-hidden="true"></i> <span>Cancel</span>
|
|
</a>
|
|
</div> <!-- /#button_bar -->
|
|
</div> <!-- /.col -->
|
|
</div> <!-- /.row -->
|
|
</form> <!-- /#scan_form -->
|
|
</div> <!-- / #new_checkins -->
|
|
[% END # /IF ( nopermission ) %]
|
|
</div> <!-- / #masthead -->
|
|
</div> <!-- / .row -->
|
|
</div> <!-- / .container-fluid -->
|
|
|
|
[% IF ( Koha.Preference('SelfCheckInMainUserBlock') ) %]
|
|
<div id="SelfCheckInMainUserBlock">[% Koha.Preference('SelfCheckInMainUserBlock' ) | $raw %]</div>
|
|
[% END %]
|
|
</div> <!-- / .main -->
|
|
|
|
[% # Help modal %]
|
|
<div id="helpModal" class="modal" tabindex="-1" role="dialog" aria-labelledby="helpModalLabel" aria-hidden="true">
|
|
<div class="modal-dialog">
|
|
<div class="modal-content">
|
|
<div class="modal-header">
|
|
<h2 id="helpModalLabel">Self check-in help</h2>
|
|
<button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">
|
|
<span aria-hidden="true">×</span>
|
|
</button>
|
|
</div> <!-- /.modal-header -->
|
|
<div class="modal-body">
|
|
<ul>
|
|
<li>Scan each item or enter its barcode. A list with the entered barcodes will be displayed.</li>
|
|
<li>Click the 'Check in' button to confirm.</li>
|
|
<li>The operation results will be displayed for each entered barcode.</li>
|
|
<li>The 'Finish' button is presented to start over.</li>
|
|
<li>At any step, clicking the 'Cancel' button will erase the scanned barcodes and start over.</li>
|
|
</ul>
|
|
</div> <!-- /.modal-body -->
|
|
<div class="modal-footer">
|
|
<button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
|
|
</div>
|
|
</div> <!-- /.modal-content -->
|
|
</div> <!-- /.modal-dialog -->
|
|
</div> <!-- /#helpModal -->
|
|
|
|
</body>
|
|
|
|
[% INCLUDE 'opac-bottom.inc' %]
|
|
[% BLOCK jsinclude %]
|
|
<script>
|
|
|
|
function mungeHistory() {
|
|
// prevent back button from allowing form resubmission
|
|
if (history && history.pushState) {
|
|
history.replaceState(null, document.title, window.location.href);
|
|
}
|
|
}
|
|
|
|
function dofocus() {
|
|
$(".focus:last").select();
|
|
}
|
|
|
|
var barcodes = [];
|
|
|
|
$(document).ready(function() {
|
|
// Barcodes scanning table initially hidden
|
|
$("#sci_barcodes_table").hide();
|
|
// Control de 'append' button behaviour
|
|
$("#sci_append_button").on('click',function( e ){
|
|
// Make sure the form is not submitted by the button
|
|
e.preventDefault();
|
|
var barcode = $('#barcode_input').val();
|
|
//var result = validate_barcode( barcode );
|
|
$('#sci_barcodes_table tbody').append(
|
|
'<tr style="font-size: initial;"><td>' +
|
|
barcode +
|
|
'<input type="hidden" name="barcode" value="' + barcode + '" />' +
|
|
'</td></tr>' );
|
|
// Make sure the table is now displayed
|
|
$("#sci_barcodes_table").show();
|
|
$('#sci_checkin_button').show();
|
|
$('#sci_refresh_button').show();
|
|
barcodes.push(barcode);
|
|
// clean the input, reset the focus
|
|
$('#barcode_input').val('');
|
|
dofocus();
|
|
});
|
|
|
|
$(".helpModal-trigger").on("click",function(e){
|
|
e.preventDefault();
|
|
$("#helpModal").modal("show");
|
|
});
|
|
|
|
// set focus at the beginning
|
|
dofocus();
|
|
});
|
|
|
|
var idleTime = 0;
|
|
$(document).ready(function () {
|
|
//Increment the idle time counter every second
|
|
var idleInterval = setInterval(timerIncrement, 1000);
|
|
|
|
//Zero the idle timer on mouse movement.
|
|
$(this).mousemove(function (e) {
|
|
idleTime = 0;
|
|
});
|
|
$(this).keypress(function (e) {
|
|
idleTime = 0;
|
|
});
|
|
});
|
|
|
|
function timerIncrement() {
|
|
if ( $("#sci_finish_button").is(":visible") || $("#sci_refresh_button").is(":visible") ) {
|
|
idleTime = idleTime + 1;
|
|
idleTimeout = [% refresh_timeout | html %];
|
|
if (idleTime >= idleTimeout ) {
|
|
location.href = '/cgi-bin/koha/sci/sci-main.pl';
|
|
}
|
|
}
|
|
}
|
|
</script>
|
|
|
|
[% IF ( Koha.Preference('SelfCheckInUserJS') ) %]
|
|
<script>[% Koha.Preference('SelfCheckInUserJS') | $raw %]</script>
|
|
[% END %]
|
|
[% END %]
|