improving non-MARC biblio detail in both intranet and opac.

diff --git a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
index 5cb5967..2fe5d00 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/catalogue/detail.tmpl
@@ -22,30 +22,24 @@
        </tr>
        <tr valign="top">
                <td>
-                       <form action="/cgi-bin/koha/modbib.pl" method="post">
-                       <table width="100%" border=0 cellspacing=0 cellpadding=0>
-                               <tr>
-                                       <td width="33%">
-                                               <input type="hidden" name="bibnum" value="<TMPL_VAR NAME="biblionumber">">
-                                               <input type="image" name="submit" value="modify" border="0" src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0>
-                                       </td>
-                                       <td width="33%"><input type="image" name="delete" value="delete" border="0" src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0"></td>
-                                       <td width="33%"><a href="MARCdetail.pl?bib=<TMPL_VAR name="biblionumber">">MARC</a></td>
-                               </tr>
-                       </table>
-                       </form>
-                       <br>
+                       <br/><a href="MARCdetail.pl?bib=<TMPL_VAR name="biblionumber">" class="button">MARC</a><br/><br/>
                        <FONT SIZE=2  face="arial, helvetica">
-                       <TMPL_IF name="subtitle"><b>Subtitle:</b></TMPL_IF> <TMPL_VAR NAME="subtitle"><br>
-                       <TMPL_IF name="author"><b>Author:</b></TMPL_IF> <a href=/cgi-bin/koha/search.pl?author=<TMPL_VAR NAME="author" ESCAPE=URL>><TMPL_VAR NAME="author"></a><br>
-                       <TMPL_IF name="additional"><b>Additional Author:</b></TMPL_IF> <TMPL_VAR NAME="additional"><br>
-                       <TMPL_IF name="collection"><b>Series Title:</b> </TMPL_IF><TMPL_VAR NAME="seriestitle"><br>
-                       <TMPL_IF name="subject"><b>Subject:</b></TMPL_IF> <TMPL_VAR NAME="subject"><br>
-                       <TMPL_IF name="copyrightdate"><b>Copyright:</b></TMPL_IF> <TMPL_VAR NAME="copyrightdate"><br>
-                       <TMPL_IF name="notes"><b>Notes:</b></TMPL_IF> <TMPL_VAR NAME="notes"><br>
-                       <TMPL_IF name="unititle"><b>Unititle:</b> </TMPL_IF><TMPL_VAR NAME="unititle"><br>
-                       <TMPL_IF name="serial"><b>Serial:</b></TMPL_IF> <TMPL_VAR NAME="serial"><br>
-                       <b>Total Number of Items:</b> <TMPL_VAR NAME="count">
+                       <TMPL_IF name="subtitle"><b>Subtitle:</b></TMPL_IF> <TMPL_VAR NAME="subtitle">
+                       <TMPL_IF name="author"><b>Author:</b> <a href=/cgi-bin/koha/search.pl?author=<TMPL_VAR NAME="author" ESCAPE=URL>><TMPL_VAR NAME="author"></a></TMPL_IF><br>
+                       <TMPL_IF name="additional"><b>Additional Author:</b><TMPL_VAR NAME="additional"><br></TMPL_IF>
+                       <TMPL_IF name="publishercode"><b>Published by :</b></TMPL_IF> <TMPL_VAR NAME="publishercode">
+                       <TMPL_IF name="publicationyear"><b>in </b></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"><br/>
+                       <TMPL_IF name="collection"><b>Collection:</b></TMPL_IF> <TMPL_VAR NAME="seriestitle"><br/>
+                       <TMPL_IF name="subject"><b>Subject:</b></TMPL_IF> <TMPL_VAR NAME="subject"><br/>
+                       <TMPL_IF name="copyrightdate"><b>Year :</b></TMPL_IF> <TMPL_VAR NAME="copyrightdate"><br/>
+                       <TMPL_IF name="notes"><b>Notes:</b></TMPL_IF> <TMPL_VAR NAME="notes"><br/>
+                       <TMPL_IF name="unititle"><b>Unititle:</b></TMPL_IF> <TMPL_VAR NAME="unititle"><br/>
+                       <TMPL_IF name="serial"><b>Serial:</b><TMPL_VAR NAME="serial"></TMPL_IF><br/>
+                       <TMPL_IF name="dewey"><b>Dewey:</b></TMPL_IF><TMPL_VAR name="dewey"><br/>
+                       <TMPL_IF name="url"><b>URL:</b> <a hre="<TMPL_VAR name="url"><TMPL_VAR NAME="url"></a></TMPL_IF><br>
+                       <b>total number of Items:</b> <TMPL_VAR NAME="count">
                        <p>
                        </font>
                </td>

