From c657dd7f338c27b88d96e3076427e228a7cd18d4 Mon Sep 17 00:00:00 2001 From: Mathieu Saby Date: Fri, 15 Mar 2013 14:40:12 +0100 Subject: [PATCH 2] Bug 9780: Don't show comma at the end of the line Little improvement : This patch uses loop.last in detail.tt template to suppress useless comma. Also replacing some tabs by whitespaces. --- .../prog/en/modules/catalogue/detail.tt | 180 ++++++++++---------- 1 file changed, 92 insertions(+), 88 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index bcf56a4..81da7f9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -136,70 +136,70 @@ function verify_images() {
- -[% IF ( unknownbiblionumber ) %] -
The record you requested does not exist ([% biblionumber %]).
-[% ELSE %] -
-
-
- -[% INCLUDE 'cat-toolbar.inc' %] - [% IF ( ocoins ) %] - - - [% END %] - - [% IF ( AmazonCoverImages ) %] - [% IF ( XSLTDetailsDisplay ) %] -
-
- [% ELSE %] -
-
- [% END %] + [% IF ( unknownbiblionumber ) %] +
The record you requested does not exist ([% biblionumber %]).
[% ELSE %] - [% IF ( XSLTDetailsDisplay ) %] -
-
- [% ELSE %] -
-
- [% END %] - [% END %] - - [% IF ( XSLTDetailsDisplay ) %] - [% XSLTBloc %] - [% IF ( countorders || countdeletedorders ) %] - - Number of order(s) using this title: - - [% IF ( countorders ) %] - [% countorders %] active order(s) in basket(s) - [% FOREACH basketo IN basketsorders %] - [% IF ( CAN_user_acquisition_order_manage ) %] - #[% basketo %], - [% ELSE %] - [% basketo %], - [% END %] - [% END %] - [% END %] - [% IF ( countorders && countdeletedorders ) %] - and - [% END %] - [% IF ( countdeletedorders ) %] - [% countdeletedorders %] deleted order(s) in basket(s) - [% FOREACH basketdo IN basketsdeletedorders %] - [% IF ( CAN_user_acquisition_order_manage ) %] - #[% basketdo %], - [% ELSE %] - [% basketdo %], - [% END %] - [% END %] - [% END %] - - - [% END %] +
+
+
+ [% INCLUDE 'cat-toolbar.inc' %] + [% IF ( ocoins ) %] + + + [% END %] + [% IF ( AmazonCoverImages ) %] + [% IF ( XSLTDetailsDisplay ) %] +
+
+ [% ELSE %] +
+
+ [% END %] + [% ELSE %] + [% IF ( XSLTDetailsDisplay ) %] +
+
+ [% ELSE %] +
+
+ [% END %] + [% END %] + [% IF ( XSLTDetailsDisplay ) %] + [% XSLTBloc %] + [% IF ( countorders || countdeletedorders ) %] + + Number of order(s) using this title: + + [% IF ( countorders ) %] + [% countorders %] active order(s) in basket(s) + [% FOREACH basketo IN basketsorders %] + [% IF ( CAN_user_acquisition_order_manage ) %] + #[% basketo %] + [%- UNLESS loop.last %],[% END %] + [% ELSE %] + [% basketo %] + [%- UNLESS loop.last %],[% END %] + [% END %] + [% END %] + [% END %] + [% IF ( countorders && countdeletedorders ) %] + and + [% END %] + [% IF ( countdeletedorders ) %] + [% countdeletedorders %] deleted order(s) in basket(s) + [% FOREACH basketdo IN basketsdeletedorders %] + [% IF ( CAN_user_acquisition_order_manage ) %] + #[% basketdo %] + [%- UNLESS loop.last %],[% END %] + [% ELSE %] + [% basketdo %] + [%- UNLESS loop.last %],[% END %] + [% END %] + [% END %] + [% END %] + + + [% END %] [% IF ( GetShelves ) %] Lists that include this title: [% FOREACH GetShelve IN GetShelves %] @@ -333,33 +333,37 @@ function verify_images() { [% END %] [% END %] -   +   [% IF ( countorders || countdeletedorders ) %]
  • Number of order(s) using this title: - [% IF ( countorders ) %] - [% countorders %] active order(s) in basket(s) - [% FOREACH basketo IN basketsorders %] - [% IF ( CAN_user_acquisition_order_manage ) %] - #[% basketo %], - [% ELSE %] - [% basketo %], - [% END %] - [% END %] - [% END %] - [% IF ( countorders && countdeletedorders ) %] - and - [% END %] - [% IF ( countdeletedorders ) %] - [% countdeletedorders %] deleted order(s) in basket(s) - [% FOREACH basketdo IN basketsdeletedorders %] - [% IF ( CAN_user_acquisition_order_manage ) %] - #[% basketdo %], - [% ELSE %] - [% basketdo %], - [% END %] - [% END %] - [% END %] -
  • + [% IF ( countorders ) %] + [% countorders %] active order(s) in basket(s) + [% FOREACH basketo IN basketsorders %] + [% IF ( CAN_user_acquisition_order_manage ) %] + #[% basketo %] + [%- UNLESS loop.last %],[% END %] + [% ELSE %] + [% basketo %] + [%- UNLESS loop.last %],[% END %] + [% END %] + [% END %] + [% END %] + [% IF ( countorders && countdeletedorders ) %] + and + [% END %] + [% IF ( countdeletedorders ) %] + [% countdeletedorders %] deleted order(s) in basket(s) + [% FOREACH basketdo IN basketsdeletedorders %] + [% IF ( CAN_user_acquisition_order_manage ) %] + #[% basketdo %] + [%- UNLESS loop.last %],[% END %] + [% ELSE %] + [% basketdo %] + [%- UNLESS loop.last %],[% END %] + [% END %] + [% END %] + [% END %] + [% END %] [% IF ( GetShelves ) %] -- 1.7.9.5