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>
74 lines
4 KiB
Text
74 lines
4 KiB
Text
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Comments on [% INCLUDE 'biblio-title-head.inc' %]</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% BLOCK cssinclude %][% END %]
|
|
</head>
|
|
[% INCLUDE 'bodytag.inc' bodyid='comment' bodyclass='popup' %]
|
|
<div class="main">
|
|
<div class="container-fluid">
|
|
<div class="row">
|
|
<div class="col order-first order-md-first order-lg-2">
|
|
<div id="userreview" class="maincontent">
|
|
[% IF ( cgi_debug ) %]
|
|
<div class="debug">CGI debug is on.</div>
|
|
[% END %]
|
|
[% IF ( ERRORS ) %]
|
|
<div class="alert alert-warning">
|
|
[% FOREACH ERROR IN ERRORS %]
|
|
[% IF ( ERROR.nobiblio ) %]
|
|
<p>Error: we cannot find this bibliographic record.</p>
|
|
[% END %]
|
|
[% IF ( ERROR.unauthorized ) %]
|
|
<p>Sorry, only the creator of this comment is allowed to change it.</p>
|
|
[% END %]
|
|
[% IF ( ERROR.scrubbed ) %]
|
|
<p>Note: your comment contained illegal markup code. It has been saved with the markup removed, as below. You can edit the comment further, or cancel to retain the comment as is.</p>
|
|
[% END %]
|
|
|
|
[% IF ( ERROR.scrubbed_all ) %]
|
|
<p>Error! Your comment was entirely illegal markup code. It has NOT been added.</p>
|
|
[% END %]
|
|
|
|
[% IF ( ERROR.empty ) %]
|
|
<p>Error! You cannot add an empty comment. Please add content or cancel.</p>
|
|
[% END %]
|
|
[% END # / FOREACH ERROR %]
|
|
[% IF ( WINDOW_CLOSE ) %]
|
|
Note: this window will close automatically in 5 seconds.
|
|
[% END %]
|
|
</div>
|
|
[% END # / ERRORs %]
|
|
|
|
<h1>Comments on <em>[% INCLUDE 'biblio-title.inc' %]</em></h1>
|
|
[% IF ( biblio.author ) %]<h3>[% biblio.author | html %]</h3>[% END %]
|
|
<form id="reviewf" action="/cgi-bin/koha/opac-review.pl[% IF ( cgi_debug ) %]?debug=1[% END %]" method="post">
|
|
<input type="hidden" name="biblionumber" value="[% biblio.biblionumber | html %]" />
|
|
[% IF ( reviewid ) %]<input type="hidden" name="reviewid" value="[% reviewid | html %]" />[% END %]
|
|
<fieldset>
|
|
<textarea id="review" name="review" cols="60" rows="8">[% review | html %]</textarea>
|
|
</fieldset>
|
|
<p>Note: Your comment must be approved by a librarian. </p>
|
|
<fieldset class="action">
|
|
<input type="submit" class="btn btn-primary" value="Submit and close this window" />
|
|
<a class="cancel close" href="#">Cancel</a>
|
|
</fieldset>
|
|
</form>
|
|
</div> <!-- / #usersendshelfform -->
|
|
</div> <!-- / .span12 -->
|
|
</div> <!-- / .row -->
|
|
</div> <!-- / .container-fluid -->
|
|
</div> <!-- / .main -->
|
|
|
|
[% INCLUDE 'opac-bottom.inc' is_popup=1 %]
|
|
[% BLOCK jsinclude %]
|
|
<script>
|
|
|
|
$(document).ready(function() {
|
|
[% IF WINDOW_CLOSE %]
|
|
opener.location.reload();
|
|
window.close();
|
|
[% END %]
|
|
});
|
|
|
|
</script>
|
|
[% END %]
|