diff --git a/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl
index acb203f..84dff0b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/catalogue/detail.tmpl
@@ -18,43 +18,36 @@
 </TMPL_IF>
 </p>
 <table cellspacing="0" cellpadding="5" border="1" align="left" width="220">
-<!-----------------BIBLIO RECORD TABLE--------->
-<tr valign="top">
-
-<td bgcolor="#cccc99" background="/images/background-mem.gif">
-<b>Notice biblio N° <TMPL_VAR NAME="biblionumber"></b>
-</td>
-</tr>
-<tr valign="top">
-<td>
-<form action="/cgi-bin/koha/modbib.pl" method="post">
-                       <table width="100%" border=0 cellpadding=10>
-                               <tr>
-                                       <td>
-                                               <input type="hidden" name="bibnum" value="<TMPL_VAR NAME="biblionumber">">
-                                               <input type="image" name="submit" value="modify" border="0" src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0>
-                                       </td>
-                                       <td><input type="image" name="delete" value="delete" border="0" src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/edittrash.png" width=32 hspace=0 vspace=0 border=0"></td>
-                                       <td><a href="MARCdetail.pl?bib=<TMPL_VAR name="biblionumber">" class="button">MARC</a></td>
-                               </tr>
-                       </table>
-</form>
-<br>
-<FONT SIZE=2  face="arial, helvetica">
-<TMPL_IF name="subtitle"><b>Sous-titre:</b></TMPL_IF> <TMPL_VAR NAME="subtitle"><br>
-<TMPL_IF name="author"><b>Auteur:</b> <a href=/cgi-bin/koha/search.pl?author=<TMPL_VAR NAME="author" ESCAPE=URL>><TMPL_VAR NAME="author"></a></TMPL_IF><br>
-<TMPL_IF name="additional"><b>Autre Auteur:</b></TMPL_IF> <TMPL_VAR NAME="additional"><br>
-<TMPL_IF name="collection"><b>Collection:</b></TMPL_IF> <TMPL_VAR NAME="seriestitle"><br>
-<TMPL_IF name="subject"><b>Sujet:</b></TMPL_IF> <TMPL_VAR NAME="subject"><br>
-<TMPL_IF name="copyrightdate"><b>Ann&eacute;e:</b></TMPL_IF> <TMPL_VAR NAME="copyrightdate"><br>
-<TMPL_IF name="notes"><b>Notes:</b></TMPL_IF> <TMPL_VAR NAME="notes"><br>
-<TMPL_IF name="unititle"><b>Titre unique:</b></TMPL_IF> <TMPL_VAR NAME="unititle"><br>
-<TMPL_IF name="serial"><b>P&eacute;riodique:</b><TMPL_VAR NAME="serial"></TMPL_IF><br>
-<TMPL_IF name="url"><b>URL :</b> <a hre="<TMPL_VAR name="url"><TMPL_VAR NAME="url"></a></TMPL_IF><br>
-<b>Nbre total d'exemplaires:</b> <TMPL_VAR NAME="count">
-<p>
-</font></td>
-</tr>
+       <!-----------------BIBLIO RECORD TABLE--------->
+       <tr valign="top">
+               <td bgcolor="#cccc99" background="/images/background-mem.gif">
+                       <b>Notice N° <TMPL_VAR NAME="biblionumber"></b>
+               </td>
+       </tr>
+       <tr valign="top">
+               <td>
+                       <br/><a href="MARCdetail.pl?bib=<TMPL_VAR name="biblionumber">" class="button">MARC</a><br/><br/>
+                       <FONT SIZE=2  face="arial, helvetica">
+                       <TMPL_IF name="subtitle"><b>Sous-titre:</b></TMPL_IF> <TMPL_VAR NAME="subtitle">
+                       <TMPL_IF name="author"><b>Auteur:</b> <a href=/cgi-bin/koha/search.pl?author=<TMPL_VAR NAME="author" ESCAPE=URL>><TMPL_VAR NAME="author"></a></TMPL_IF><br>
+                       <TMPL_IF name="additional"><b>Autre Auteur:</b><TMPL_VAR NAME="additional"><br></TMPL_IF>
+                       <TMPL_IF name="publishercode"><b>Publié par :</b></TMPL_IF> <TMPL_VAR NAME="publishercode">
+                       <TMPL_IF name="publicationyear"><b>en </b></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"><br/>
+                       <TMPL_IF name="collection"><b>Collection:</b></TMPL_IF> <TMPL_VAR NAME="seriestitle"><br/>
+                       <TMPL_IF name="subject"><b>Sujet:</b></TMPL_IF> <TMPL_VAR NAME="subject"><br/>
+                       <TMPL_IF name="copyrightdate"><b>Ann&eacute;e:</b></TMPL_IF> <TMPL_VAR NAME="copyrightdate"><br/>
+                       <TMPL_IF name="notes"><b>Notes:</b></TMPL_IF> <TMPL_VAR NAME="notes"><br/>
+                       <TMPL_IF name="unititle"><b>Titre uniforme:</b></TMPL_IF> <TMPL_VAR NAME="unititle"><br/>
+                       <TMPL_IF name="serial"><b>P&eacute;riodique:</b><TMPL_VAR NAME="serial"></TMPL_IF><br/>
+                       <TMPL_IF name="dewey"><b>Côte dewey :</b></TMPL_IF><TMPL_VAR name="dewey"><br/>
+                       <TMPL_IF name="url"><b>URL :</b> <a hre="<TMPL_VAR name="url"><TMPL_VAR NAME="url"></a></TMPL_IF><br>
+                       <b>Nbre total d'exemplaires:</b> <TMPL_VAR NAME="count">
+                       <p>
+                       </font>
+               </td>
+       </tr>
 </table>
 </TMPL_LOOP>
 <!-- FIXME - The help box overflows on the right. I think this is

