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>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

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 26be49e..b805ba1 100644 (file)
--- 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" --> <!-- 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 6c739e6..0c02540 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -75,8 +75,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>
 
@@ -94,8 +92,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 -->