From df03217b49edb02e6f88b6bddb73f2b0de0a2013 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 30 Apr 2009 11:36:19 -0500
Subject: [PATCH] More fixes for Bug 2704, 440 Display Issues

Multiple series now display along with other detailed bibliographic information. Series title is displayed along with volume information. The template no longer displays information from biblioitems like volume and volumedesc in favor of information pulled directly from the MARC record.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
---
 .../prog/en/modules/catalogue/detail.tmpl             | 11 ++++++++---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl  |  6 ++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index 554f7fd805..de8bfd0ee2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -58,9 +58,7 @@ function verify_images() {
         
     <h3><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR NAME="subtitle" --></h3> 
             <!-- TMPL_UNLESS NAME="item-level_itypes" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->"><!-- /TMPL_UNLESS -->
-<p>            <!-- TMPL_IF name="volume" --> <!-- TMPL_VAR name="volume" --><!-- /TMPL_IF -->
-            <!-- TMPL_IF name="volumedesc" -->, <!-- TMPL_VAR name="volumedesc" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="number" --> <!-- TMPL_VAR NAME="number" --> <!-- /TMPL_IF --></p>
-            <!-- TMPL_IF name="unititle" -->, <!-- TMPL_VAR name="unititle" escape="html" -->/<!-- /TMPL_IF -->
+            <!-- TMPL_IF name="unititle" --><p><!-- TMPL_VAR name="unititle" escape="html" --></p><!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="author" --><p>By <a href="/cgi-bin/koha/catalogue/search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="url" -->"><!-- TMPL_VAR NAME="author" --></a></p><!-- /TMPL_IF -->
         <ul>
         <!-- TMPL_IF name="MARCAUTHORS" -->
@@ -72,6 +70,13 @@ function verify_images() {
         </ul>
             </li>
         <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="MARCSERIES" -->
+		<li><strong>Series: </strong><ul><!-- TMPL_LOOP NAME="MARCSERIES" -->
+		<li><!-- TMPL_LOOP NAME="MARCSERIES_SUBFIELDS_LOOP" --> <!-- TMPL_IF NAME="value" --><a href="/cgi-bin/koha/catalogue/search.pl?q=se:<!-- TMPL_VAR NAME="value" ESCAPE="url"-->"><!-- TMPL_VAR NAME="value" --></a><!-- /TMPL_IF --><!-- TMPL_IF NAME="volumenum" -->. <!-- TMPL_VAR NAME="volumenum" --><!-- /TMPL_IF --><!-- /TMPL_LOOP --></li> 
+		<!-- /TMPL_LOOP -->
+		</ul>
+		</li>
+<!-- /TMPL_IF -->
         <!-- TMPL_IF name="publishercode" -->
     <li><strong>Published by:</strong>
         <a href="/cgi-bin/koha/catalogue/search.pl?q=pb:<!-- TMPL_VAR NAME="publishercode" ESCAPE="url" -->">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index d860d5d08d..3ef764cec6 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -76,8 +76,6 @@
             <!-- TMPL_VAR NAME="itemtype" -->
         <!-- /TMPL_IF -->
         ] <!-- /TMPL_UNLESS -->
-        <!-- TMPL_IF name="volume" --> <!-- TMPL_VAR NAME="volume" --><!-- /TMPL_IF -->
-        <!-- TMPL_IF name="volumedesc" -->, <!-- TMPL_VAR NAME="volumedesc" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="number" --> <!-- TMPL_VAR NAME="number" --> <!-- /TMPL_IF -->
         <!-- TMPL_IF name="unititle" -->, <!-- TMPL_VAR NAME="unititle" --><!-- /TMPL_IF -->
     </span>
 
@@ -95,8 +93,8 @@
     <span class="results_summary"><span class="label">Series:</span>
             <!-- TMPL_LOOP NAME="MARCSERIES" -->
             <!-- TMPL_LOOP NAME="MARCSERIES_SUBFIELDS_LOOP" -->
-            <a href="/cgi-bin/koha/opac-search.pl?q=se:<!-- TMPL_VAR NAME="value"-->"><!-- TMPL_VAR NAME="value" --></a>
-            <!-- /TMPL_LOOP -->
+            <!-- TMPL_IF NAME="value" --><a href="/cgi-bin/koha/opac-search.pl?q=se:<!-- TMPL_VAR NAME="value" ESCAPE="url"-->"><!-- TMPL_VAR NAME="value" --></a><!-- /TMPL_IF --><!-- TMPL_IF NAME="volumenum" -->. <!-- TMPL_VAR NAME="volumenum" --><!-- /TMPL_IF -->
+            <!-- /TMPL_LOOP --> <!-- TMPL_UNLESS NAME="__last__" -->|<!-- /TMPL_UNLESS -->
             <!-- /TMPL_LOOP -->
     </span>
     <!-- /TMPL_IF -->
-- 
2.20.1