Bugzilla – Attachment 178416 Details for
Bug 38340
Translatability - Standard form include files are not translatable
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38340: (follow-up) Refactor and tidy template files
Bug-38340-follow-up-Refactor-and-tidy-template-fil.patch (text/plain), 10.09 KB, created by
Tomás Cohen Arazi (tcohen)
on 2025-02-20 13:39:28 UTC
(
hide
)
Description:
Bug 38340: (follow-up) Refactor and tidy template files
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2025-02-20 13:39:28 UTC
Size:
10.09 KB
patch
obsolete
>From 079ab2ff1b9875b56e13ff02fbdc372b09d935a7 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >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 <tomascohen@theke.io> >--- > .../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 %] > <script> > // <![CDATA[] >+ var core = [ [% whole.core %] ]; > [% INCLUDE "ill/backends/Standard/inc/shared.js" %] > // Require a username and branch selection > document.addEventListener('DOMContentLoaded', function(){ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/edititem.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/edititem.inc >index fe67493c359..f3b9d5fdff2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/edititem.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill/backends/Standard/edititem.inc >@@ -84,6 +84,7 @@ > [% BLOCK backend_jsinclude %] > <script> > // <![CDATA[] >+ var core = [ [% whole.core %] ]; > [% INCLUDE "ill/backends/Standard/inc/shared.js" %] > // ]]> > </script> >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 = '<li class="form-horizontal">' + >+ var row = >+ '<li class="form-horizontal">' + > '<input type="text" class="custom-name ' + >- ( opac ? 'form-control input-fluid custom-field-input' : '') + >- '" name="custom_key" placeholder="'+__('key')+'">' + >- ' ' + >+ "" + >+ '" name="custom_key" placeholder="' + >+ __("key") + >+ '">' + >+ " " + > '<input type="text" id="custom-value" name="custom_value" class="' + >- ( opac ? 'form-control input-fluid custom-field-input' : '') +'" placeholder="'+__('value')+'"> ' + >+ "" + >+ '" placeholder="' + >+ __("value") + >+ '"> ' + > '<button type="button" class="btn btn-danger btn-sm ' + > 'delete-new-field">' + > '<span class="fa fa-trash-can"></span> ' + >- __('Delete') + >- '</button></li>'; >- $('#standard-fields').append(row); >+ __("Delete") + >+ "</button></li>"; >+ $("#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( > '<input type="hidden" name="change_type" value="1" />' > ); >- $('#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 %] > <script> > // <![CDATA[] >+ var core = [ [% whole.core %] ]; > [% INCLUDE "ill/backends/Standard/inc/shared.js" %] > // ]]> > </script> >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 %] > <script> > // <![CDATA[] >+ var core = [ [% whole.core %] ]; > [% INCLUDE "ill/backends/Standard/inc/shared.js" %] > // ]]> > </script> >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 = '<li class="form-horizontal">' + >+ var row = >+ '<li class="form-horizontal">' + > '<input type="text" class="custom-name ' + >- ( opac ? 'form-control input-fluid custom-field-input' : '') + >- '" name="custom_key" placeholder="'+__('key')+'">' + >- ' ' + >+ "form-control input-fluid custom-field-input" + >+ '" name="custom_key" placeholder="' + >+ __("key") + >+ '">' + >+ " " + > '<input type="text" id="custom-value" name="custom_value" class="' + >- ( opac ? 'form-control input-fluid custom-field-input' : '') +'" placeholder="'+__('value')+'"> ' + >+ "form-control input-fluid custom-field-input" + >+ '" placeholder="' + >+ __("value") + >+ '"> ' + > '<button type="button" class="btn btn-danger btn-sm ' + > 'delete-new-field">' + > '<span class="fa fa-trash-can"></span> ' + >- __('Delete') + >- '</button></li>'; >- $('#standard-fields').append(row); >+ __("Delete") + >+ "</button></li>"; >+ $("#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( > '<input type="hidden" name="change_type" value="1" />' > ); >- $('#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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 38340
:
177749
|
177750
|
178057
|
178058
|
178079
|
178080
|
178414
|
178415
|
178416
|
178418
|
178420
|
178421
|
178422
|
180066
|
180067
|
180068
|
181215
|
181216
|
181217
|
181294
|
181391
|
181392
|
181435
|
181541
|
181542
|
181543
|
181544
|
181549