From a05c1cb9a60ea40a6b2716a16136ca92488a979f Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 26 Oct 2018 19:43:20 +0000 Subject: [PATCH] Bug 21526: (RM follow-up) Fix merge markers and a few extra filters Signed-off-by: Nick Clemens --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 8 +------- .../intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt | 6 +++--- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index b203534..49ee8c8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -586,15 +586,9 @@ [% bookseller = order.transferred_to.bookseller %] [% timestamp = order.transferred_to.timestamp %]

Transferred to basket: -<<<<<<< HEAD - [% basket.basketname | html %] - ([% bookseller.name | html %]) - on -======= [% basket.basketname | html %] ([% bookseller.name | html %]) - on ->>>>>>> Bug 21526: uri escape TT variables when used in 'a href' + on [% timestamp | $KohaDates %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt index adf1879..e2bdbeb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt @@ -17,9 +17,9 @@ Label creatorBatches › [% IF description %] - Edit [% description | html %] + Edit [% description | html %] [% ELSIF batch_id %] - Edit ([% batch_id | html %]) + Edit ([% batch_id | html %]) [% ELSE %] New [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt index 99616a8..ff26bef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/edit-batch.tt @@ -16,9 +16,9 @@ Patron card creatorBatches › [% IF description %] - Edit [% description | html %] + Edit [% description | html %] [% ELSIF batch_id %] - Edit ([% batch_id | html %]) + Edit ([% batch_id | html %]) [% ELSE %] New [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt index 8cabc05..d36a481 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt @@ -441,15 +441,15 @@ $(document).ready(function() { [% INCLUDE 'serials-menu.inc' %] +
  • Show biblio
  • -- 2.1.4