diff --git a/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl b/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl
index 75125f1..f98b9e6 100644 (file)
--- a/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/default/en/opac-detail.tmpl
@@ -10,65 +10,72 @@
 <p align=right><a href=/cgi-bin/koha/opac-reserve.pl?bib=<TMPL_VAR NAME="biblionumber" ESCAPE=URL>>Request</a></p>
 </TMPL_UNLESS>
 
-
-
 <TMPL_LOOP NAME="BIBLIO_RESULTS">
 <font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">)
 <TMPL_VAR NAME="class"></em></font><p>
 <!-- FIXME - "callpadding" should be "cellpadding", right? -->
 <table cellspacing="0" callpadding="5" border="1" align="left" width="220">
-<!-----------------BIBLIO RECORD TABLE--------->
-<tr valign="top">
-
-<td bgcolor="#99cccc">
-<b>BIBLIO RECORD</b>
-
-<TMPL_VAR NAME="biblionumber">
-</td>
-</tr>
-<tr valign="top">
-<td>
-<FONT SIZE=2  face="arial, helvetica">
-<b>Subtitle:</b> <TMPL_VAR NAME="subtitle"><br>
-<b>Author:</b> <TMPL_VAR NAME="author"><br>
-<b>Subject:</b> <TMPL_VAR NAME="subject"><br>
-<b>Copyright:</b> <TMPL_VAR NAME="copyrightdate"><br>
-<b>Total Number of Items:</b> <TMPL_VAR NAME="count">
-<p>
-</font></td>
-</tr>
+       <!-----------------BIBLIO RECORD TABLE--------->
+       <tr valign="top">
+               <td bgcolor="#99cccc">
+                       <b>BIBLIO RECORD</b>
+                       <TMPL_VAR NAME="biblionumber">
+               </td>
+       </tr>
+       <tr valign="top">
+               <td>
+                       <FONT SIZE=2  face="arial, helvetica">
+                               <TMPL_IF name="subtitle"><b>Subtitle:</b></TMPL_IF> <TMPL_VAR NAME="subtitle">
+                               <TMPL_IF name="author"><b>Author:</b> <a href=/cgi-bin/koha/search.pl?author=<TMPL_VAR NAME="author" ESCAPE=URL>><TMPL_VAR NAME="author"></a></TMPL_IF><br>
+                               <TMPL_IF name="additional"><b>Additional Author:</b><TMPL_VAR NAME="additional"><br></TMPL_IF>
+                               <TMPL_IF name="publishercode"><b>Published by :</b></TMPL_IF> <TMPL_VAR NAME="publishercode">
+                               <TMPL_IF name="publicationyear"><b>in </b></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"><br/>
+                               <TMPL_IF name="collection"><b>Collection:</b></TMPL_IF> <TMPL_VAR NAME="seriestitle"><br/>
+                               <TMPL_IF name="subject"><b>Subject:</b></TMPL_IF> <TMPL_VAR NAME="subject"><br/>
+                               <TMPL_IF name="copyrightdate"><b>Year :</b></TMPL_IF> <TMPL_VAR NAME="copyrightdate"><br/>
+                               <TMPL_IF name="notes"><b>Notes:</b></TMPL_IF> <TMPL_VAR NAME="notes"><br/>
+                               <TMPL_IF name="unititle"><b>Unititle:</b></TMPL_IF> <TMPL_VAR NAME="unititle"><br/>
+                               <TMPL_IF name="serial"><b>Serial:</b><TMPL_VAR NAME="serial"></TMPL_IF><br/>
+                               <TMPL_IF name="dewey"><b>Dewey:</b></TMPL_IF><TMPL_VAR name="dewey"><br/>
+                               <TMPL_IF name="url"><b>URL:</b> <a hre="<TMPL_VAR name="url"><TMPL_VAR NAME="url"></a></TMPL_IF><br>
+                               <b>total number of Items:</b> <TMPL_VAR NAME="count">
+                       </font>
+               </td>
+       </tr>
 </table>
 </TMPL_LOOP>
 <center>
 <table border=0 cellspacing=0 cellpadding=2>
