[Koha-cvs] CVS: koha/koha-tmpl/opac-tmpl/css/en opac-detail.tmpl,1.15.2.12,1.15.2.13

Paul POULAIN tipaul at users.sourceforge.net
Tue Jul 26 10:38:29 CEST 2005 

Update of /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30254/koha-tmpl/opac-tmpl/css/en

Modified Files:
      Tag: rel_2_2
	opac-detail.tmpl 
Log Message:
<IMPORTANT NOTES for NPL>

Some cleaning :
- removing dirty hack getMARCurl in SearchMarc.pm & replacing it by some Perl in Search.pm : if repeated, urls are stored in biblioitems.url, separated by a |. Now, the urls are splitted in an array. WARNING : the template has been modified & NPL MUST modify their templates as well, should be really trivial (open http://bureau.paulpoulain.com:9010/cgi-bin/koha/opac-detail.pl?bib=1 to see the result)
- using getMARCsubjcts and getMARCnotes in css templates as well. WARNING (specially for NPL) : the MARC notes & subjects were outside from BIBLIO_RESULTS array. As notes & subjects were in this <!-- TMPL_LOOP --> i had to add them IN the loop. I think it's better, so I commented (line 73 and 74 of opac-detail) 2 lines that are useless for me but useful for you. My opinion is that it would be better to modify your template to put notes & subjects in the <TMPL_LOOP> (should be trivial) than uncommenting those lines (= create duplicate code)
However, my real opinion is that we have no good reason to use <!-- TMPL_LOOP name="BIBLIO_RESULTS" --> as we always have only 1 biblio here. But that's something we should fix in HEAD, not in 2.2

Index: opac-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/opac-tmpl/css/en/opac-detail.tmpl,v
retrieving revision 1.15.2.12
retrieving revision 1.15.2.13
diff -C2 -r1.15.2.12 -r1.15.2.13
*** opac-detail.tmpl	28 Jun 2005 07:35:49 -0000	1.15.2.12
--- opac-detail.tmpl	26 Jul 2005 08:38:27 -0000	1.15.2.13
***************
*** 54,75 ****
  				<!-- TMPL_IF name="author" --><p><label><b>Author:</b> </label><!-- TMPL_VAR NAME="author" --></p><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="additional" --><p><label><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --></p><!-- /TMPL_IF -->
! 				<p><!-- TMPL_IF name="publishercode" --><label><b>Published by :</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" --></p>
  				<p>
! 					<!-- TMPL_IF name="publicationyear" --><label><b>in </b></label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="publicationyear" -->
! 					<!-- TMPL_IF name="pages" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  					<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" -->
  				</p>
  				<!-- TMPL_IF name="isbn" --><p><label><b>ISBN:</b> </label><!-- TMPL_VAR NAME="isbn" --></p><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="issn" --><p><label><b>ISSN:</b> </label><!-- TMPL_VAR NAME="issn" --></p><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="seriestitle" --><p><label><b>Collection:</b> </label><!-- TMPL_VAR NAME="seriestitle" --> <!-- TMPL_IF name="volume" -->vol. <!-- TMPL_VAR name="volume" --><!-- /TMPL_IF --></p><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="subjects" --><p><label><b>Subject(s):</b> </label></p>
! 					<!-- TMPL_LOOP name="subjects" -->
! 						<p><a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator==&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, </p> <!-- /TMPL_LOOP -->
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="copyrightdate" --><p><label><b>Year :</b> </label><!-- TMPL_VAR NAME="copyrightdate" --></p><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="notes" --><p><label><b>Notes:</b> </label><!-- TMPL_VAR NAME="notes" --></p><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="unititle" --><p><label><b>Alt title:</b> </label><!-- TMPL_VAR NAME="unititle" --></p><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dewey" --><p><label><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --></p><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="url" --><p><label><b>URL:</b> </label><a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a></p><!-- /TMPL_IF -->
  				<p><label><b>Item type : </b></label>
  					<!-- TMPL_IF name="description" -->
--- 54,105 ----
  				<!-- TMPL_IF name="author" --><p><label><b>Author:</b> </label><!-- TMPL_VAR NAME="author" --></p><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="additional" --><p><label><b>Additional Author:</b></label><!-- TMPL_VAR NAME="additional" --></p><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="illus" --><p><label><b>Illus:</b></label><!-- TMPL_VAR name="illus" --></p><!-- /TMPL_IF -->
  				<p>
! 					<!-- TMPL_IF name="publishercode" --><label><b>Published by :</b></label><!-- /TMPL_IF --> <!-- TMPL_VAR NAME="publishercode" -->
! 				</p>
! 				<!-- TMPL_IF name="publicationyear" --><p><label><b>in </b></label><!-- TMPL_VAR NAME="publicationyear" --></p><!-- /TMPL_IF -->
! 				<p>
! 					<label>&nbsp;</label><!-- TMPL_IF name="pages" --> <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
  					<!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" -->
  				</p>
  				<!-- TMPL_IF name="isbn" --><p><label><b>ISBN:</b> </label><!-- TMPL_VAR NAME="isbn" --></p><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="issn" --><p><label><b>ISSN:</b> </label><!-- TMPL_VAR NAME="issn" --></p><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="seriestitle" --><p><label><b>Collection:</b> </label><!-- TMPL_VAR NAME="seriestitle" --> <!-- TMPL_IF name="volume" -->vol. <!-- TMPL_VAR name="volume" --> <!-- TMPL_VAR name="volumedate" --><!-- /TMPL_IF --><!-- TMPL_VAR name="volumedesc" --></p><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="MARCSUBJCTS" -->
! 					<p><label><b>Subjects:</b></label></p>
! 					<p>
! 						<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
! 							<label>-</label><a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->">
! 								<!-- TMPL_VAR NAME="marcsubjct" -->
! 							</a><br>
! 						<!-- /TMPL_LOOP -->
! 					</p>
! 				<!-- TMPL_ELSE -->
! 					<!-- TMPL_IF name="subjects" --><p><label><b>Subject(s):</b> </label></p>
! 						<!-- TMPL_LOOP name="subjects" -->
! 							<p><a href="/cgi-bin/koha/opac-search.pl?op=do_search&marclist=bibliosubject.subject&and_or=and&operator==&value=<!-- TMPL_VAR NAME="subject" escape="HTML"-->"><!-- TMPL_VAR NAME="subject" --></a>, </p> <!-- /TMPL_LOOP -->
! 					<!-- /TMPL_IF -->
  				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="copyrightdate" --><p><label><b>Year :</b> </label><!-- TMPL_VAR NAME="copyrightdate" --></p><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="MARCNOTES" -->
! 					<p><label><b>Notes:</b> </label></p>
! 					<p>
! 						<!-- TMPL_LOOP NAME="MARCNOTES" -->
! 							<p>- <!-- TMPL_VAR NAME="marcnote" --></p>
! 						<!-- /TMPL_LOOP -->
! 					</p>
! 				<!-- TMPL_ELSE -->
! 					<!-- TMPL_IF name="notes" --><p><label><b>Notes:</b> </label><!-- TMPL_VAR NAME="notes" --></p><!-- /TMPL_IF -->
! 				<!-- /TMPL_IF -->
  				<!-- TMPL_IF name="unititle" --><p><label><b>Alt title:</b> </label><!-- TMPL_VAR NAME="unititle" --></p><!-- /TMPL_IF -->
+ 				<!-- TMPL_IF name="classification" --><p><label><b>classification:</b></label><!-- TMPL_VAR name="subclass" --><!-- TMPL_VAR name="classification" --></p><!-- /TMPL_IF -->
  				<!-- TMPL_IF name="dewey" --><p><label><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --></p><!-- /TMPL_IF -->
! 				<!-- TMPL_IF name="URLS" -->
! 					<p><label><b>URL:</b> </label>
! 						<!-- TMPL_LOOP name="URLS" -->
! 							<a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a>&nbsp;
! 						<!-- /TMPL_LOOP -->
! 					</p>
! 				<!-- /TMPL_IF -->
  				<p><label><b>Item type : </b></label>
  					<!-- TMPL_IF name="description" -->
***************
*** 86,115 ****
  	</table>
  	<table>
- 	<!-- TMPL_IF name="MARCNOTES" -->
- 		<tr>
- 			<th><i>Detailed notes:</i></th>
- 			<td>
- 				<ul>
- 					<!-- TMPL_LOOP NAME="MARCNOTES" -->
- 						<i>- <!-- TMPL_VAR NAME="marcnote" --></i><br>
- 					<!-- /TMPL_LOOP -->
- 				</ul>
- 			</td>
- 		</tr>
- 	<!-- /TMPL_IF -->
- 	<!-- TMPL_IF name="MARCSUBJCTS" -->
- 		<tr>
- 			<th>Related links:</th>
- 			<td>
- 				<ul>
- 					<!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
- 						- <a href="/cgi-bin/koha/opac-searchresults.pl?subjectitems=<!-- TMPL_VAR NAME="marcsubjct" ESCAPE="URL"-->">
- 							<!-- TMPL_VAR NAME="marcsubjct" -->
- 						</a><br>
- 					<!-- /TMPL_LOOP -->
- 				</ul>
- 			</td>
- 		</tr>
- 	<!-- /TMPL_IF -->
  	</table>
  	</div>
--- 116,119 ----
***************
*** 162,172 ****
  	<!-- TMPL_IF name="subscriptionsnumber" -->
  		<div id="bloc25">
! 		<p>This is a serial subscription (There are <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions associated with this title).</p> 
  		<!-- TMPL_LOOP Name="subscriptions" -->
! 				<b class="catalogue"> Subscription #<!--TMPL_VAR Name="subscriptionid"--> </b>
  				<p><!--TMPL_VAR Name="subscriptionnotes"--> </p>
  				<!--TMPL_IF Name="latestserials"-->
- 				<p> Here comes a list of the three latest issues related to this subscription :</p>
  				<table>
  				<!--TMPL_LOOP Name="latestserials"-->
  					<tr>
--- 166,177 ----
  	<!-- TMPL_IF name="subscriptionsnumber" -->
  		<div id="bloc25">
! 		<p>This is a serial subscription (we have <!-- TMPL_VAR name="subscriptionsnumber" --> subscription(s) associated with this title).</p> 
! 		<p>Below is a list of the three latest issues related to those subscription(s) :</p>
  		<!-- TMPL_LOOP Name="subscriptions" -->
! 				<h2> Subscription #<!--TMPL_VAR Name="subscriptionid"--> </h2>
  				<p><!--TMPL_VAR Name="subscriptionnotes"--> </p>
  				<!--TMPL_IF Name="latestserials"-->
  				<table>
+ 				<tr><th>Issue number</th><th>Date</th><th>Status</th></tr>
  				<!--TMPL_LOOP Name="latestserials"-->
  					<tr>
***************
*** 198,202 ****
  				<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<p> For more information :Click <a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues"> here to look for Issues</a> we have or don't have</p>
  		</div>
   	<!-- /TMPL_IF -->
--- 203,207 ----
  				<!-- /TMPL_IF -->
  		<!-- /TMPL_LOOP -->
! 		<p><a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">Click here</a> for more information on subscription(s) history</p>
  		</div>
   	<!-- /TMPL_IF -->

More information about the Koha-cvs mailing list