From 695ce65132e7e88bd5d3da46e99b665b91a71eb6 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 4 Oct 2018 19:46:53 +0000 Subject: [PATCH] Bug 15774: (follow-up) Add html filters MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Séverine QUEUNE Signed-off-by: Jonathan Druart Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens --- .../en/includes/additional-fields-display.inc | 6 +-- .../en/includes/additional-fields-entry.inc | 16 ++++---- .../en/modules/admin/additional-fields.tt | 39 +++++++++---------- 3 files changed, 29 insertions(+), 32 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-display.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-display.inc index 41771a8fc1..7b2bab777d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-display.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-display.inc @@ -1,11 +1,11 @@ [% USE AuthorisedValues %] [% FOR field IN available %]
  • - [% field.name %]: + [% field.name | html %]: [% IF field.authorised_value_category %] - [% AuthorisedValues.GetByCode( field.authorised_value_category, values.${field.name} ) %] + [% AuthorisedValues.GetByCode( field.authorised_value_category, values.${field.name} ) | html %] [% ELSE %] - [% values.${field.name} %] + [% values.${field.name} | html %] [% END %]
    • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc index c8cbd83bcd..d20b7c5b80 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/additional-fields-entry.inc @@ -6,24 +6,24 @@ [% END %] [% FOR field IN available %]
  • - + [% IF field.authorised_value_category %] - [% FOREACH av IN AuthorisedValues.GetAuthValueDropbox( field.authorised_value_category ) %] [% IF av.authorised_value == values.${field.id} %] - + [% ELSE %] - + [% END %] [% END %] - (Authorised values for [% field.authorised_value_category %]) + (Authorised values for [% field.authorised_value_category | html %]) [% ELSE %] [% IF field.marcfield %] - - This value will be filled with the [% field.marcfield %] subfield of the selected biblio. + + This value will be filled with the [% field.marcfield | html %] subfield of the selected biblio. [% ELSE %] - + [% END %] [% END %]
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt index bdd6984be5..1d85a8e845 100755 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt @@ -1,15 +1,16 @@ +[% USE raw %] [% USE Asset %] [% USE AuthorisedValues %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › [% SWITCH op %] - [% CASE 'add_form' %][% IF field %]Modify additional field '[% field.name %]'[% ELSE %]Add additional field[% END %] + [% CASE 'add_form' %][% IF field %]Modify additional field '[% field.name | html %]'[% ELSE %]Add additional field[% END %] [% CASE %]Manage additional fields [% END %] [% INCLUDE 'doc-head-close.inc' %] -[% Asset.css('css/datatables.css') %] +[% Asset.css('css/datatables.css') | $raw %] [% marcfield_tables = ['subscription'] %] @@ -22,8 +23,8 @@ @@ -34,7 +35,7 @@
    [% IF op == 'list' %] [% END %] @@ -66,14 +67,14 @@

    Additional fields

    Select a table:

    [% BLOCK table_option %] -
  • [% content %] ([% value %])
    • +
  • [% content | html %] ([% value | html %])
    • [% END %]
      [% WRAPPER table_option value="aqbasket" %]Order baskets[% END %] [% WRAPPER table_option value="subscription" %]Subscriptions[% END %]
    [% ELSIF op == 'list' %] -

    Additional fields for '[% tablename %]'

    +

    Additional fields for '[% tablename | html %]'

    [% IF fields %] @@ -90,17 +91,17 @@ [% FOR field IN fields %] - - + + [% IF show_marcfield %] - + [% END %] [% END %] @@ -127,17 +128,13 @@ [% IF show_marcfield %]
  • - +
    • [% END %]
  • @@ -152,12 +149,12 @@
    [% IF field %] - + [% END %] - + - Cancel + Cancel
    [% END %] -- 2.39.5
    • [% field.name %][% field.authorised_value_category %][% field.name | html %][% field.authorised_value_category | html %][% field.marcfield %][% field.marcfield | html %] [% IF field.searchable %]Yes[% ELSE %]No[% END %] - Edit - Delete + Edit + Delete