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>
60 lines
3.5 KiB
Text
60 lines
3.5 KiB
Text
[% USE Koha %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Sending your list</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% BLOCK cssinclude %][% END %]
|
|
</head>
|
|
[% INCLUDE 'bodytag.inc' bodyid='sendshelf' 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="usersendshelfform" class="maincontent">
|
|
[% IF ( email ) %]
|
|
[% IF ( SENT ) %]
|
|
<h1>Message sent</h1>
|
|
<div class="alert alert-success">
|
|
<p>The list was sent to: [% email | html %]</p>
|
|
</div>
|
|
<p><a class="focus close" href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% shelfid | html %]">Back to lists</a></p>
|
|
[% END %]
|
|
[% IF ( error ) %]
|
|
<div class="alert alert-warning">
|
|
<p>There was an error sending the list.</p>
|
|
</div>
|
|
[% END %]
|
|
[% ELSE %]
|
|
[% IF ( invalidlist ) %]
|
|
<div class="alert alert-warning">
|
|
<p>You do not have permission to send this list.</p>
|
|
</div>
|
|
<p><a class="button close" href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% shelfid | html %]">Back to lists</a></p>
|
|
[% ELSE %]
|
|
<h1>Sending your list</h1>
|
|
<form action="/cgi-bin/koha/opac-sendshelf.pl" method="post" id="sendshelfform">
|
|
<fieldset>
|
|
<label for="email">Email address:</label>
|
|
<input type="text" id="email" name="email" size="43" class="focus" />
|
|
|
|
<label for="comment">Comment:</label>
|
|
<textarea id="comment" name="comment" rows="4" cols="40"></textarea>
|
|
|
|
<input type="hidden" name="shelfid" value="[% shelfid | html %]" />
|
|
</fieldset>
|
|
[% IF Koha.Preference('RequestOnOpac') || Koha.Preference('OpacRenewalAllowed') %]<p id="donotrequestbymail">Please do not use this mail to request or renew books.</p>[% END %]
|
|
<fieldset class="action">
|
|
<input type="submit" value="Send" class="btn btn-primary" />
|
|
<a class="cancel close" href="/cgi-bin/koha/opac-shelves.pl?op=view&shelfnumber=[% shelfid | html %]">Cancel</a>
|
|
</fieldset>
|
|
</form>
|
|
|
|
[% END # / IF invalidlist %]
|
|
[% END # / IF email %]
|
|
</div> <!-- / #usersendshelfform -->
|
|
</div> <!-- / .span12 -->
|
|
</div> <!-- / .row -->
|
|
</div> <!-- / .container-fluid -->
|
|
</div> <!-- / .main -->
|
|
|
|
[% INCLUDE 'opac-bottom.inc' is_popup=1 %]
|
|
[% BLOCK jsinclude %][% END %]
|