From 0676a51faf02653ce00b1fe5e19f3469489e11d2 Mon Sep 17 00:00:00 2001
From: Garry Collum <gcollum@gmail.com>
Date: Sun, 9 Aug 2009 16:23:41 -0400
Subject: [PATCH] Bug 3292: Fix to display Branch names instead of branch codes in opac serial's displays.
Content-Type: text/plain; charset="utf-8"

Fixes display of branch name in opac-full-serial-issues.tmpl and opac-serial-issues.tmpl.  Also enables zebra striping in opac-serial-issues.
---
 C4/Serials.pm                                      |    2 ++
 .../prog/en/modules/opac-full-serial-issues.tmpl   |    8 ++++++--
 .../prog/en/modules/opac-serial-issues.tmpl        |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/C4/Serials.pm b/C4/Serials.pm
index 5f4b3ec..0745d3c 100644
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -587,6 +587,7 @@ sub GetFullSubscriptionsFromBiblionumber {
             aqbudget.bookfundid,aqbooksellers.name as aqbooksellername,
             biblio.title as bibliotitle,
             subscription.branchcode AS branchcode,
+            branches.branchname AS branchname,
             subscription.subscriptionid AS subscriptionid|;
      if (C4::Context->preference('IndependantBranches') && 
         C4::Context->userenv && 
@@ -601,6 +602,7 @@ sub GetFullSubscriptionsFromBiblionumber {
           (serial.subscriptionid=subscription.subscriptionid)
   LEFT JOIN aqbudget ON subscription.aqbudgetid=aqbudget.aqbudgetid 
   LEFT JOIN aqbooksellers on subscription.aqbooksellerid=aqbooksellers.id 
+  LEFT JOIN branches ON branches.branchcode=subscription.branchcode
   LEFT JOIN biblio on biblio.biblionumber=subscription.biblionumber 
   WHERE     subscription.biblionumber = ? 
   ORDER BY year DESC,
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
index f8318b5..5858232 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
@@ -41,11 +41,15 @@
                 <th>Status
                 </th>
             </tr>
-            <!-- TMPL_LOOP Name="serials" -->
+        <!-- TMPL_LOOP Name="serials" -->
+            <!-- TMPL_UNLESS Name="__odd__" -->
+            <tr class="highlight">
+            <!-- TMPL_ELSE --> 
             <tr>
+            <!-- /TMPL_UNLESS -->
                 <td>    <!-- TMPL_VAR Name="publisheddate" -->
                 </td>
-                <td>    <!-- TMPL_VAR name="branchcode" -->
+                <td>    <!-- TMPL_VAR name="branchname" -->
                 </td>
                 <td>    <!-- TMPL_VAR name="notes" -->
                 </td>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
index 56b5cdb..1a71cf9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
@@ -83,7 +83,7 @@
             <p>The subscription expired on <!-- TMPl_VAR name="histenddate" --></p>
         <!-- /TMPL_IF -->
 		</p>
-    <h2><!-- TMPL_VAR name="branchcode" --> <!-- TMPL_VAR name="notes" --></h2>
+    <h2><!-- TMPL_VAR name="branchname" --> <!-- TMPL_VAR name="notes" --></h2>
   <!-- TMPL_IF name="recievedlist" -->
     <h3>Available Issues</h3>
     <p>
-- 
1.5.6.5