Owen Leonard
9cb89b4639
This patch updates the version of Bootstrap in the OPAC from 2.3.1 to 4.5.0. The Bootstrap JavaScript files have been replaced with custom builds of the 4.5.0 JavaScript source files. The Bootstrap CSS is now built into the OPAC CSS by loading the required Bootstrap 4.5.0 SCSS files in node_modules. OPAC SCSS now starts with Bootstrap customizations: /* Bootstrap variable customizations */ $headings-color: #727272; ... Followed by loading the necessary Bootstrap SCSS files: /* Bootstrap imports */ @import "../../../../../node_modules/bootstrap/scss/functions"; @import "../../../../../node_modules/bootstrap/scss/variables"; ... Followed by our CSS. The build process for generating compiled CSS now creates a file which bundles Bootstrap CSS and ours. Removed from the Koha source: Bootstrap CSS files, Bootstrap "glyphicons" images. The upgrade to Bootstrap 4 involved a lot of markup changes to conform with new Bootstrap classes, especially in classes related to the grid. Besides duplicating the grid we used before, this upgrade adds some new features made possible by Bootstrap 4.5's use of flexbox as a layout tool. This includes custom ordering of columns based on class names: https://getbootstrap.com/docs/4.5/layout/grid/#order-classes. Other areas where the most changes have been made: Navigation menus, breadcrumb menus, buttons, dropdowns. Bootstrap's JavaScript file is now "bootstrap.bundle.min.js" to reflect the fact that a required JavaScript asset is now distributed separately in Bootstrap 4. The "bundle" version includes Popper.js. Unrelated changes: Indentation corrections, removal of invalid "//<![CDATA[" markers, removal of invalid script type attributes. To test, apply the patch and run 'yarn install' to install Bootstrap as an npm module. Run 'yarn build --view opac' to regenerate the OPAC CSS. Test as many aspect of the OPAC as possible, viewing pages at various browser widths to confirm that everything adjusts well. Test with various OPAC interface system preferences enabled and disabled. Test self checkout and self checkin. Known issues: RTL support has not been updated. Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
339 lines
17 KiB
HTML
339 lines
17 KiB
HTML
[% USE raw %]
|
|
[% USE Koha %]
|
|
[% USE KohaNews %]
|
|
[%- USE KohaPlugins -%]
|
|
[% USE Asset %]
|
|
[% SET opaccredits = KohaNews.get( location => "opaccredits", lang => lang, library => branchcode ) %]
|
|
[% PROCESS 'html_helpers.inc' %]
|
|
[% UNLESS ( is_popup ) %]
|
|
[% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %]
|
|
[% IF ( opaccredits ) %]
|
|
<div class="container-fluid">
|
|
<div class="row">
|
|
<div class="col">
|
|
[% PROCESS koha_news_block news => opaccredits %]
|
|
</div>
|
|
</div>
|
|
</div>
|
|
[% END #/ opaccredits %]
|
|
|
|
[% IF ( Koha.Preference('OPACReportProblem') && Koha.Preference('KohaAdminEmailAddress') ) || OpacKohaUrl %]
|
|
<div class="container-fluid">
|
|
<div class="row">
|
|
<div class="col">
|
|
<div id="report-koha-url">
|
|
<div class="row justify-content-between">
|
|
[% IF Koha.Preference('OPACReportProblem') && Koha.Preference('KohaAdminEmailAddress') %]
|
|
<div class="col">
|
|
<div id="report_a_problem" class="noprint">
|
|
<a class="koha-url" href="/cgi-bin/koha/opac-reportproblem.pl">Report a problem</a>
|
|
</div>
|
|
</div>
|
|
[% END # / IF Koha.Preference('OPACReportProblem') && Koha.Preference('KohaAdminEmailAddress') %]
|
|
[% IF OpacKohaUrl %]
|
|
<div class="col">
|
|
<div id="koha_url" class="clearfix noprint">
|
|
<p>Powered by
|
|
[% IF template.name.match('opac-main.tt') %]
|
|
<a class="koha_url" href="http://koha-community.org">Koha</a>
|
|
[% ELSE %]
|
|
<a class="koha_url" rel="nofollow" href="http://koha-community.org">Koha</a>
|
|
[% END %]</p>
|
|
</div> <!-- /#koha_url -->
|
|
</div> <!-- /.col -->
|
|
[% END # /IF OpacKohaUrl %]
|
|
</div> <!-- /.row.justify-content-between -->
|
|
</div> <!-- /#report-koha-url -->
|
|
</div> <!-- /.col -->
|
|
</div> <!-- /.row -->
|
|
</div> <!-- /.container-fluid -->
|
|
[% END # / OPACReportProblem || OpacKohaUrl %]
|
|
</div> <!-- / #wrapper in masthead.inc -->
|
|
|
|
[% IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer' %]
|
|
[% IF ( opaclanguagesdisplay ) %]
|
|
[% IF ( languages_loop && opaclanguagesdisplay ) %]
|
|
[% UNLESS ( one_language_enabled ) %]
|
|
<footer id="changelanguage" class="noprint">
|
|
<ul class="nav">
|
|
<li class="nav-item">
|
|
<span class="navbar-text">Languages:</span>
|
|
</li>
|
|
[% FOREACH languages_loo IN languages_loop %]
|
|
[% IF ( languages_loo.group_enabled ) %]
|
|
[% IF ( languages_loo.plural ) %]
|
|
<li class="nav-item dropup">
|
|
<a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="show[% languages_loo.rfc4646_subtag | html %]">
|
|
[% IF ( languages_loo.native_description ) %]
|
|
[% languages_loo.native_description | html %]
|
|
[% ELSE %]
|
|
[% languages_loo.rfc4646_subtag | html %]
|
|
[% END %]
|
|
</a><!-- /.nav-link.dropdown-toggle -->
|
|
<div id="sub[% languages_loo.rfc4646_subtag | html %]" class="dropdown-menu" aria-labelledby="show[% languages_loo.rfc4646_subtag | html %]">
|
|
[% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %]
|
|
[% IF ( sublanguages_loo.enabled ) %]
|
|
[% IF ( sublanguages_loo.sublanguage_current ) %]
|
|
<a class="dropdown-item" href="#">[% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</a>
|
|
[% ELSE %]
|
|
<a class="dropdown-item" href="/cgi-bin/koha/opac-changelanguage.pl?language=[% sublanguages_loo.rfc4646_subtag | uri %]"> [% sublanguages_loo.native_description | html %] [% sublanguages_loo.script_description | html %] [% sublanguages_loo.region_description | html %] [% sublanguages_loo.variant_description | html %] ([% sublanguages_loo.rfc4646_subtag | html %])</a>
|
|
[% END %]
|
|
[% END # / IF sublanguages_loo.enabled %]
|
|
[% END # / FOREACH sublanguages_loo %]
|
|
</div> <!-- /#sub[% languages_loo.rfc4646_subtag | html %] -->
|
|
</li> <!-- /.nav-item.dropup -->
|
|
[% ELSE %]
|
|
[% IF ( languages_loo.group_enabled ) %]
|
|
[% IF ( languages_loo.current ) %]
|
|
<li class="nav-item">
|
|
<a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">
|
|
[% IF ( languages_loo.native_description ) %]
|
|
[% languages_loo.native_description | html %]
|
|
[% ELSE %]
|
|
[% languages_loo.rfc4646_subtag | html %]
|
|
[% END %]
|
|
</a> <!-- /.nav-link -->
|
|
</li> <!-- /.nav-item -->
|
|
[% ELSE %]
|
|
<li class="nav-item">
|
|
<a class="nav-link" href="/cgi-bin/koha/opac-changelanguage.pl?language=[% languages_loo.rfc4646_subtag | uri %]">
|
|
[% IF ( languages_loo.native_description ) %]
|
|
[% languages_loo.native_description | html %]
|
|
[% ELSE %]
|
|
[% languages_loo.rfc4646_subtag | html %]
|
|
[% END %]
|
|
</a> <!-- /.nav-link -->
|
|
</li> <!-- /.nav-item -->
|
|
[% END # /IF ( languages_loo.current ) %]
|
|
[% END # / IF languages_loo.current %]
|
|
[% END # / IF ( languages_loo.plural ) %]
|
|
[% END # / IF ( languages_loo.group_enabled ) %]
|
|
[% END # / FOREACH languages_loo IN languages_loop %]
|
|
</ul> <!-- /.nav -->
|
|
</footer> <!-- / #changelanguage -->
|
|
[% END # / UNLESS ( one_language_enabled ) %]
|
|
[% END # / IF ( languages_loop && opaclanguagesdisplay ) %]
|
|
[% END # / IF opaclanguagesdisplay %]
|
|
[% END # /IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer' %]
|
|
[% END # / UNLESS is_popup %]
|
|
|
|
<!-- JavaScript includes -->
|
|
[% Asset.js("lib/jquery/jquery-3.4.1.min.js") | $raw %]
|
|
[% Asset.js("lib/jquery/jquery-migrate-3.1.0.min.js") | $raw %]
|
|
[% Asset.js("lib/jquery/jquery-ui-1.12.1.min.js") | $raw %]
|
|
<script>
|
|
// Resolve name collision between jQuery UI and Twitter Bootstrap
|
|
$.widget.bridge('uitooltip', $.ui.tooltip);
|
|
</script>
|
|
[% Asset.js("lib/bootstrap/js/bootstrap.bundle.min.js") | $raw %]
|
|
[% Asset.js("lib/fontfaceobserver.min.js") | $raw %]
|
|
[% Asset.js("js/global.js") | $raw %]
|
|
<script>
|
|
Modernizr.load([
|
|
// Test need for polyfill
|
|
{
|
|
test: window.matchMedia,
|
|
nope: "[% Asset.url('lib/media.match.min.js') | $raw %]"
|
|
},
|
|
// and then load enquire
|
|
"[% Asset.url('lib/enquire.min.js') | $raw %]",
|
|
"[% Asset.url('js/script.js') | $raw %]",
|
|
]);
|
|
|
|
// Fix for datepicker in a modal
|
|
$.fn.modal.Constructor.prototype.enforceFocus = function () {};
|
|
</script>
|
|
[% IF ( OPACAmazonCoverImages || SyndeticsCoverImages ) %]
|
|
<script>
|
|
var NO_AMAZON_IMAGE = _("No cover image available");
|
|
|
|
</script>
|
|
[% Asset.js("js/amazonimages.js") | $raw %]
|
|
[% END %]
|
|
|
|
<script>
|
|
|
|
var MSG_CONFIRM_AGAIN = _("Warning: Cannot be undone. Please confirm once again")
|
|
var MSG_DELETE_SEARCH_HISTORY = _("Are you sure you want to delete your search history?");
|
|
var MSG_NO_SUGGESTION_SELECTED = _("No suggestion was selected");
|
|
var MSG_SEARCHING = _("Searching %s...");
|
|
var MSG_ERROR_SEARCHING_COLLECTION = _("Error searching %s collection");
|
|
var MSG_NO_RESULTS_FOUND_IN_COLLECTION = _("No results found in the library's %s collection");
|
|
var MSG_RESULTS_FOUND_IN_COLLECTION = _("Found %s results in the library's %s collection");
|
|
var MSG_BY = _("by");
|
|
var MSG_TYPE = _("Type");
|
|
var MSG_NEXT = _("Next");
|
|
var MSG_PREVIOUS = _("Previous");
|
|
var MSG_CHECKOUTS = _("Checkouts");
|
|
var MSG_NO_CHECKOUTS = _("No checkouts");
|
|
var MSG_CHECK_OUT = _("Check out");
|
|
var MSG_CHECK_OUT_CONFIRM = _("Are you sure you want to check out this item?");
|
|
var MSG_CHECKED_OUT_UNTIL = _("Checked out until %s");
|
|
var MSG_CHECK_IN = _("Check in");
|
|
var MSG_CHECK_IN_CONFIRM = _("Are you sure you want to return this item?");
|
|
var MSG_NO_CHECKOUTS = _("No checkouts");
|
|
var MSG_DOWNLOAD = _("Download");
|
|
var MSG_HOLDS = _("Holds");
|
|
var MSG_NO_HOLDS = _("No holds");
|
|
var MSG_PLACE_HOLD = _("Place hold");
|
|
var MSG_CANCEL_HOLD = _("Cancel");
|
|
var MSG_CANCEL_HOLD_CONFIRM = _("Are you sure you want to cancel this hold?");
|
|
var MSG_ON_HOLD = _("On hold");
|
|
|
|
[% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) %]
|
|
var MSG_TAGS_DISABLED = _("Sorry, tags are not enabled on this system.");
|
|
var MSG_TAG_ALL_BAD = _("Error! Your tag was entirely markup code. It was NOT added. Please try again with plain text.");
|
|
var MSG_ILLEGAL_PARAMETER = _("Error! Illegal parameter");
|
|
var MSG_TAG_SCRUBBED = _("Note: your tag contained markup code that was removed. The tag was added as ");
|
|
var MSG_ADD_TAG_FAILED = _("Error! Adding tags failed at");
|
|
var MSG_ADD_TAG_FAILED_NOTE = _("Note: you can only tag an item with a given term once. Check 'My Tags' to see your current tags.");
|
|
var MSG_DELETE_TAG_FAILED = _("Error! You cannot delete the tag");
|
|
var MSG_DELETE_TAG_FAILED_NOTE = _("Note: you can only delete your own tags.")
|
|
var MSG_LOGIN_REQUIRED = _("You must be logged in to add tags.");
|
|
var MSG_TAGS_ADDED = _("Tags added: ");
|
|
var MSG_TAGS_DELETED = _("Tags added: ");
|
|
var MSG_TAGS_ERRORS = _("Errors: ");
|
|
var MSG_MULTI_ADD_TAG_FAILED = _("Unable to add one or more tags.");
|
|
var MSG_NO_TAG_SPECIFIED = _("No tag was specified.");
|
|
[% END %]
|
|
[% IF ( Koha.Preference('OverDriveClientKey') && Koha.Preference('OverDriveClientSecret') ) %]
|
|
var MSG_OVERDRIVE_LOGIN = _("Log in to your OverDrive account");
|
|
var MSG_OVERDRIVE_LINK = _( "OverDrive account page" );
|
|
var MSG_OVERDRIVE_LOGOUT = _("Log out from your OverDrive account");
|
|
var MSG_OVERDRIVE_CHECKEDOUT_UNTIL = _( "Checked out until: " );
|
|
var MSG_OVERDRIVE_ACCESS_ONLINE = _("Access online");
|
|
var MSG_OVERDRIVE_DOWNLOAD_AS = _( "Download as: " );
|
|
var MSG_OVERDRIVE_CANNOT_CHECKOUT = _("Item cannot be checked out. There are no available formats");
|
|
[% END %]
|
|
[% IF OpenLibraryCovers || OpenLibrarySearch %]
|
|
var NO_OL_JACKET = _("No cover image available");
|
|
var OL_PREVIEW = _("Preview");
|
|
[% END %]
|
|
[% IF (query_desc) %]
|
|
var query_desc = "[% query_desc | html %]";
|
|
var querystring = "[% querystring | html %]";
|
|
var query_cgi = "[% query_cgi | html %]";
|
|
[% END %]
|
|
|
|
[% IF ( OPACAmazonCoverImages || SyndeticsCoverImages ) %]
|
|
$(window).load(function() {
|
|
verify_images();
|
|
});
|
|
[% END %]
|
|
$(".print-large").on("click",function(){
|
|
window.print();
|
|
return false;
|
|
});
|
|
$("#ulactioncontainer > ul > li > a.addtoshelf").on("click",function(){
|
|
Dopop('opac-addbybiblionumber.pl?biblionumber=[% biblionumber | uri %]');
|
|
return false;
|
|
});
|
|
$("body").on("click", ".addtocart", function(e){
|
|
e.preventDefault();
|
|
var biblionumber = $(this).data("biblionumber");
|
|
addRecord( biblionumber );
|
|
});
|
|
$("body").on("click", ".cartRemove", function(e){
|
|
e.preventDefault();
|
|
var biblionumber = $(this).data("biblionumber");
|
|
delSingleRecord( biblionumber );
|
|
});
|
|
$(".clearsh").on("click", function(){
|
|
return confirmDelete(MSG_DELETE_SEARCH_HISTORY);
|
|
});
|
|
|
|
</script>
|
|
|
|
[% IF Koha.Preference( 'opacbookbag' ) == 1 %]
|
|
[% Asset.js("js/basket.js") | $raw %]
|
|
[% ELSIF ( Koha.Preference( 'virtualshelves' ) == 1 ) %]
|
|
[% Asset.js("js/basket.js") | $raw %]
|
|
[% ELSE %]
|
|
<script>var readCookie;</script>
|
|
[% END %]
|
|
|
|
[% IF Koha.Preference( 'opacuserlogin' ) == 1 %][% IF Koha.Preference( 'TagsEnabled' ) == 1 %][% Asset.js("js/tags.js") | $raw %][% END %][% ELSE %][% END %]
|
|
[% IF ( GoogleJackets ) %]
|
|
[% Asset.js("js/google-jackets.js") | $raw %]
|
|
<script>
|
|
|
|
var NO_GOOGLE_JACKET = _("No cover image available");
|
|
|
|
</script>
|
|
[% END %]
|
|
[% IF ( Koha.Preference('OpacCoce') && Koha.Preference('CoceProviders') ) %]
|
|
[% Asset.js("js/coce.js") | $raw %]
|
|
<script>
|
|
|
|
var NO_COCE_JACKET = _("No cover image available");
|
|
|
|
</script>
|
|
[% END %]
|
|
|
|
[% IF OPACLocalCoverImages %]
|
|
[% Asset.js("js/localcovers.js") | $raw %]
|
|
<script>
|
|
|
|
var NO_LOCAL_JACKET = _("No cover image available");
|
|
|
|
</script>
|
|
[% END %]
|
|
|
|
[% IF ( BakerTaylorEnabled ) %]
|
|
[% Asset.js("js/bakertaylorimages.js") | $raw %]
|
|
<script>
|
|
|
|
var NO_BAKERTAYLOR_IMAGE = _("No cover image available");
|
|
$(window).load(function(){
|
|
bt_verify_images();
|
|
});
|
|
|
|
</script>
|
|
[% END %]
|
|
|
|
[% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %]
|
|
<script>
|
|
$("#news-branch-select").change(function() {
|
|
$( "#news-branch-select" ).submit();
|
|
});
|
|
</script>
|
|
[% END %]
|
|
|
|
[% IF Koha.Preference('RecordedBooksClientSecret') && Koha.Preference('RecordedBooksLibraryID') %]
|
|
<script>
|
|
var SPINNER_THROBBER = "[% interface | html %]/lib/jquery/plugins/themes/classic/throbber.gif";
|
|
</script>
|
|
[% END %]
|
|
|
|
[% Asset.js("lib/jquery/plugins/jquery.cookie.min.js") | $raw %]
|
|
<script>
|
|
$(document).ready(function() {
|
|
if($('#searchsubmit').length) {
|
|
$(document).on("click", '#searchsubmit', function(e) {
|
|
jQuery.removeCookie("form_serialized", { path: '/'});
|
|
jQuery.removeCookie("form_serialized_limits", { path: '/'});
|
|
jQuery.removeCookie("num_paragraph", { path: '/'});
|
|
jQuery.removeCookie("search_path_code", { path: '/'});
|
|
});
|
|
}
|
|
});
|
|
</script>
|
|
[% PROCESS jsinclude %]
|
|
[% IF ( Koha.Preference('OPACUserJS') ) %]
|
|
<script>
|
|
[% Koha.Preference('OPACUserJS') | $raw %]
|
|
</script>
|
|
[% END %]
|
|
[% IF SCO_login %]
|
|
[% SET SCOUserJS = Koha.Preference('SCOUserJS') %]
|
|
[% IF ( SCOUserJS ) %]
|
|
<script>
|
|
|
|
[% SCOUserJS | $raw %]
|
|
|
|
</script>
|
|
[% END %]
|
|
[% END %]
|
|
[% KohaPlugins.get_plugins_opac_js | $raw %]
|
|
</body>
|
|
</html>
|