From c657dd7f338c27b88d96e3076427e228a7cd18d4 Mon Sep 17 00:00:00 2001
From: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
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() {
 </div>
 
 <div id="doc3" class="yui-t2">
-
-[% IF ( unknownbiblionumber ) %]
-  <div class="dialog message">The record you requested does not exist ([% biblionumber %]).</div>
-[% ELSE %]
-   <div id="bd">
-    <div id="yui-main">
-    <div class="yui-b">
-
-[% INCLUDE 'cat-toolbar.inc' %]
-    [% IF ( ocoins ) %]
-        <!-- COinS / OpenURL -->
-        <span class="Z3988" title="[% ocoins %]"></span>
-    [% END %]
-
-    [% IF ( AmazonCoverImages ) %]
-        [% IF ( XSLTDetailsDisplay ) %]
-            <div class="yui-gc">
-            <div id="catalogue_detail_biblio" class="yui-u first">
-        [% ELSE %]
-            <div class="yui-gb">
-            <div id="catalogue_detail_biblio" class="yui-u first">
-        [% END %]
+    [% IF ( unknownbiblionumber ) %]
+        <div class="dialog message">The record you requested does not exist ([% biblionumber %]).</div>
     [% ELSE %]
-        [% IF ( XSLTDetailsDisplay ) %]
-            <div class="yui-g">
-            <div id="catalogue_detail_biblio">
-        [% ELSE %]
-            <div class="yui-g">
-            <div id="catalogue_detail_biblio" class="yui-u first">
-        [% END %]
-    [% END %]
-
-    [% IF ( XSLTDetailsDisplay ) %]
-        [% XSLTBloc %]
-        [% IF ( countorders || countdeletedorders ) %]
-            <span class="biblio_in_orders">
-	        <span class="label">Number of order(s) using this title: </span>
-		<span>
-		    [% IF ( countorders ) %]
-                        [% countorders %] active order(s) in basket(s)
-			[% FOREACH basketo IN basketsorders %]
-			   [% IF ( CAN_user_acquisition_order_manage ) %]
-			    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketo %]">#[% basketo %]</a>,
-			   [% 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 ) %]
-			    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketdo %]">#[% basketdo %]</a>,
-			   [% ELSE %]
-			    [% basketdo %],
-			   [% END %]
-			[% END %]
-		    [% END %]
-	       </span>
-	  </span>
-        [% END %]
+        <div id="bd">
+            <div id="yui-main">
+                <div class="yui-b">
+                    [% INCLUDE 'cat-toolbar.inc' %]
+                    [% IF ( ocoins ) %]
+                        <!-- COinS / OpenURL -->
+                        <span class="Z3988" title="[% ocoins %]"></span>
+                    [% END %]
+                    [% IF ( AmazonCoverImages ) %]
+                        [% IF ( XSLTDetailsDisplay ) %]
+                            <div class="yui-gc">
+                            <div id="catalogue_detail_biblio" class="yui-u first">
+                        [% ELSE %]
+                            <div class="yui-gb">
+                            <div id="catalogue_detail_biblio" class="yui-u first">
+                        [% END %]
+                    [% ELSE %]
+                        [% IF ( XSLTDetailsDisplay ) %]
+                            <div class="yui-g">
+                            <div id="catalogue_detail_biblio">
+                        [% ELSE %]
+                            <div class="yui-g">
+                            <div id="catalogue_detail_biblio" class="yui-u first">
+                        [% END %]
+                    [% END %]
+                  [% IF ( XSLTDetailsDisplay ) %]
+                        [% XSLTBloc %]
+                        [% IF ( countorders || countdeletedorders ) %]
+                            <span class="biblio_in_orders">
+                                <span class="label">Number of order(s) using this title: </span>
+                                <span>
+                                    [% IF ( countorders ) %]
+                                        [% countorders %] active order(s) in basket(s)
+                                        [% FOREACH basketo IN basketsorders %]
+                                            [% IF ( CAN_user_acquisition_order_manage ) %]
+                                                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketo %]">#[% basketo %]</a>
+                                                [%- 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 ) %]
+                                                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketdo %]">#[% basketdo %]</a>
+                                                [%- UNLESS loop.last %],[% END %]
+                                            [% ELSE %]
+                                                [% basketdo %]
+                                                [%- UNLESS loop.last %],[% END %]
+                                            [% END %]
+                                        [% END %]
+                                    [% END %]
+                                </span>
+                            </span>
+                        [% END %]
         [% IF ( GetShelves ) %]
             <span class="results_summary"><span class="label">Lists that include this title: </span>
             [% FOREACH GetShelve IN GetShelves %]
@@ -333,33 +333,37 @@ function verify_images() {
                 [% END %]
             </li>
         [% END %]
-	<span>&nbsp;</span>
+        <span>&nbsp;</span>
         [% IF ( countorders || countdeletedorders ) %]
             <li><strong>Number of order(s) using this title: </strong>
-	            [% IF ( countorders ) %]
-                        [% countorders %] active order(s) in basket(s)
-			[% FOREACH basketo IN basketsorders %]
-			   [% IF ( CAN_user_acquisition_order_manage ) %]
-			    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketo %]">#[% basketo %]</a>,
-			   [% 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 ) %]
-			    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketdo %]">#[% basketdo %]</a>,
-			   [% ELSE %]
-			    [% basketdo %],
-			   [% END %]
-			[% END %]
-		    [% END %]
-	    </li>
+                [% IF ( countorders ) %]
+                    [% countorders %] active order(s) in basket(s)
+                    [% FOREACH basketo IN basketsorders %]
+                        [% IF ( CAN_user_acquisition_order_manage ) %]
+                            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketo %]">#[% basketo %]</a>
+                            [%- 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 ) %]
+                            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketdo %]">#[% basketdo %]</a>
+                            [%- UNLESS loop.last %],[% END %]
+                        [% ELSE %]
+                            [% basketdo %]
+                            [%- UNLESS loop.last %],[% END %]
+                        [% END %]
+                    [% END %]
+                [% END %]
+            </li>
         [% END %]
         <!--This grabs all of the lists a bib record appears in -->
         [% IF ( GetShelves ) %]
-- 
1.7.9.5