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>
122 lines
6.2 KiB
Text
122 lines
6.2 KiB
Text
[% USE Koha %]
|
|
[% IF ( fullpage ) %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Download list [% shelf.shelfname | html %]</title>[% INCLUDE 'doc-head-close.inc' %]
|
|
[% BLOCK cssinclude %][% END %]
|
|
</head>
|
|
[% INCLUDE 'bodytag.inc' bodyid='opac-downloadlist' %]
|
|
[% INCLUDE 'masthead.inc' %]
|
|
<div class="main">
|
|
<nav aria-label="breadcrumb">
|
|
<ul class="breadcrumb">
|
|
<li class="breadcrumb-item">
|
|
<a href="/cgi-bin/koha/opac-main.pl">Home</a>
|
|
</li>
|
|
[% IF ( logged_in_user ) %]
|
|
<li class="breadcrumb-item"><a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a></li>
|
|
[% END %]
|
|
<li class="breadcrumb-item">
|
|
[% IF shelf.category == 1 %]
|
|
<a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=1">Your lists</a>
|
|
[% ELSE %]
|
|
<a href="/cgi-bin/koha/opac-shelves.pl?op=list&category=2">Public lists</a>
|
|
[% END %]
|
|
</li>
|
|
<li class="breadcrumb-item active" aria-current="page">
|
|
Download list <em>[% shelf.shelfname | html %]</em>
|
|
</li>
|
|
</ul>
|
|
</nav>
|
|
|
|
<div class="container-fluid">
|
|
<div class="row">
|
|
[% IF ( OpacNav||loggedinusername ) %]
|
|
<div class="col-lg-2">
|
|
<div id="navigation">
|
|
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
|
|
</div>
|
|
</div>
|
|
[% END %]
|
|
|
|
[% IF ( OpacNav||loggedinusername ) %]
|
|
<div class="col-10 order-first order-md-first order-lg-2">
|
|
[% ELSE %]
|
|
<div class="col order-first order-md-first order-lg-2">
|
|
[% END %]
|
|
[% END # / IF fullpage %]
|
|
|
|
<div id="userdownloadshelf" class="maincontent">
|
|
[% UNLESS ( invalidlist ) %]
|
|
|
|
[% IF ( format ) %]
|
|
<div class="alert alert-info">
|
|
<p>Your download should begin automatically.</p>
|
|
</div>
|
|
[% ELSE %]
|
|
<h1>Download list <em>[% shelf.shelfname | html %]</em></h1>
|
|
<form method="post" action="/cgi-bin/koha/opac-downloadshelf.pl">
|
|
<fieldset>
|
|
<select name="format" id="dlformat" required="required">
|
|
<option value="">-- Choose format --</option>
|
|
<option value="ris">RIS (Zotero, EndNote, others)</option>
|
|
<option value="bibtex">BibTeX</option>
|
|
<option value="isbd">ISBD</option>
|
|
<option value="iso2709">MARC</option>
|
|
[% FOREACH csv_profile IN csv_profiles %]
|
|
<option value="[% csv_profile.export_format_id | html %]">CSV - [% csv_profile.profile | html %]</option>
|
|
[% END %]
|
|
</select>
|
|
<span class="required">Required</span>
|
|
</fieldset>
|
|
|
|
<fieldset class="action">
|
|
<input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
|
|
<input type="submit" name="save" class="btn btn-primary" value="Go" />
|
|
<a href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% shelf.shelfnumber | uri %]" class="cancel close" data-dismiss="modal">Cancel</a>
|
|
</fieldset>
|
|
</form>
|
|
[% IF ( modal ) %]
|
|
<script>
|
|
$(document).ready(function(){
|
|
$("#userdownloadshelf form").on("submit",function(e){
|
|
if( $("#dlformat").val() == "" ){
|
|
e.preventDefault();
|
|
alert(_("Please choose a download format"));
|
|
} else {
|
|
$("#modalWin").modal("hide");
|
|
}
|
|
});
|
|
});
|
|
</script>
|
|
[% END %]
|
|
[% END # / IF format %]
|
|
|
|
[% ELSE %]
|
|
|
|
<div class="alert alert-warning">
|
|
<p>You do not have permission to download this list.</p>
|
|
</div>
|
|
|
|
[% END # / invalidlist %]
|
|
|
|
</div> <!-- / #userdownloadshelf -->
|
|
|
|
[% IF ( fullpage ) %]
|
|
</div> <!-- / .col-10 -->
|
|
</div> <!-- / .row -->
|
|
</div> <!-- / .container-fluid -->
|
|
</div> <!-- / .main -->
|
|
[% INCLUDE 'opac-bottom.inc' %]
|
|
[% BLOCK jsinclude %]
|
|
<script>
|
|
$(document).ready(function(){
|
|
$("#userdownloadshelf form").on("submit",function(e){
|
|
if( $("#dlformat").val() == "" ){
|
|
e.preventDefault();
|
|
alert(_("Please choose a download format"));
|
|
}
|
|
});
|
|
});
|
|
</script>
|
|
[% END %]
|
|
[% END # / IF fullpage %]
|