-<tr bgcolor="#99cccc">
-<td>Item Type</td>
-<td>Class</td>
-<td>Location</td>
-<td>Date Due</td>
-<td>Last Seen</td>
-<td>Barcode</td>
-</tr>
-<TMPL_LOOP NAME="ITEM_RESULTS">
-<tr>
-<td><TMPL_VAR NAME="itemtype"></td>
-<td><TMPL_VAR NAME="class"></td>
-<td><TMPL_VAR NAME="branchname"></td>
-<td><TMPL_VAR NAME="datedue"></td>
-<td><TMPL_VAR NAME="datelastseen"></td>
-<td><TMPL_VAR NAME="barcode"></td>
-</tr>
-</TMPL_LOOP>
-<TMPL_LOOP NAME="WEB_RESULTS">
-<tr>
-<td><TMPL_VAR NAME="itemtype"></td>
-<td>Website</td>
-<td>Online</td>
-<td>Available</td>
-<td></td>
-<td><TMPL_VAR NAME="url"></td>
-</tr>
-</TMPL_LOOP>
+       <tr bgcolor="#99cccc">
+               <td>Item Type</td>
+               <td>Class</td>
+               <td>Location</td>
+               <td>Date Due</td>
+               <td>Last Seen</td>
+               <td>Barcode</td>
+       </tr>
+       <TMPL_LOOP NAME="ITEM_RESULTS">
+               <tr>
+                       <td><TMPL_VAR NAME="itemtype"></td>
+                       <td><TMPL_VAR NAME="class"></td>
+                       <td><TMPL_VAR NAME="branchname"></td>
+                       <td><TMPL_VAR NAME="datedue"></td>
+                       <td><TMPL_VAR NAME="datelastseen"></td>
+                       <td><TMPL_VAR NAME="barcode"></td>
+               </tr>
+       </TMPL_LOOP>
+       <TMPL_LOOP NAME="WEB_RESULTS">
+               <tr>
+                       <td><TMPL_VAR NAME="itemtype"></td>
+                       <td>Website</td>
+                       <td>Online</td>
+                       <td>Available</td>
+                       <td></td>
+                       <td><TMPL_VAR NAME="url"></td>
+               </tr>
+       </TMPL_LOOP>
 </table>
 <p>
 </center>

