From 079ab2ff1b9875b56e13ff02fbdc372b09d935a7 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Thu, 20 Feb 2025 09:28:28 -0300 Subject: [PATCH] Bug 38340: (follow-up) Refactor and tidy template files Signed-off-by: Tomas Cohen Arazi --- .../includes/ill/backends/Standard/create.inc | 1 + .../ill/backends/Standard/edititem.inc | 1 + .../ill/backends/Standard/inc/shared.js | 60 ++++++++++--------- .../ill/backends/Standard/migrate.inc | 1 + .../includes/ill/backends/Standard/create.inc | 1 + .../ill/backends/Standard/inc/shared.js | 60 ++++++++++--------- 6 files changed, 68 insertions(+), 56 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/create.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/create.inc index 29e137b3bf0..44e97a0b1d9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/create.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/create.inc @@ -118,6 +118,7 @@ [% BLOCK backend_jsinclude %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/inc/shared.js b/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/inc/shared.js index c65fcdab401..61f188abe96 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/inc/shared.js +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/inc/shared.js @@ -1,44 +1,48 @@ -var core = [ [% whole.core %] ]; -var opac = [% opac || 0 %]; -document.addEventListener('DOMContentLoaded', function() { - $('#add-new-fields').click(function(e) { +document.addEventListener("DOMContentLoaded", function () { + $("#add-new-fields").click(function (e) { e.preventDefault(); - var row = '
  • ' + + var row = + '
  • ' + '' + - ' ' + + "" + + '" name="custom_key" placeholder="' + + __("key") + + '">' + + " " + ' ' + + "" + + '" placeholder="' + + __("value") + + '"> ' + '
  • '; - $('#standard-fields').append(row); + __("Delete") + + ""; + $("#standard-fields").append(row); }); - $('#standard-fields').on('click', '.delete-new-field', - function(event) { - event.preventDefault(); - $(event.target).parent().remove(); - } - ); - $('#type').change(function() { - $('#create_form').prepend( + $("#standard-fields").on("click", ".delete-new-field", function (event) { + event.preventDefault(); + $(event.target).parent().remove(); + }); + $("#type").change(function () { + $("#create_form").prepend( '' ); - $('#create_form').submit(); + $("#create_form").submit(); }); - $('#standard-fields').on('keyup', '.custom-name', function() { + $("#standard-fields").on("keyup", ".custom-name", function () { var val = $(this).val(); if (core.indexOf(val.toLowerCase()) > -1) { - $('#custom-warning').text(__("The name '%s' is not permitted").format(val)).show(); - $('#ill-submit').attr('disabled', true); - $('#add-new-fields').attr('disabled', true); + $("#custom-warning") + .text(__("The name '%s' is not permitted").format(val)) + .show(); + $("#ill-submit").attr("disabled", true); + $("#add-new-fields").attr("disabled", true); } else { - $('#custom-warning').hide(); - $('#ill-submit').attr('disabled', false); - $('#add-new-fields').attr('disabled', false); + $("#custom-warning").hide(); + $("#ill-submit").attr("disabled", false); + $("#add-new-fields").attr("disabled", false); } }); }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/migrate.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/migrate.inc index af20a7fdb66..9661c640e82 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/migrate.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/migrate.inc @@ -107,6 +107,7 @@ [% BLOCK backend_jsinclude %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/create.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/create.inc index d79b91ef527..006b7302559 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/create.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/create.inc @@ -108,6 +108,7 @@ [% BLOCK backend_jsinclude %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/inc/shared.js b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/inc/shared.js index c65fcdab401..493a4146c64 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/inc/shared.js +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/ill/backends/Standard/inc/shared.js @@ -1,44 +1,48 @@ -var core = [ [% whole.core %] ]; -var opac = [% opac || 0 %]; -document.addEventListener('DOMContentLoaded', function() { - $('#add-new-fields').click(function(e) { +document.addEventListener("DOMContentLoaded", function () { + $("#add-new-fields").click(function (e) { e.preventDefault(); - var row = '
  • ' + + var row = + '
  • ' + '' + - ' ' + + "form-control input-fluid custom-field-input" + + '" name="custom_key" placeholder="' + + __("key") + + '">' + + " " + ' ' + + "form-control input-fluid custom-field-input" + + '" placeholder="' + + __("value") + + '"> ' + '
  • '; - $('#standard-fields').append(row); + __("Delete") + + ""; + $("#standard-fields").append(row); }); - $('#standard-fields').on('click', '.delete-new-field', - function(event) { - event.preventDefault(); - $(event.target).parent().remove(); - } - ); - $('#type').change(function() { - $('#create_form').prepend( + $("#standard-fields").on("click", ".delete-new-field", function (event) { + event.preventDefault(); + $(event.target).parent().remove(); + }); + $("#type").change(function () { + $("#create_form").prepend( '' ); - $('#create_form').submit(); + $("#create_form").submit(); }); - $('#standard-fields').on('keyup', '.custom-name', function() { + $("#standard-fields").on("keyup", ".custom-name", function () { var val = $(this).val(); if (core.indexOf(val.toLowerCase()) > -1) { - $('#custom-warning').text(__("The name '%s' is not permitted").format(val)).show(); - $('#ill-submit').attr('disabled', true); - $('#add-new-fields').attr('disabled', true); + $("#custom-warning") + .text(__("The name '%s' is not permitted").format(val)) + .show(); + $("#ill-submit").attr("disabled", true); + $("#add-new-fields").attr("disabled", true); } else { - $('#custom-warning').hide(); - $('#ill-submit').attr('disabled', false); - $('#add-new-fields').attr('disabled', false); + $("#custom-warning").hide(); + $("#ill-submit").attr("disabled", false); + $("#add-new-fields").attr("disabled", false); } }); }); -- 2.48.1