Bug 23838: (QA follow-up) Move include files

As talked with Martin, this patches were originally developed before we
added the modals/ and str/ dirs, but we need to align it with current
way of doing it. This patch does that.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Tomás Cohen Arazi 2022-07-22 12:46:30 -03:00
parent f91df61c8e
commit 5ec4dced13
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
5 changed files with 14 additions and 12 deletions

View file

@ -1,18 +1,19 @@
<!-- Checkout renewals modal -->
<div id="checkoutRenewals" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="checkoutRenewalsLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="checkoutRenewalsLabel"> Item renewals</h3>
</div>
</div> <!-- /.modal-header -->
<div class="modal-body">
<div id="retrieving" class="alert" style="display:none">Retrieving renewals...</div>
<div id="incomplete" class="alert" style="display:none"></div>
<ul id="results" style="display:none"></ul>
</div>
</div> <!-- /.modal-body -->
<div class="modal-footer">
<button class="btn btn-default" data-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div>
</div>
</div>
</div> <!-- /.modal-footer -->
</div> <!-- /.modal-content -->
</div> <!-- /.modal-dialog -->
</div> <!-- /#checkoutRenewals -->

View file

@ -1,3 +1,4 @@
<!-- str/checkout_renewals.inc -->
<script>
var renewed_prop = _("Note: %s out of %s renewals have been logged");
var renewed = _("Renewed by");

View file

@ -376,13 +376,13 @@
[% MACRO jsinclude BLOCK %]
[% INCLUDE 'catalog-strings.inc' %]
[% INCLUDE 'checkout-renewal-modal.inc' %]
[% INCLUDE 'checkout-renewal-modal-strings.inc' %]
[% INCLUDE 'modals/checkout_renewals.inc' %]
[% INCLUDE 'str/checkout_renewals.inc' %]
[% INCLUDE 'js-date-format.inc' %]
[% INCLUDE 'js-patron-format.inc' %]
[% Asset.js("js/catalog.js") | $raw %]
[% Asset.js("js/browser.js") | $raw %]
[% Asset.js("js/checkout-renewal-modal.js") | $raw %]
[% Asset.js("js/checkout_renewals_modal.js") | $raw %]
<script>
var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10));
browser.show();

View file

@ -159,11 +159,11 @@
[% Asset.js("js/members-menu.js") | $raw %]
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'columns_settings.inc' %]
[% INCLUDE 'checkout-renewal-modal.inc' %]
[% INCLUDE 'checkout-renewal-modal-strings.inc' %]
[% INCLUDE 'modals/checkout_renewals.inc' %]
[% INCLUDE 'str/checkout_renewals.inc' %]
[% INCLUDE 'js-date-format.inc' %]
[% INCLUDE 'js-patron-format.inc' %]
[% Asset.js("js/checkout-renewal-modal.js") | $raw %]
[% Asset.js("js/checkout_renewals_modal.js") | $raw %]
<script id="js">
$(document).ready(function() {
var table_settings = [% TablesSettings.GetTableSettings('members', 'checkouthistory', 'checkouthistory-table', 'json') | $raw %];