From 4ef70e02253948910f782d024d2be2b2e31d9eb1 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Mon, 23 Jan 2012 07:43:11 +0100 Subject: [PATCH 1/1] [SIGNED-OFF] Bug 5346: Small display changes Changing display from: Suggested by Admin, Koha (from suggestion #2) To: Suggested by: Admin, Koha (suggestion #2) Adding some missing parentheses and deleting some additional spaces. Signed-off-by: Jonathan Druart --- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 5 ++--- .../prog/en/modules/acqui/neworderempty.tt | 4 ++-- .../prog/en/modules/acqui/orderreceive.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 10 ++++------ 4 files changed, 10 insertions(+), 13 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 1632278..abfa675 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -285,9 +285,8 @@ [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %][% END %] [% IF ( books_loo.suggestionid ) %]
- Suggested by [% books_loo.surnamesuggestedby %] - [% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby %] [% END %] - (from suggestion #[% books_loo.suggestionid %]) + Suggested by: [% books_loo.surnamesuggestedby %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby %] [% END %] + (suggestion #[% books_loo.suggestionid %]) [% END %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index 6a6fc65..a3bfa67 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -315,8 +315,8 @@ $(document).ready(function() Suggestion
  1. - Suggested by - [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby %][% END %] (from suggestion #[% suggestionid %]) + Suggested by: + [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby %][% END %] (suggestion #[% suggestionid %])
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index fe8287d..f06d353 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -41,8 +41,8 @@ Suggestion
  1. - Suggested by - [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby %][% END %] (from suggestion #[% suggestionid %]) + Suggested by: + [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby %][% END %] (suggestion #[% suggestionid %])
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 34a55b0..8e45870 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -243,9 +243,8 @@ [% IF ( loop_order.publishercode ) %]
Publisher :[% loop_order.publishercode %][% END %] [% IF ( loop_order.suggestionid ) %]
- Suggested by [% loop_order.surnamesuggestedby %] - [% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %] - (from suggestion #[% loop_order.suggestionid %]) + Suggested by: [% loop_order.surnamesuggestedby %][% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %] + (suggestion #[% loop_order.suggestionid %]) [% END %] MARC | Card @@ -369,9 +368,8 @@ [% IF ( loop_receive.publishercode ) %]
Publisher :[% loop_receive.publishercode %][% END %] [% IF ( loop_receive.suggestionid ) %]
- Suggested by [% loop_receive.surnamesuggestedby %] - [% IF ( loop_receive.firstnamesuggestedby ) %], [% loop_receive.firstnamesuggestedby %] [% END %] - (from suggestion #[% loop_receive.suggestionid %] + Suggested by: [% loop_receive.surnamesuggestedby %][% IF ( loop_receive.firstnamesuggestedby ) %], [% loop_receive.firstnamesuggestedby %] [% END %] + (suggestion #[% loop_receive.suggestionid %]) [% END %] MARC | Card -- 1.7.7.3