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>
101 lines
4.7 KiB
Text
101 lines
4.7 KiB
Text
[% USE Koha %]
|
|
[% SET consentview = 1 %]
|
|
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog › Your consents</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% BLOCK cssinclude %][% END %]
|
|
</head>
|
|
[% INCLUDE 'bodytag.inc' bodyid='opac-patron-consent' %]
|
|
[% 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">
|
|
<a href="/cgi-bin/koha/opac-user.pl">[% patron.firstname | html %] [% patron.surname | html %]</a>
|
|
</li>
|
|
<li class="breadcrumb-item" aria-current="page">
|
|
<a href="#">Your consents</a>
|
|
</li>
|
|
</ul>
|
|
</nav>
|
|
|
|
<div class="container-fluid">
|
|
<div class="row">
|
|
<div class="col-lg-2">
|
|
<div id="navigation">
|
|
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
|
|
</div>
|
|
</div>
|
|
<div class="col-lg-10 order-first order-md-first order-lg-2">
|
|
<div id="patronconsents" class="maincontent">
|
|
|
|
[% IF Koha.Preference('GDPR_Policy') %]
|
|
<div class="alert alert-warning">
|
|
<p>In order to keep you logged in, we need your consent to process personal data as specified in the EU General Data Protection Regulation of May 25, 2018.</p>
|
|
<p>Please save your consent below or log out. Thank you!</p>
|
|
</div>
|
|
[% END %]
|
|
|
|
<h3>Your consents</h3>
|
|
|
|
<form action="/cgi-bin/koha/opac-patron-consent.pl" method="post">
|
|
[% IF Koha.Preference('GDPR_Policy') %]
|
|
<h5>GDPR consents</h5>
|
|
<input type="hidden" name="op" value="gdpr_proc_save"/>
|
|
<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]"/>
|
|
<fieldset>
|
|
<ul><li>
|
|
<p>I have read the <a target="_blank" href="[% Koha.Preference('PrivacyPolicyURL') | url %]">privacy policy</a> and agree with your processing of my personal data as outlined therein.</p>
|
|
<p><input type="radio" name="gdpr_processing" value="agreed"> Yes, I agree.<br>
|
|
<input type="radio" name="gdpr_processing" value="disagreed"> No, I do not agree. Please remove my account within a reasonable time.</p>
|
|
[% IF gdpr_proc_consent %]
|
|
<p>Your consent was registered on [% gdpr_proc_consent | html %].</p>
|
|
[% ELSIF gdpr_proc_refusal %]
|
|
<p>You indicated recently that you do not consent, and we will process your request soon.</p>
|
|
[% END %]
|
|
</li></ul>
|
|
</fieldset>
|
|
<fieldset class="action">
|
|
<input id="saveconsent" type="submit" value="Save" class="btn btn-primary" />
|
|
</fieldset>
|
|
[% END %]
|
|
|
|
</form>
|
|
|
|
</div> <!-- / #userpasswd -->
|
|
</div> <!-- / .col-lg-10 -->
|
|
</div> <!-- / .row -->
|
|
</div> <!-- / .container-fluid -->
|
|
</div> <!-- / .main -->
|
|
|
|
[% INCLUDE 'opac-bottom.inc' %]
|
|
[% BLOCK jsinclude %]
|
|
<script>
|
|
var consent = null;
|
|
$(document).ready(function() {
|
|
[% IF gdpr_proc_consent %]
|
|
consent=1;
|
|
$("input[type='radio'][value='agreed']").prop('checked',true);
|
|
$(".alert").hide();
|
|
[% ELSIF gdpr_proc_refusal %]
|
|
consent=0;
|
|
$("input[type='radio'][value='disagreed']").prop('checked',true);
|
|
[% ELSE %]
|
|
[% END %]
|
|
$("#saveconsent").prop('disabled', true);
|
|
|
|
$("input[type='radio']").click(function() {
|
|
var radio = $(this).val();
|
|
if(radio=='agreed' && (consent==null || consent==0)) $("#saveconsent").prop('disabled', false);
|
|
if(radio=='disagreed' && (consent==null || consent==1)) $("#saveconsent").prop('disabled', false);
|
|
if(radio=='agreed') $(".alert").hide();
|
|
if(radio=='disagreed') $(".alert").show();
|
|
});
|
|
|
|
});
|
|
</script>
|
|
[% END %]
|