diff --git a/koha-tmpl/opac-tmpl/default/fr/opac-detail.tmpl b/koha-tmpl/opac-tmpl/default/fr/opac-detail.tmpl
index 3f45af8..dcf8536 100755 (executable)
--- a/koha-tmpl/opac-tmpl/default/fr/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/default/fr/opac-detail.tmpl
@@ -2,7 +2,7 @@
 
 
 <TMPL_LOOP NAME="BIBLIO_RESULTS">
-<font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">) <TMPL_VAR NAME="class"></em></font>
+<font SIZE=6><em><TMPL_VAR NAME="title"> <TMPL_VAR NAME="class"></em></font>
 <TMPL_UNLESS NAME="norequests"><a href=/cgi-bin/koha/opac-reserve.pl?bib=<TMPL_VAR NAME="biblionumber" ESCAPE=URL>>R&eacute;servation</a>
 <TMPL_ELSE>
 Non r&eacute;servable
@@ -18,20 +18,22 @@ Non r&eacute;servable
 <tr valign="top">
        <td>
                <FONT SIZE=2  face="arial, helvetica">
-               <TMPL_IF NAME="subtitle"><b>Sous-titre:</b> </TMPL_IF><TMPL_VAR NAME="subtitle"><br>
-               <TMPL_IF name="additionalauthors"><b>Autres auteurs:</b> </TMPL_IF><TMPL_VAR NAME="additionalauthors"><br>
-               <TMPL_IF name="publishercode"><b>Editeur</b> </TMPL_IF><TMPL_VAR name="publishercode"><br>
-               <TMPL_IF name="copyrightdate"><b>Ann&eacute;e:</b> <TMPL_VAR NAME="copyrightdate"></TMPL_IF><br>
-               <TMPL_IF name="serial"><b>P&eacute;riodique:</b><TMPL_VAR NAME="serial"></TMPL_IF><br>
-               <TMPL_IF name="url"><b>URL :</b> <a hre="<TMPL_VAR name="url"><TMPL_VAR NAME="url"></a></TMPL_IF><br>
-               <br>
-               <TMPL_IF name="notes"><b>Résumé:</b> </TMPL_IF><TMPL_VAR NAME="Notes"><br>
-               <br>
-               <TMPL_IF name="subject"><b>Sujet:</b> </TMPL_IF><TMPL_VAR NAME="subject"><br>
-               <br>
-               <b>Nombre d'exemplaires:</b> <TMPL_VAR NAME="count">
-               <p>
-               </font>
+                       <TMPL_IF name="subtitle"><b>Sous-titre:</b></TMPL_IF> <TMPL_VAR NAME="subtitle">
+                       <TMPL_IF name="author"><b>Auteur:</b><TMPL_VAR NAME="author"></TMPL_IF><br>
+                       <TMPL_IF name="additional"><b>Autre Auteur:</b><TMPL_VAR NAME="additional"><br></TMPL_IF>
+                       <TMPL_IF name="publishercode"><b>Publié par :</b></TMPL_IF> <TMPL_VAR NAME="publishercode">
+                       <TMPL_IF name="publicationyear"><b>en </b></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"><br/>
+                       <TMPL_IF name="collection"><b>Collection:</b></TMPL_IF> <TMPL_VAR NAME="seriestitle"><br/>
+                       <TMPL_IF name="subject"><b>Sujet:</b></TMPL_IF> <TMPL_VAR NAME="subject"><br/>
+                       <TMPL_IF name="copyrightdate"><b>Ann&eacute;e:</b></TMPL_IF> <TMPL_VAR NAME="copyrightdate"><br/>
+                       <TMPL_IF name="notes"><b>Notes:</b></TMPL_IF> <TMPL_VAR NAME="notes"><br/>
+                       <TMPL_IF name="unititle"><b>Titre uniforme:</b></TMPL_IF> <TMPL_VAR NAME="unititle"><br/>
+                       <TMPL_IF name="serial"><b>P&eacute;riodique:</b><TMPL_VAR NAME="serial"></TMPL_IF><br/>
+                       <TMPL_IF name="dewey"><b>Côte dewey :</b></TMPL_IF><TMPL_VAR name="dewey"><br/>
+                       <TMPL_IF name="url"><b>URL :</b> <a hre="<TMPL_VAR name="url"><TMPL_VAR NAME="url"></a></TMPL_IF><br>
+                       <b>Nbre d'exemplaires:</b> <TMPL_VAR NAME="count">
        </td>
 </tr>
 </table>