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>
88 lines
4.8 KiB
Text
88 lines
4.8 KiB
Text
[% USE Koha %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Browse our catalog</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% BLOCK cssinclude %][% END %]
|
|
</head>
|
|
[% INCLUDE 'bodytag.inc' bodyid='opac-browser' %]
|
|
[% 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>
|
|
<li class="breadcrumb-item active" aria-current="page">
|
|
<a href="#">Browse our catalog</a>
|
|
</li>
|
|
</ul>
|
|
</nav>
|
|
|
|
<div class="container-fluid">
|
|
<div class="row">
|
|
[% IF ( OpacNav || OpacNavBottom ) %]
|
|
<div class="col-lg-2">
|
|
<div id="navigation">
|
|
[% INCLUDE 'navigation.inc' %]
|
|
</div>
|
|
</div>
|
|
<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 %]
|
|
|
|
<div id="userbrowser" class="maincontent">
|
|
<h2>Browse our catalog</h2>
|
|
|
|
[% IF ( have_hierarchy ) %]
|
|
<ul>
|
|
<li>
|
|
[% description | html %] <a href="opac-browser.pl">Top level</a>
|
|
</li>
|
|
<li style="list-style-type: none;">
|
|
<ul>
|
|
[% FOREACH HIERARCHY_LOO IN HIERARCHY_LOOP %]
|
|
<li>
|
|
<a href="opac-browser.pl?level=[% HIERARCHY_LOO.level | uri %]&filter=[% HIERARCHY_LOO.classification |uri %]">[% HIERARCHY_LOO.description | html %]</a>
|
|
</li>
|
|
<li style="list-style-type: none;">
|
|
[% END %]
|
|
<li style="list-style-type: none;">
|
|
<table class="table table-bordered table-striped">
|
|
<tr>
|
|
[% FOREACH LEVEL_LOO IN LEVEL_LOOP %]
|
|
<td>
|
|
<p>
|
|
[% IF ( LEVEL_LOO.endnode ) %]
|
|
<a href="opac-search.pl?q=Dewey-classification:[% LEVEL_LOO.classification |uri %]">[% LEVEL_LOO.description | html %]</a>
|
|
[% ELSE %]
|
|
<a href="opac-browser.pl?level=[% LEVEL_LOO.level | uri %]&filter=[% LEVEL_LOO.classification |uri %]">[% LEVEL_LOO.description | html %]</a>
|
|
[% END %]
|
|
</p>
|
|
<p style="font-size:0.75em"><em>([% LEVEL_LOO.number | html %] biblios)</em></p>
|
|
</td>
|
|
[% IF ( LEVEL_LOO.count3 ) %]</tr><tr>[% END %]
|
|
[% END %]
|
|
</tr>
|
|
</table>
|
|
</li>
|
|
[% FOREACH HIERARCHY_LOO IN HIERARCHY_LOOP %]
|
|
</ul></li>
|
|
[% END %]
|
|
</ul>
|
|
</li>
|
|
</ul>
|
|
[% ELSE %]
|
|
<div class="warning">The browser table is empty. this feature is not fully set-up. See the <a href="http://wiki.koha-community.org/wiki/Opac_browse_feature">Koha Wiki</a> for more information on what it does and how to configure it.</div>
|
|
[% END # / IF have_hierarchy %]
|
|
|
|
</div> <!-- / .userbrowser -->
|
|
|
|
</div> <!-- / .col-10/12 -->
|
|
</div> <!-- / .row -->
|
|
</div> <!-- / .container-fluid -->
|
|
</div> <!-- / .main -->
|
|
|
|
[% INCLUDE 'opac-bottom.inc' %]
|
|
[% BLOCK jsinclude %][% END %]
|