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>
301 lines
17 KiB
Text
301 lines
17 KiB
Text
[% USE Koha %]
|
|
[% USE Branches %]
|
|
[% USE ItemTypes %]
|
|
[% USE AdditionalContents %]
|
|
[% USE raw %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
|
|
<title>Request article › [% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% BLOCK cssinclude %][% END %]
|
|
</head>
|
|
|
|
[% INCLUDE 'bodytag.inc' bodyid='opac-request-article' %]
|
|
[% INCLUDE 'masthead.inc' %]
|
|
|
|
[% SET disclaimer = AdditionalContents.get( location => "ArticleRequestsDisclaimerText", lang => lang, library => logged_in_user.branchcode ) %]
|
|
|
|
<div class="main">
|
|
<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumbs">
|
|
<ol class="breadcrumb">
|
|
<li class="breadcrumb-item">
|
|
<a href="/cgi-bin/koha/opac-main.pl">Home</a>
|
|
</li>
|
|
<li class="breadcrumb-item">
|
|
<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | uri %]">Details for: [% biblio.title | html %]</a>
|
|
</li>
|
|
<li class="breadcrumb-item active">
|
|
<a href="#" aria-current="page">Request article</a>
|
|
</li>
|
|
</ol>
|
|
</nav> <!-- /#breadcrumbs -->
|
|
|
|
<div class="container-fluid maincontent">
|
|
<div class="row">
|
|
<div class="col">
|
|
[% IF error_message %]
|
|
<h1 class="title">[% biblio.title | html %]</h1>
|
|
<div class="alert alert-info">
|
|
[% SWITCH error_message %]
|
|
[% CASE 'article_request_limit_reached' %]You reached your open article requests limit.
|
|
[% CASE 'article_request_unhandled_exception' %]An error has occurred.
|
|
[% END %]
|
|
</div>
|
|
[% ELSIF biblio.can_article_request( patron ) %]
|
|
<h1>Place article request for [% biblio.title | html %]</h1>
|
|
[% IF ( disclaimer && !action) %]
|
|
<div class="alert alert-warning">
|
|
[% PROCESS koha_news_block news => disclaimer %]
|
|
<a href="/cgi-bin/koha/opac-request-article.pl?biblionumber=[% biblio.biblionumber | uri %]&action=accept"
|
|
class="btn btn-sm btn-primary"><i class="fa fa-check" aria-hidden="true"></i> Accept</a>
|
|
</div>
|
|
[% ELSE %]
|
|
[% SET article_request_type = biblio.article_request_type( patron ) %]
|
|
|
|
[% IF article_request_type == 'yes' %] [% SET mandatory_fields = Koha.Preference('ArticleRequestsMandatoryFields') %] [% END %]
|
|
[% IF article_request_type == 'bib_only' %] [% SET mandatory_fields = Koha.Preference('ArticleRequestsMandatoryFieldsRecordOnly') %] [% END %]
|
|
[% IF article_request_type == 'item_only' %] [% SET mandatory_fields = Koha.Preference('ArticleRequestsMandatoryFieldsItemOnly') %] [% END %]
|
|
|
|
|
|
<form id="place-article-request" method="post" action="/cgi-bin/koha/opac-request-article.pl">
|
|
<legend class="sr-only">Place article request</legend>
|
|
<input type="hidden" name="action" value="create" />
|
|
<input type="hidden" name="biblionumber" id="biblionumber" value="[% biblio.biblionumber | html %]" />
|
|
|
|
<fieldset class="rows">
|
|
<ul>
|
|
<li>
|
|
[% IF mandatory_fields.search('title') %]
|
|
<label for="title" class="required">Title:</label>
|
|
<input type="text" required="required" name="title" id="title" size="50" value="[% title | html %]"/>
|
|
[% ELSE %]
|
|
<label for="title">Title:</label>
|
|
<input type="text" name="title" id="title" size="50" value="[% title | html %]"/>
|
|
[% END %]
|
|
</li>
|
|
|
|
<li>
|
|
[% IF mandatory_fields.search('author') %]
|
|
<label for="author" class="required">Author:</label>
|
|
<input type="text" required="required" name="author" id="author" size="50" value="[% author | html %]"/>
|
|
[% ELSE %]
|
|
<label for="author">Author:</label>
|
|
<input type="text" name="author" id="author" size="50" value="[% author | html %]"/>
|
|
[% END %]
|
|
</li>
|
|
|
|
<li>
|
|
[% IF mandatory_fields.search('volume') %]
|
|
<label for="volume" class="required">Volume:</label>
|
|
<input type="text" required="required" name="volume" id="volume" size="50"/>
|
|
[% ELSE %]
|
|
<label for="volume">Volume:</label>
|
|
<input type="text" name="volume" id="volume" size="50"/>
|
|
[% END %]
|
|
</li>
|
|
|
|
<li>
|
|
[% IF mandatory_fields.search('issue') %]
|
|
<label for="issue" class="required">Issue:</label>
|
|
<input type="text" required="required" name="issue" id="issue" size="50"/>
|
|
[% ELSE %]
|
|
<label for="issue">Issue:</label>
|
|
<input type="text" name="issue" id="issue" size="50"/>
|
|
[% END %]
|
|
</li>
|
|
|
|
<li>
|
|
[% IF mandatory_fields.search('date') %]
|
|
<label for="date" class="required">Date:</label>
|
|
<input type="text" required="required" name="date" id="date" size="50"/>
|
|
[% ELSE %]
|
|
<label for="date">Date:</label>
|
|
<input type="text" name="date" id="date" size="50"/>
|
|
[% END %]
|
|
</li>
|
|
|
|
<li>
|
|
<label for="toc_request">Table of contents:</label>
|
|
<input type="checkbox" name="toc_request" value="1"/>
|
|
</li>
|
|
|
|
<li>
|
|
[% IF mandatory_fields.search('pages') %]
|
|
<label for="pages" class="required">Pages:</label>
|
|
<input type="text" required="required" name="pages" id="pages" size="50" value="[% pageinfo | html %]"/>
|
|
[% ELSE %]
|
|
<label for="pages">Pages:</label>
|
|
<input type="text" name="pages" id="pages" size="50" value="[% pageinfo | html %]"/>
|
|
[% END %]
|
|
</li>
|
|
|
|
<li>
|
|
[% IF mandatory_fields.search('chapters') %]
|
|
<label for="chapters" class="required">Chapters:</label>
|
|
<input type="text" required="required" name="chapters" id="chapters" size="50"/>
|
|
[% ELSE %]
|
|
<label for="chapters">Chapters:</label>
|
|
<input type="text" name="chapters" id="chapters" size="50"/>
|
|
[% END %]
|
|
</li>
|
|
|
|
<li>
|
|
<label for="patron_notes">Notes:</label>
|
|
<input type="text" name="patron_notes" id="patron_notes" size="50"/>
|
|
</li>
|
|
|
|
<li>
|
|
<label for="format">Format:</label>
|
|
<select name="format" id="format">
|
|
<option value="PHOTOCOPY">Photocopy</option>
|
|
<option value="SCAN">Digital scan</option>
|
|
</select>
|
|
</li>
|
|
|
|
<li>
|
|
<label for="branchcode">Pickup library:</label>
|
|
<select name="branchcode" id="branchcode" required="required">
|
|
[% FOREACH b IN Branches.all %]
|
|
[% IF b.branchcode == Branches.GetLoggedInBranchcode %]
|
|
<option value="[% b.branchcode | html %]" selected="selected">[% b.branchname | html %]</option>
|
|
[% ELSE %]
|
|
<option value="[% b.branchcode | html %]">[% b.branchname | html %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
</ul>
|
|
</fieldset>
|
|
|
|
[% IF article_request_type != 'bib_only' %]
|
|
<table class="copiesrow table table-bordered table-striped">
|
|
<caption>Select a specific item:</caption>
|
|
<thead>
|
|
<tr>
|
|
<th> </th>
|
|
<th>Item type</th>
|
|
<th>Barcode</th>
|
|
<th>Home library</th>
|
|
<th>Call number</th>
|
|
<th>Enumeration</th>
|
|
</tr>
|
|
</thead>
|
|
|
|
<tbody>
|
|
[% FOREACH item IN biblio.items %]
|
|
[% IF item.can_article_request( patron ) %]
|
|
<tr>
|
|
<td>
|
|
[% IF article_request_type == 'item_only' && !checked %]
|
|
[% SET checked = 1 %]
|
|
<input type="radio" name="itemnumber" value="[% item.itemnumber | html %]" checked="checked" />
|
|
[% ELSE %]
|
|
<input type="radio" name="itemnumber" value="[% item.itemnumber | html %]" />
|
|
[% END %]
|
|
</td>
|
|
<td>
|
|
[% ItemTypes.GetDescription( item.itype ) | html %]
|
|
</td>
|
|
<td>
|
|
[% item.barcode | html %]
|
|
</td>
|
|
<td>
|
|
[% Branches.GetName( item.homebranch ) | html %]
|
|
</td>
|
|
<td>
|
|
[% item.itemcallnumber | html %]
|
|
</td>
|
|
<td>
|
|
[% item.enumchron | html %]
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
[% END %]
|
|
|
|
[% IF article_request_type != 'item_only' %]
|
|
<tr>
|
|
<td>
|
|
<input type="radio" name="itemnumber" value="" checked="checked"/>
|
|
</td>
|
|
<td colspan="6">
|
|
Any item
|
|
</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
</table>
|
|
[% END %]
|
|
|
|
<input type="submit" class="btn btn-primary" value="Place request" />
|
|
</form>
|
|
[% END %]
|
|
[% ELSE %]
|
|
<h1 class="title">[% biblio.title | html %]</h1>
|
|
<div class="alert alert-info">
|
|
No article requests can be made for this record.
|
|
</div>
|
|
[% END %]
|
|
</div> <!-- /.col -->
|
|
</div> <!-- /.row -->
|
|
</div> <!-- / .container-fluid -->
|
|
</div> <!-- / .main -->
|
|
|
|
[% INCLUDE 'opac-bottom.inc' %]
|
|
|
|
[% BLOCK jsinclude %]
|
|
<script>
|
|
$(document).ready( function() {
|
|
allow_submit = false;
|
|
$('#place-article-request').on('submit', function( event ){
|
|
if ( ! allow_submit ) {
|
|
event.preventDefault();
|
|
|
|
[% IF article_request_type == 'item_only' %]
|
|
if ( ! $("input:radio[name='itemnumber']").is(":checked") ) {
|
|
alert( _("Please select a specific item for this article request.") );
|
|
return 0;
|
|
}
|
|
[% END %]
|
|
|
|
var mandatory_fields = "[% mandatory_fields | html %]";
|
|
var m = new Array();
|
|
if ( mandatory_fields ) m = mandatory_fields.split(",");
|
|
var f = new Array();
|
|
|
|
for (i = 0; i < m.length; i++) {
|
|
if ( ! $("#" + m[i]).val() ) {
|
|
f.push( m[i] );
|
|
}
|
|
}
|
|
|
|
if ( f.length ) {
|
|
alert( _("The following fields are required and not filled in: ") + f.join(", ") );
|
|
return 0;
|
|
}
|
|
|
|
// Check if all fields are blank
|
|
if( m.length == 0 && $('#title').val()=='' && $('#author').val()=='' && $('#volume').val()=='' && $('#issue').val()=='' && $('#date').val()=='' && $('#pages').val()=='' && $('#chapters').val()=='' && $('#patron_notes').val()=='' && !$('input[name="toc_request"]').prop('checked') ) {
|
|
alert( _("Please fill in at least one field.") );
|
|
return 0;
|
|
}
|
|
|
|
allow_submit = true;
|
|
$('#place-article-request').submit();
|
|
}
|
|
});
|
|
|
|
// Initialize format(s)
|
|
var supported_formats = "[% Koha.Preference('ArticleRequestsSupportedFormats') | $raw %]";
|
|
if( !supported_formats.match(/PHOTOCOPY/) )
|
|
$('#format option[value="PHOTOCOPY"]').remove();
|
|
if( !supported_formats.match(/SCAN/) )
|
|
$('#format option[value="SCAN"]').remove();
|
|
|
|
if( $('#format option').length > 1 ) {
|
|
// Select first listed format
|
|
var first_format = supported_formats.split('|')[0].replace(/^\s*|\s*$/g, '');
|
|
$('#format option[value="'+first_format+'"]').attr('selected', true);
|
|
}
|
|
});
|
|
</script>
|
|
[% END %]
|