all those fixes are related to translation improvement.

A few minor bugfixes too in perl code.

NOTE TO ENGLISH "TEMPLATORS" : you should look at this commits, as some ideas are really nice.  Thanks to Carole, Wesford School, new Koha user in France :-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index 94cb2f2..cb3f308 100644 (file)
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -195,6 +195,7 @@ sub getbranches {
                my $nsth = $dbh->prepare($query);
                $nsth->execute($branch->{'branchcode'});
                while (my ($cat) = $nsth->fetchrow_array) {
+               warn "XX";
                        # FIXME - This seems wrong. It ought to be
                        # $branch->{categorycodes}{$cat} = 1;
                        # otherwise, there's a namespace collision if there's a

diff --git a/C4/Search.pm b/C4/Search.pm
index 5a16a4e..6ad4ac1 100755 (executable)
--- a/C4/Search.pm
+++ b/C4/Search.pm
@@ -1231,7 +1231,7 @@ If this is set, it is set to C<One Order>.
 sub ItemInfo {
     my ($env,$biblionumber,$type) = @_;
     my $dbh   = C4::Context->dbh;
-    my $query = "SELECT * FROM items, biblio, biblioitems left join itemtypes on biblioitems.itemtype = itemtypes.itemtype
+    my $query = "SELECT *,items.notforloan as itemnotforloan FROM items, biblio, biblioitems left join itemtypes on biblioitems.itemtype = itemtypes.itemtype
                   WHERE items.biblionumber = ?
                     AND biblioitems.biblioitemnumber = items.biblioitemnumber
                     AND biblio.biblionumber = items.biblionumber";
@@ -1454,6 +1454,15 @@ sub bibdata {
        chop $data->{'subject'};
        chop $data->{'subject'};
     $sth->finish;
+    $query = "Select * from additionalauthors where biblionumber = ?";
+    $sth   = $dbh->prepare($query);
+    $sth->execute($bibnum);
+    while (my $dat = $sth->fetchrow_hashref){
+        $data->{'additionalauthors'} .= "$dat->{'author'}, ";
+    } # while
+       chop $data->{'additionalauthors'};
+       chop $data->{'additionalauthors'};
+    $sth->finish;
     return($data);
 } # sub bibdata
 

diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index be0a4c7..1945060 100755 (executable)
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -84,7 +84,7 @@ if ($itemtype =~ /PER/){
                classification => $class?$class:"" });
 }
 if ($quantity != 0){
-       warn "receive : $biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund";
+#      warn "receive : $biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund";
        receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$bibitemno,$freight,$bookfund);
        modbiblio($biblio);
        &modbibitem({

diff --git a/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl b/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl
index 26bf99f..2a71602 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/fr/boraccount.tmpl
@@ -1,11 +1,11 @@
 <TMPL_INCLUDE NAME="members-top.inc">
- 
+
 <FONT SIZE=6><em>Compte de<TMPL_VAR NAME=firstname>
-<TMPL_VAR NAME=surname></em></FONT> 
+<TMPL_VAR NAME=surname></em></FONT>
 <P>
-<a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR NAME=bornum>"><image src=<TMPL_VAR name="themelang">/images/create-man-invoice.gif border=0></a>
+<a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<TMPL_VAR NAME=bornum>">Ajouter une dette</a>
 &nbsp;
-<a href="/cgi-bin/koha/moremember.pl?bornum=<TMPL_VAR NAME=bornum>"><image src=<TMPL_VAR name="themelang">/images/create-man-credit.gif border=0></a>
+<a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<TMPL_VAR NAME=bornum>">Encaisser</a>
 <center>
 <p>
 
@@ -44,4 +44,4 @@
 <p>&nbsp;  </p>
 
 <!-- endmenu (member) -->
-<TMPL_INCLUDE NAME="members-bottom.inc">
\ No newline at end of file
+<TMPL_INCLUDE NAME="members-bottom.inc">

diff --git a/koha-tmpl/opac-tmpl/default/fr/includes/members-top.inc b/koha-tmpl/opac-tmpl/default/fr/includes/members-top.inc
index c9a2db9..1882572 100755 (executable)
--- a/koha-tmpl/opac-tmpl/default/fr/includes/members-top.inc
+++ b/koha-tmpl/opac-tmpl/default/fr/includes/members-top.inc
@@ -4,7 +4,6 @@
 <html>
 <head>
 <title>KOHA: Rechercher dans le catalogue</title>
-
 </head>
 <body text="black" bgcolor="white" link="#0000ff" vlink="#3366cc" Alink="#cc3300"
 marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
@@ -27,7 +26,7 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 <table cellpadding=0 cellspacing=0 width="100%" border=0>
 <tr BGCOLOR="#339999" >
 
-        <td valign=bottom><img src="<TMPL_VAR NAME='themelang'>/images/inside-top-member.gif" 
+        <td valign=bottom><img src="<TMPL_VAR NAME='themelang'>/images/inside-top-member.gif"
        width=353 height=50 alt="KOHA: services en ligne" hspace=0 vspace=0 border=0></td>
 
         <td align=right><a href="/cgi-bin/koha/opac-search.pl"                 onMouseOver="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/mouseover-search.gif'"          onMouseOut="document.mouseover.src='/images/holder.gif'"><img 

diff --git a/koha-tmpl/opac-tmpl/default/fr/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/default/fr/includes/opac-bottom.inc
index 4336ada..489c09e 100755 (executable)
--- a/koha-tmpl/opac-tmpl/default/fr/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/default/fr/includes/opac-bottom.inc
@@ -1,17 +1,13 @@
-</BLOCKQUOTE>\r
-\r
-<p> &nbsp; </p>\r
-<br>\r
-<center>\r
-\r
-\r
-<A HREF="/cgi-bin/koha/opac-search.pl">Rechercher dans le catalogue</a> || \r
-<!--<A HREF="/members/">acc&egrave;s aux services en ligne</a> || \r
--->\r
-<A HREF="/join.html">S'inscrire aux services en ligne</a> || \r
-<A HREF="/cgi-bin/koha/opac-main.pl">Accueil</a> \r
-\r
-</font>\r
-</center>\r
-</body>\r
-</html>\r
+</BLOCKQUOTE>
+
+<p> &nbsp; </p>
+<br>
+<center>
+
+<A HREF="/cgi-bin/koha/opac-search.pl">Rechercher dans le catalogue</a> ||
+<A HREF="/cgi-bin/koha/opac-main.pl">Accueil</a> ||
+<td align=right><a href="/cgi-bin/koha/opac-user.pl">Votre compte lecteur</a>
+</font>
+</center>
+</body>
+</html>

diff --git a/koha-tmpl/opac-tmpl/default/fr/includes/opac-top.inc b/koha-tmpl/opac-tmpl/default/fr/includes/opac-top.inc
index 8d140fe..dd3ac8c 100755 (executable)
--- a/koha-tmpl/opac-tmpl/default/fr/includes/opac-top.inc
+++ b/koha-tmpl/opac-tmpl/default/fr/includes/opac-top.inc
@@ -1,71 +1,35 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">\r
-<!--Authored by rachel@katipo.co.nz 10:46 24/12/99-->\r
-\r
-<html>\r
-<head>\r
-<title>KOHA: Rechercher dans le catalogue</title>\r
-\r
-</head>\r
-<body text="black" bgcolor="white" link="#0000ff" vlink="#3366cc" Alink="#cc3300"\r
-marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >\r
-\r
-\r
-\r
-<!--HDL Colours\r
-\r
-        Yellow = ffcc00 \r
-        light blue = ccccff\r
-        bright blue links = 0000ff\r
-        aubergine = 663266 \r
-        light green/grey = cccc99\r
-\r
-\r
--->\r
-\r
-<!------------------------MENUS-------------------------------->\r
-\r
-<table cellpadding=0 cellspacing=0 width="100%" border=0>\r
-<tr BGCOLOR="#339999" >\r
-\r
-        <td valign=bottom><img src="<TMPL_VAR NAME='themelang'>/images/inside-top-search.gif" \r
-       width=349 height=50 alt="KOHA: Rechercher dans le catalogue" hspace=0 vspace=0 border=0></td>\r
-\r
-\r
-      \r
-        <td align=right><a href="/cgi-bin/koha/opac-search.pl"                 onMouseOver="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/mouseover-search.gif'"          onMouseOut="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/holder.gif'"><img \r
-       src="<TMPL_VAR NAME='themelang'>/images/menu-search.gif" \r
-       width=90 height=30 alt="Rechercher" hspace=0 vspace=0 border=0 name="menu-search"></a>\r
-       \r
-<!--   <a href="/members/"\r
-       onMouseOver="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/mouseover-member.gif'"                  onMouseOut="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/holder.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/menu-login.gif" \r
-       width=111 height=30 alt="Member Login" hspace=0 vspace=0 border=0 name="menu-login"></a>\r
--->\r
-       <a href="/join.html"\r
-       onMouseOver="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/mouseover-join.gif'"            onMouseOut="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/holder.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/menu-join.gif" \r
-       width=78 height=30 alt="S'incrire" hspace=0 vspace=0 border=0 name="menu-join"></a>\r
-\r
-       <a href="/cgi-bin/koha/opac-main.pl" \r
-       onMouseOver="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/mouseover-home.gif'"            onMouseOut="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/holder.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/menu-home.gif" \r
-       width=68 height=30 alt="Accueil" hspace=0 vspace=0 border=0 name="menu-home"></a></td>\r
-        \r
-        </TR>\r
-\r
-\r
-<tr valign=top>\r
-\r
-        <td><img src="<TMPL_VAR NAME='themelang'>/images/inside-koha-bottom.gif" \r
-       width=69 height=44 alt="KOHA" hspace=0 vspace=0 border=0 ></td>\r
-\r
-        <td align=right><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" \r
-       width=300 height=48 alt="" hspace=0 vspace=0 name="mouseover" ></a></td>\r
-\r
-        </TR>\r
-\r
-\r
-\r
-</TABLE>\r
-\r
-\r
-\r
-<!-------------------------MAIN BODY OF PAGE-------------------------->\r
-<BLOCKQUOTE>\r
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!--Authored by rachel@katipo.co.nz 10:46 24/12/99-->
+
+<html>
+<head>
+<title>KOHA: Rechercher dans le catalogue</title>
+
+</head>
+<body text="black" bgcolor="white" link="#0000ff" vlink="#3366cc" Alink="#cc3300"
+marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
+
+<!--HDL Colours
+
+        Yellow = ffcc00
+        light blue = ccccff
+        bright blue links = 0000ff
+        aubergine = 663266
+        light green/grey = cccc99
+
+
+-->
+
+<!------------------------MENUS-------------------------------->
+
+<table cellpadding=0 cellspacing=0 border=0 width="40%">
+<tr   bgcolor="#fecc99" >
+
+<td align=right><a href="/cgi-bin/koha/opac-main.pl">Accueil</a>
+<td align=right><a href="/cgi-bin/koha/opac-search.pl">Rechercher</a>
+<td align=right><a href="/cgi-bin/koha/opac-user.pl">Votre compte lecteur</a>
+        </TR>
+</TABLE>
+<br/><br/>
+<!-------------------------MAIN BODY OF PAGE-------------------------->
+<BLOCKQUOTE>

diff --git a/koha-tmpl/opac-tmpl/default/fr/opac-account.tmpl b/koha-tmpl/opac-tmpl/default/fr/opac-account.tmpl
index 09086b5..207d519 100755 (executable)
--- a/koha-tmpl/opac-tmpl/default/fr/opac-account.tmpl
+++ b/koha-tmpl/opac-tmpl/default/fr/opac-account.tmpl
@@ -1,39 +1,39 @@
-<TMPL_INCLUDE NAME="members-top.inc">\r
-\r
-<TMPL_LOOP NAME="BORROWER_INFO">\r
-<FONT SIZE=6><em>Compte de <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></em></FONT>\r
-[<a href=/cgi-bin/koha/opac-user.pl>Accueil</a>][<a href=/cgi-bin/koha/opac-logout.pl>D&eacute;connexion</a>]<p>\r
-</TMPL_LOOP>\r
-<center>\r
-<p>\r
-<TABLE  CELLSPACING=0 CELLPADDING=5 border=1>\r
-<TR VALIGN=TOP>\r
-<td  bgcolor="#99cccc" background='<TMPL_VAR NAME="themelang">/images/background-opac.gif' colspan=2><B>AMENDES</TD>\r
-<td  bgcolor="#99cccc" background='<TMPL_VAR NAME="themelang">/images/background-opac.gif' colspan=1><B>MONTANT</TD>\r
-<td  bgcolor="#99cccc" background='<TMPL_VAR NAME="themelang">/images/background-opac.gif' colspan=1><B>RESTANT DU</TD>\r
-</TR>\r
-\r
-<TMPL_LOOP NAME="ACCOUNT_LINES">\r
-  <tr VALIGN=TOP  >\r
-  <td><TMPL_VAR NAME="date"></td>\r
-  <TD><TMPL_VAR NAME="description">\r
-      <TMPL_IF NAME="print_title"><TMPL_VAR NAME="title"></TMPL_IF></td>\r
-\r
-  <td><TMPL_VAR NAME="amount"></td>\r
-  <TD><TMPL_VAR NAME="amountoutstanding"></td>\r
-  </tr>\r
-</TMPL_LOOP>\r
-\r
-<tr VALIGN=TOP  >\r
-<TD></td>\r
-<TD colspan=2><b>Total</b></td>\r
-\r
-<TD><b><TMPL_VAR NAME="total"></b></td>\r
-\r
-</tr>\r
-</table>\r
-<br clear=all>\r
-<p>&nbsp;  </p>\r
-\r
-\r
-<TMPL_INCLUDE NAME="opac-bottom.inc">\r
+<TMPL_INCLUDE NAME="opac-top.inc">
+
+<TMPL_LOOP NAME="BORROWER_INFO">
+<FONT SIZE=6><em>Compte de <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></em></FONT>
+[<a href=/cgi-bin/koha/opac-user.pl>Accueil</a>][<a href=/cgi-bin/koha/opac-logout.pl>D&eacute;connexion</a>]<p>
+</TMPL_LOOP>
+<center>
+<p>
+<TABLE  CELLSPACING=0 CELLPADDING=5 border=1>
+<TR VALIGN=TOP>
+<td  bgcolor="#99cccc" background='<TMPL_VAR NAME="themelang">/images/background-opac.gif' colspan=2><B>AMENDES</TD>
+<td  bgcolor="#99cccc" background='<TMPL_VAR NAME="themelang">/images/background-opac.gif' colspan=1><B>MONTANT</TD>
+<td  bgcolor="#99cccc" background='<TMPL_VAR NAME="themelang">/images/background-opac.gif' colspan=1><B>RESTANT DU</TD>
+</TR>
+
+<TMPL_LOOP NAME="ACCOUNT_LINES">
+  <tr VALIGN=TOP  >
+  <td><TMPL_VAR NAME="date"></td>
+  <TD><TMPL_VAR NAME="description">
+      <TMPL_IF NAME="print_title"><TMPL_VAR NAME="title"></TMPL_IF></td>
+
+  <td><TMPL_VAR NAME="amount"></td>
+  <TD><TMPL_VAR NAME="amountoutstanding"></td>
+  </tr>
+</TMPL_LOOP>
+
+<tr VALIGN=TOP  >
+<TD></td>
+<TD colspan=2><b>Total</b></td>
+
+<TD><b><TMPL_VAR NAME="total"></b></td>
+
+</tr>
+</table>
+<br clear=all>
+<p>&nbsp;  </p>
+
+
+<TMPL_INCLUDE NAME="opac-bottom.inc">

diff --git a/koha-tmpl/opac-tmpl/default/fr/opac-auth.tmpl b/koha-tmpl/opac-tmpl/default/fr/opac-auth.tmpl
index 89d0f42..14a5eeb 100755 (executable)
--- a/koha-tmpl/opac-tmpl/default/fr/opac-auth.tmpl
+++ b/koha-tmpl/opac-tmpl/default/fr/opac-auth.tmpl
@@ -1,49 +1,35 @@
-\r
-<TMPL_IF NAME="nopermission">\r
-<!-- This is what is displayed if user doesnt have permission -->\r
-<h2>D&eacute;sol&eacute;, il semble que vous n'ayez pas d'autorisation pour cette page.<h2>\r
-\r
-</TMPL_IF>\r
-\r
-\r
-<TMPL_IF NAME="loginprompt">\r
-<!-- login prompt time-->\r
-\r
-<center>\r
-<h2><TMPL_VAR NAME="message"></h2>\r
-\r
-<form action='<TMPL_VAR NAME="url">' method="post">\r
-<TMPL_LOOP NAME="INPUTS">\r
-  <input type="hidden" name='<TMPL_VAR NAME="name">' value='<TMPL_VAR NAME="value">'>\r
-</TMPL_LOOP>\r
-<table border="0" cellpadding="10" cellspacing="0" width="60%">\r
-    <tr><td align="center" valign="top">\r
-\r
-    <table border="0" bgcolor="#dddddd" cellpadding="10" cellspacing="0">\r
-    <tr><th colspan="2" background="/images/background-mem.gif"><font size="+2">Koha - Identification</font></th></tr>\r
-    <tr><td>num&eacute;ro carte de lecteur:</td><td><input name="userid"></td></tr>\r
-    <tr><td>mot de passe:</td><td><input type=password name=password></td></tr>\r
-    <tr><td colspan="2" align="center"><input type="submit" value="Entrer"></td></tr>\r
-    </table>\r
-    </td><td align="center" valign="top">\r
-\r
-    <table border="0" bgcolor="#dddddd" cellpadding="10" cellspacing="0">\r
-    <tr><th background="/images/background-mem.gif"><font size="+2">Information [version démo]</font></th></tr>\r
-    <td>\r
-    <p>Ce message doit &ecirc;tre personnalis&eacute; par la biblioth&egrave;que pour la version de production! </p>\r
-\r
-    <p>Exemple : le num&eacute;ro de carte et le mot de passe que vous avez utilis&eacute; ne sont pas reconnu pas Koha. \r
-       Contactez le personnel de la bilioth&egrave;que si vous avez perdu votre mot de passe. mailto:bibli@bibli.fr</p>\r
-\r
-    <p>Pour la d&eacute;mo vous pouvez utiliser finlay : finlay ou bien superuser : koha</p>\r
-\r
-    </td>\r
-    </tr>\r
-    </table>\r
-\r
-    </td></tr>\r
-</table>\r
-</form>\r
-\r
-\r
-</TMPL_IF>
\ No newline at end of file
+
+<TMPL_IF NAME="nopermission">
+<!-- This is what is displayed if user doesnt have permission -->
+<h2>D&eacute;sol&eacute;, il semble que vous n'ayez pas d'autorisation pour cette page.<h2>
+
+</TMPL_IF>
+
+
+<TMPL_IF NAME="loginprompt">
+<!-- login prompt time-->
+
+<center>
+<h2><TMPL_VAR NAME="message"></h2>
+
+<form action='<TMPL_VAR NAME="url">' method="post">
+<TMPL_LOOP NAME="INPUTS">
+  <input type="hidden" name='<TMPL_VAR NAME="name">' value='<TMPL_VAR NAME="value">'>
+</TMPL_LOOP>
+<table border="0" cellpadding="10" cellspacing="0" width="60%">
+    <tr><td align="center" valign="top">
+
+    <table border="0" bgcolor="#dddddd" cellpadding="10" cellspacing="0">
+    <tr><th colspan="2" background="/images/background-mem.gif"><font size="+2">Koha - Identification</font></th></tr>
+    <tr><td>num&eacute;ro carte de lecteur:</td><td><input name="userid"></td></tr>
+    <tr><td>mot de passe:</td><td><input type=password name=password></td></tr>
+    <tr><td colspan="2" align="center"><input type="submit" value="Entrer"></td></tr>
+    </table>
+    </td><td align="center" valign="top">
+
+    </td></tr>
+</table>
+</form>
+
+
+</TMPL_IF>

diff --git a/koha-tmpl/opac-tmpl/default/fr/opac-detail.tmpl b/koha-tmpl/opac-tmpl/default/fr/opac-detail.tmpl
index db7b14b..42aff87 100755 (executable)
--- a/koha-tmpl/opac-tmpl/default/fr/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/default/fr/opac-detail.tmpl
@@ -2,10 +2,13 @@
 
 
 <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">
+<font SIZE=6><em><TMPL_VAR NAME="title"> (<TMPL_VAR NAME="author">) <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
+</TMPL_UNLESS>
+<p>
+<table cellspacing="0" cellpadding="5" border="1" align="left" width="220">
 <!-----------------BIBLIO RECORD TABLE--------->
 <tr valign="top">
        <td bgcolor="#99cccc">
@@ -15,10 +18,15 @@
 <tr valign="top">
        <td>
                <FONT SIZE=2  face="arial, helvetica">
-               <b>Sous-titre:</b> <TMPL_VAR NAME="subtitle"><br>
-               <b>Auteur:</b> <TMPL_VAR NAME="author"><br>
-               <b>Sujet:</b> <TMPL_VAR NAME="subject"><br>
-               <b>Ann&eacute;e:</b> <TMPL_VAR NAME="copyrightdate"><br>
+               <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>
+               <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>
@@ -27,23 +35,21 @@
 </table>
 </TMPL_LOOP>
 <center>
-<table border=0 cellspacing=0 cellpadding=2>
+<table border=0 cellspacing=0 cellpadding=3>
        <tr bgcolor="#99cccc">
-               <td>Type de document</td>
-               <td>Cat&eacute;gorie</td>
-               <td>Localisation</td>
-               <td>Date de retour</td>
-               <td>Derni&egrave;re transaction</td>
-               <td>Code barres</td>
+               <td>&nbsp;Type&nbsp;&nbsp;</td>
+               <td>&nbsp;Cote&nbsp;&nbsp;</td>
+               <td>&nbsp;Localisation&nbsp;&nbsp;</td>
+               <td>&nbsp;Empruntable&nbsp;&nbsp;</td>
+               <td>&nbsp;Date de retour&nbsp;</td>
        </tr>
        <TMPL_LOOP NAME="ITEM_RESULTS">
                <tr>
-                       <td><TMPL_VAR NAME="itemtype"></td>
+                       <td><TMPL_VAR NAME="description"></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>
+                       <td><TMPL_IF NAME="itemnotforloan">Non<TMPL_ELSE>Oui</TMPL_IF></td>
+                       <TMPL_UNLESS NAME="itemnotforloan"><td><TMPL_VAR NAME="datedue"></td></TMPL_UNLESS>
                </tr>
        </TMPL_LOOP>
        <TMPL_LOOP NAME="WEB_RESULTS">

diff --git a/koha-tmpl/opac-tmpl/default/fr/opac-main.tmpl b/koha-tmpl/opac-tmpl/default/fr/opac-main.tmpl
index 5787ac4..824fd4b 100755 (executable)
--- a/koha-tmpl/opac-tmpl/default/fr/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/default/fr/opac-main.tmpl
@@ -1,134 +1,135 @@
-<HTML>\r
-<TITLE>BIENVENUE DANS LE CATALOGUE KOHA</TITLE>\r
-\r
-\r
-<style type="text/css">\r
-<!--\r
-input{font-size:16px}\r
--->\r
-\r
-</style>\r
-\r
-\r
-</HEAD>\r
-\r
-<BODY   onload="document.catsearch.keyword.focus()"\r
-       BGCOLOR="#339999" \r
-       text="black" \r
-       link="white" \r
-       vlink="white" \r
-       alink="#663366" \r
-       leftmargin=0 \r
-       topmargin=0\r
-       marginheight=0\r
-       marginwidth=0 >\r
-\r
-<center>\r
-<table cellspacing=0 cellpadding=0 border=0 >\r
-       \r
-  <tr valign=top >\r
-       <td background="<TMPL_VAR NAME='themelang'>/images/front-background-med.gif"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" \r
-       width=1 height=440 align=left alt=" " hspace=0 vspace=0><table\r
-cellspacing=0 cellpadding=0 border=0 >\r
-       \r
-  <tr valign=top >\r
-       <td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=228 height=88 \r
-       alt=" " hspace=0 vspace=0></td>\r
-       <td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=57 height=88 \r
-       alt=" " hspace=0 vspace=0></td>\r
-       <td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=47 height=88 \r
-       alt=" " hspace=0 vspace=0></td>\r
-       <td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=88 \r
-       alt=" " hspace=0 vspace=0></td>\r
-       <td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=88 \r
-       alt=" " hspace=0 vspace=0></td>\r
-  </tr>\r
-\r
-  <tr valign=top >\r
-       <td background=" " rowspan=2 align="right" colspan=2><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif"\r
-       width=1 height=30\r
-       alt=" " hspace=0 vspace=0><br>\r
-       <img src="<TMPL_VAR NAME='themelang'>/images/koha.gif" width=200 height=128\r
-       alt="Koha: catalogue et services aux usagers" hspace=0 vspace=0></td>\r
-\r
-       <td background=" "  colspan=3><font size=+2><a href="/cgi-bin/koha/opac-search.pl"><img src="<TMPL_VAR NAME='themelang'>/images/heading-search.gif" width=272   height=38\r
-       alt="Interroger le catalogue" hspace=0 vspace=0 border=0></a></font></td>\r
-\r
-  </tr>\r
-\r
-\r
-<tr valign=top >\r
-       <td>    </td>\r
-       <FORM ACTION="/cgi-bin/koha/opac-searchresults.pl" name=catsearch>\r
-       <input type=hidden name=type value=opac>\r
-       <td background=" " >\r
-\r
-       <input type=text size="27" name="keyword"><br>\r
-       </font>\r
-       <b>Entrez votre recherche et tapez sur la touche Entr&eacute;e.</b><br>\r
-       <a href="/cgi-bin/koha/opac-search.pl">\r
-      \r
-       <img src="<TMPL_VAR NAME='themelang'>/images/front-arrow.gif" width=27 height=22\r
-       alt="-" hspace=0 vspace=0 border=0 align=middle >Recherche avanc&eacute;e (plus d'options)</a><br>\r
-\r
-       <img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=8\r
-       alt=" " hspace=0 vspace=0>\r
-       <p>\r
-       <TMPL_IF NAME="loggedinuser">\r
-           <p align=left>Connect&eacute; : <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Accueil usagers</a>][<a href="/cgi-bin/koha/logout.pl">D&eacute;connexion</a>]</p>\r
-       <TMPL_ELSE>\r
-           <p align=left><a href="/cgi-bin/koha/opac-user.pl">Se connecter</a> &agrave; Koha</p>\r
-       </TMPL_IF>\r
-       </td>\r
-       </form>\r
-  </tr>\r
-\r
-\r
- \r
-\r
-<!--\r
-  <tr valign=top ><form action="/cgi-bin/koha/member.pl" method=get >\r
-       <td background=" "  colspan=3><img src="<TMPL_VAR NAME='themelang'>/images/heading-login.gif" width=279                 height=38\r
-       alt="Member Login" hspace=0 vspace=0 border=0></td>\r
-\r
-  </tr>\r
-<tr valign=top >\r
-        <td></td>\r
-       <form action="/cgi-bin/koha/member.pl" method=get >\r
-       <td background=" " >\r
-       <font size=3 face="arial narrow,arial,helvetica">Num&eacute;ro de carte lecteur &nbsp;</font></td>\r
-       <td background=" " ><input type=text size="12" name="card"></td>\r
-\r
-  </tr>\r
-\r
-  <tr valign=top><td></td>\r
-       <td></td>\r
-       <td></td>\r
-       <td background=" " >\r
-       <font size=3 face="arial narrow,arial,helvetica">Mot de passe</font></td>\r
-       <td background=" " ><input type=password size="12" name="password"><br>\r
-       <input type=submit value="OK"><br>\r
-\r
-       <img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=8\r
-       alt=" " hspace=0 vspace=0></td>\r
-       </font>\r
- </tr>\r
-\r
-  <tr valign=top >\r
-       <td></td>\r
-       <td background=" " colspan=4><A href="/cgi-bin/koha/join.html"><img src="<TMPL_VAR NAME='themelang'>/images/heading-member.gif" width=331               height=38\r
-       alt="Inscrivez-vous &agrave; l'acc&eacute;s web personnalis&eacute;" hspace=0 vspace=0 border=0></a>\r
-       </td>\r
-       <td>\r
-       </td>\r
-\r
-  </tr>\r
-\r
--->\r
-</table>\r
-\r
-</td>\r
-  </tr>\r
-</table>\r
-<p>\r
-</center>\r
+<HTML>
+<TITLE>BIENVENUE DANS LE CATALOGUE KOHA</TITLE>
+
+
+<style type="text/css">
+<!--
+input{font-size:16px}
+-->
+
+</style>
+
+
+</HEAD>
+
+<BODY   onload="document.catsearch.keyword.focus()"
+       BGCOLOR="#339999"
+       text="black" 
+       link="white" 
+       vlink="white" 
+       alink="#663366" 
+       leftmargin=0 
+       topmargin=0
+       marginheight=0
+       marginwidth=0 >
+
+<center>
+<table cellspacing=0 cellpadding=0 border=0 >
+       
+  <tr valign=top >
+       <td background="<TMPL_VAR NAME='themelang'>/images/front-background-med.gif"><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" 
+       width=1 height=440 align=left alt=" " hspace=0 vspace=0><table
+cellspacing=0 cellpadding=0 border=0 >
+
+  <tr valign=top >
+       <td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=228 height=88 
+       alt=" " hspace=0 vspace=0></td>
+       <td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=57 height=88 
+       alt=" " hspace=0 vspace=0></td>
+       <td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=47 height=88 
+       alt=" " hspace=0 vspace=0></td>
+       <td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=88 
+       alt=" " hspace=0 vspace=0></td>
+       <td background=" "><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=88 
+       alt=" " hspace=0 vspace=0></td>
+  </tr>
+
+  <tr valign=top >
+       <td background=" " rowspan=2 align="right" colspan=2><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif"
+       width=1 height=30
+       alt=" " hspace=0 vspace=0><br>
+       <img src="<TMPL_VAR NAME='themelang'>/images/koha.gif" width=200 height=128
+       alt="Koha: catalogue et services aux usagers" hspace=0 vspace=0></td>
+
+       <td background=" "  colspan=3><font size=+2><a href="/cgi-bin/koha/opac-search.pl"><img src="<TMPL_VAR NAME='themelang'>/images/heading-search.gif" width=272   height=38
+       alt="Interroger le catalogue" hspace=0 vspace=0 border=0></a></font></td>
+
+  </tr>
+
+
+<tr valign=top >
+       <td>    </td>
+       <FORM ACTION="/cgi-bin/koha/opac-searchresults.pl" name=catsearch>
+       <input type=hidden name=type value=opac>
+       <td background=" " >
+
+       <input type=text size="27" name="keyword"><br>
+       </font>
+       <b>Entrez votre recherche et tapez sur la touche Entr&eacute;e.</b><br>
+       <a href="/cgi-bin/koha/opac-search.pl">
+
+       <img src="<TMPL_VAR NAME='themelang'>/images/front-arrow.gif" width=27 height=22 alt="-" hspace=0 vspace=0 border=0 align=middle >Recherche avanc&eacute;e (plus d'options)</a><br>
+
+       <img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=8
+       alt=" " hspace=0 vspace=0>
+       <p>
+       <TMPL_IF NAME="loggedinusername">
+           <p align=left> <b>Bienvenue <TMPL_VAR NAME="loggedinusername"></b><br/>
+           <img src="<TMPL_VAR NAME='themelang'>/images/front-arrow.gif" width=27 height=22 alt="-" hspace=0 vspace=0 border=0 align=middle ><a href=/cgi-bin/koha/opac-user.pl>Votre compte lecteur</a><br/>
+           <img src="<TMPL_VAR NAME='themelang'>/images/front-arrow.gif" width=27 height=22 alt="-" hspace=0 vspace=0 border=0 align=middle ><a href="/cgi-bin/koha/logout.pl">D&eacute;connexion</a></p>
+       <TMPL_ELSE>
+           <p align=left><img src="<TMPL_VAR NAME='themelang'>/images/front-arrow.gif" width=27 height=22 alt="-" hspace=0 vspace=0 border=0 align=middle ><a href="/cgi-bin/koha/opac-user.pl">Voir votre compte lecteur</a></p>
+       </TMPL_IF>
+       </td>
+       </form>
+  </tr>
+
+
+ 
+
+<!--
+  <tr valign=top ><form action="/cgi-bin/koha/member.pl" method=get >
+       <td background=" "  colspan=3><img src="<TMPL_VAR NAME='themelang'>/images/heading-login.gif" width=279                 height=38
+       alt="Member Login" hspace=0 vspace=0 border=0></td>
+
+  </tr>
+<tr valign=top >
+        <td></td>
+       <form action="/cgi-bin/koha/member.pl" method=get >
+       <td background=" " >
+       <font size=3 face="arial narrow,arial,helvetica">Num&eacute;ro de carte lecteur &nbsp;</font></td>
+       <td background=" " ><input type=text size="12" name="card"></td>
+
+  </tr>
+
+  <tr valign=top><td></td>
+       <td></td>
+       <td></td>
+       <td background=" " >
+       <font size=3 face="arial narrow,arial,helvetica">Mot de passe</font></td>
+       <td background=" " ><input type=password size="12" name="password"><br>
+       <input type=submit value="OK"><br>
+
+       <img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" width=1 height=8
+       alt=" " hspace=0 vspace=0></td>
+       </font>
+ </tr>
+
+  <tr valign=top >
+       <td></td>
+       <td background=" " colspan=4><A href="/cgi-bin/koha/join.html"><img src="<TMPL_VAR NAME='themelang'>/images/heading-member.gif" width=331               height=38
+       alt="Inscrivez-vous &agrave; l'acc&eacute;s web personnalis&eacute;" hspace=0 vspace=0 border=0></a>
+       </td>
+       <td>
+       </td>
+
+  </tr>
+
+-->
+</table>
+
+</td>
+  </tr>
+</table>
+<p>
+</center>

diff --git a/koha-tmpl/opac-tmpl/default/fr/opac-moredetail.tmpl b/koha-tmpl/opac-tmpl/default/fr/opac-moredetail.tmpl
index be29015..9c4b2bf 100755 (executable)
--- a/koha-tmpl/opac-tmpl/default/fr/opac-moredetail.tmpl
+++ b/koha-tmpl/opac-tmpl/default/fr/opac-moredetail.tmpl
@@ -1,105 +1,105 @@
-<TMPL_INCLUDE NAME="cat-top.inc">\r
-<center>\r
-<br>\r
-<TMPL_LOOP NAME="BIBITEM_DATA">\r
-<a href=/cgi-bin/koha/request.pl?bib=<TMPL_VAR NAME="biblionumber">\r
-<img src=/images/requests.gif\r
-width=120 height=42 border=0 align=right border=0></a>\r
-<FONT SIZE=6><em><a\r
-href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR NAME="biblionumber">&type=intra><TMPL_VAR NAME="title">\r
-(<TMPL_VAR NAME="author">)</a></em></FONT><P>\r
-<p>\r
-<form action=/cgi-bin/koha/modbibitem.pl>\r
-<input type=hidden name=bibitem value=<TMPL_VAR NAME="biblioitemnumber">>\r
-<input type=hidden name=biblio value=<TMPL_VAR NAME="biblionumber">>\r
-<!-------------------BIBLIO ITEM------------>\r
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left>\r
-<TR VALIGN=TOP>\r
-<td  bgcolor="99cc33" background="/images/background-mem.gif"\r
-><B><TMPL_VAR NAME="biblioitemnumber"> GROUPE - <TMPL_VAR NAME="description"> </b> </TD>\r
-</TR>\r
-<tr VALIGN=TOP  >\r
-<TD width=210 >\r
-<INPUT TYPE="image" name="submit"  VALUE="modify" height=42  WIDTH=93\r
-BORDER=0 src="/images/modify-mem.gif" alt="modifier">\r
-<INPUT TYPE="image" name="delete"  VALUE="delete" height=42  WIDTH=93\r
-BORDER=0 src="/images/delete-mem.gif" alt="effacer">\r
-<br>\r
-<FONT SIZE=2  face="arial, helvetica">\r
-<b>Num&eacute;ro de notice:</b> <TMPL_VAR NAME="biblionumber"><br>\r
-<b>Type de document:</b> <TMPL_VAR NAME="itemtype"><br>\r
-<b>URL:</b> <TMPL_VAR NAME="url"><br>\r
-<b>Dur&eacute;e de pr&ecirc;t:</b> <TMPL_VAR NAME="loanlength"><br>\r
-<b>Co&ucirc;t de location:</b> <TMPL_VAR NAME="rentalcharge"><br>\r
-<b>Cote:</b> <TMPL_VAR NAME="classification"><TMPL_VAR NAME="dewey"><TMPL_VAR NAME="subclass"><br>\r
-<b>ISBN:</b> <TMPL_VAR NAME="isbn"><br>\r
-<b>Editeur:</b> <TMPL_VAR NAME="publishercode"> <br>\r
-<b>Lieu de publication:</b> <TMPL_VAR NAME="place"><br>\r
-<b>Ann&eacute;e de publication:</b> <TMPL_VAR NAME="publicationyear"><br>\r
-<b>Volume:</b> <TMPL_VAR NAME="volumeddesc"><br>\r
-<b>Pages:</b> <TMPL_VAR NAME="pages"><br>\r
-<b>Ill.:</b> <TMPL_VAR NAME="illus"><br>\r
-<b>Taille:</b> <TMPL_VAR NAME="size"><br>\r
-<b>Notes:</b> <TMPL_VAR NAME="bnotes"><br>\r
-<b>Nombre d'exemplaires:</b> <TMPL_VAR NAME="count">\r
-</font>\r
-</TD>\r
-</tr>\r
-</table>\r
-</form>\r
-</TMPL_LOOP>\r
-<TMPL_LOOP NAME="ITEM_DATA">\r
-<img src="/images/holder.gif" width=16 height=300 align=left>\r
-<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width=220 >\r
-<TR VALIGN=TOP>\r
-<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>CODE BARRES\r
-<TMPL_VAR NAME="barcode"></b></TD>\r
-</TR>\r
-<tr VALIGN=TOP>\r
-<TD width=220>\r
-<form action=/cgi-bin/koha/moditem.pl method=post>\r
-<input type=hidden name=bibitem value=<TMPL_VAR NAME="biblionumber">>\r
-<input type=hidden name=item value=<TMPL_VAR NAME="itemnumber">>\r
-<input type=hidden name=type value=<TMPL_VAR NAME="type">>\r
-<INPUT TYPE="image" name="submit"  VALUE="modify" height=42  WIDTH=93\r
-BORDER=0 src="/images/modify-mem.gif" alt="modifier">\r
-<INPUT TYPE="image" name="delete"  VALUE="delete" height=42  WIDTH=93\r
-BORDER=0 src="/images/delete-mem.gif" alt="effacer">\r
-<br>\r
-<FONT SIZE=2  face="arial, helvetica">\r
-<b>Site d'origine:</b> <TMPL_VAR NAME="homebranch"><br>\r
-<b>Derni&egrave;re transaction:</b> <TMPL_VAR NAME="datelastseen"><br>\r
-<b>Dernier emprunt:</b> <TMPL_VAR NAME="timestamp0"><br>\r
-en pr&ecirc;t <!-- FIXME - What's this, then? -->\r
-<b>Derniers emprunteurs 1:</b> <TMPL_VAR NAME="card0"><br>\r
-<b>Derniers emprunteurs 2:</b> <TMPL_VAR NAME="card1"><br>\r
-<b>Site actuel:</b> <TMPL_VAR NAME="holdingbranch"><br>\r
-<b>Prix de remplacement:</b> <TMPL_VAR NAME="replacementprice"><br>\r
-<b>Exemplaire perdu:</b> <TMPL_VAR NAME="itemlost"><br>\r
-<b>Pay&eacute; par:</b> <TMPL_VAR NAME="paidfor"><br>\r
-<b>Notes:</b> <TMPL_VAR NAME="itemnotes"><br>\r
-<b>Renouvellements:</b> <TMPL_VAR NAME="renewals"><br>\r
-<b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<TMPL_VAR NAME="ordernumber">&biblio=<TMPL_VAR NAME="biblionumber">&invoice=<TMPL_VAR NAME="booksellerinvoicenumber">&catview=yes">\r
-Accession</a>\r
-Date:<TMPL_VAR NAME="dateaccessioned"><br>\r
-<b>Annul&eacute;: <TMPL_VAR NAME="wthdrawn"><br>\r
-<b><a\r
-href=/cgi-bin/koha/bookcount.pl?&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR NAME="biblioitemnumber">&itm=<TMPL_VAR NAME="itemnumber">>Total\r
-Issues:</a></b> <TMPL_VAR NAME="issues"><br>\r
-<b>Num&eacute;ro de groupe:</b> <TMPL_VAR NAME="biblioitemnumber"> <br>\r
-<b>Num&eacute;ro de notice:</b> <TMPL_VAR NAME="biblionumber"> <br>\r
-\r
-\r
-\r
-</font>\r
-</TD>\r
-</tr>\r
-</table>\r
-</form>\r
-</TMPL_LOOP>\r
-\r
-<p>\r
-</form>\r
-</center>\r
-\r
-<TMPL_INCLUDE NAME="cat-bottom.inc">\r
+<TMPL_INCLUDE NAME="opac-top.inc">
+<center>
+<br>
+<TMPL_LOOP NAME="BIBITEM_DATA">
+<a href=/cgi-bin/koha/request.pl?bib=<TMPL_VAR NAME="biblionumber">
+<img src=/images/requests.gif
+width=120 height=42 border=0 align=right border=0></a>
+<FONT SIZE=6><em><a
+href=/cgi-bin/koha/detail.pl?bib=<TMPL_VAR NAME="biblionumber">&type=intra><TMPL_VAR NAME="title">
+(<TMPL_VAR NAME="author">)</a></em></FONT><P>
+<p>
+<form action=/cgi-bin/koha/modbibitem.pl>
+<input type=hidden name=bibitem value=<TMPL_VAR NAME="biblioitemnumber">>
+<input type=hidden name=biblio value=<TMPL_VAR NAME="biblionumber">>
+<!-------------------BIBLIO ITEM------------>
+<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left>
+<TR VALIGN=TOP>
+<td  bgcolor="99cc33" background="/images/background-mem.gif"
+><B><TMPL_VAR NAME="biblioitemnumber"> GROUPE - <TMPL_VAR NAME="description"> </b> </TD>
+</TR>
+<tr VALIGN=TOP  >
+<TD width=210 >
+<INPUT TYPE="image" name="submit"  VALUE="modify" height=42  WIDTH=93
+BORDER=0 src="/images/modify-mem.gif" alt="modifier">
+<INPUT TYPE="image" name="delete"  VALUE="delete" height=42  WIDTH=93
+BORDER=0 src="/images/delete-mem.gif" alt="effacer">
+<br>
+<FONT SIZE=2  face="arial, helvetica">
+<b>Num&eacute;ro de notice:</b> <TMPL_VAR NAME="biblionumber"><br>
+<b>Type de document:</b> <TMPL_VAR NAME="itemtype"><br>
+<b>URL:</b> <TMPL_VAR NAME="url"><br>
+<b>Dur&eacute;e de pr&ecirc;t:</b> <TMPL_VAR NAME="loanlength"><br>
+<b>Co&ucirc;t de location:</b> <TMPL_VAR NAME="rentalcharge"><br>
+<b>Cote:</b> <TMPL_VAR NAME="classification"><TMPL_VAR NAME="dewey"><TMPL_VAR NAME="subclass"><br>
+<b>ISBN:</b> <TMPL_VAR NAME="isbn"><br>
+<b>Editeur:</b> <TMPL_VAR NAME="publishercode"> <br>
+<b>Lieu de publication:</b> <TMPL_VAR NAME="place"><br>
+<b>Ann&eacute;e de publication:</b> <TMPL_VAR NAME="publicationyear"><br>
+<b>Volume:</b> <TMPL_VAR NAME="volumeddesc"><br>
+<b>Pages:</b> <TMPL_VAR NAME="pages"><br>
+<b>Ill.:</b> <TMPL_VAR NAME="illus"><br>
+<b>Taille:</b> <TMPL_VAR NAME="size"><br>
+<b>Notes:</b> <TMPL_VAR NAME="bnotes"><br>
+<b>Nombre d'exemplaires:</b> <TMPL_VAR NAME="count">
+</font>
+</TD>
+</tr>
+</table>
+</form>
+</TMPL_LOOP>
+<TMPL_LOOP NAME="ITEM_DATA">
+<img src="/images/holder.gif" width=16 height=300 align=left>
+<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width=220 >
+<TR VALIGN=TOP>
+<td  bgcolor="99cc33" background="/images/background-mem.gif"><B>CODE BARRES
+<TMPL_VAR NAME="barcode"></b></TD>
+</TR>
+<tr VALIGN=TOP>
+<TD width=220>
+<form action=/cgi-bin/koha/moditem.pl method=post>
+<input type=hidden name=bibitem value=<TMPL_VAR NAME="biblionumber">>
+<input type=hidden name=item value=<TMPL_VAR NAME="itemnumber">>
+<input type=hidden name=type value=<TMPL_VAR NAME="type">>
+<INPUT TYPE="image" name="submit"  VALUE="modify" height=42  WIDTH=93
+BORDER=0 src="/images/modify-mem.gif" alt="modifier">
+<INPUT TYPE="image" name="delete"  VALUE="delete" height=42  WIDTH=93
+BORDER=0 src="/images/delete-mem.gif" alt="effacer">
+<br>
+<FONT SIZE=2  face="arial, helvetica">
+<b>Site d'origine:</b> <TMPL_VAR NAME="homebranch"><br>
+<b>Derni&egrave;re transaction:</b> <TMPL_VAR NAME="datelastseen"><br>
+<b>Dernier emprunt:</b> <TMPL_VAR NAME="timestamp0"><br>
+en pr&ecirc;t <!-- FIXME - What's this, then? -->
+<b>Derniers emprunteurs 1:</b> <TMPL_VAR NAME="card0"><br>
+<b>Derniers emprunteurs 2:</b> <TMPL_VAR NAME="card1"><br>
+<b>Site actuel:</b> <TMPL_VAR NAME="holdingbranch"><br>
+<b>Prix de remplacement:</b> <TMPL_VAR NAME="replacementprice"><br>
+<b>Exemplaire perdu:</b> <TMPL_VAR NAME="itemlost"><br>
+<b>Pay&eacute; par:</b> <TMPL_VAR NAME="paidfor"><br>
+<b>Notes:</b> <TMPL_VAR NAME="itemnotes"><br>
+<b>Renouvellements:</b> <TMPL_VAR NAME="renewals"><br>
+<b><a href="/cgi-bin/koha/acqui/acquire.pl?recieve=<TMPL_VAR NAME="ordernumber">&biblio=<TMPL_VAR NAME="biblionumber">&invoice=<TMPL_VAR NAME="booksellerinvoicenumber">&catview=yes">
+Accession</a>
+Date:<TMPL_VAR NAME="dateaccessioned"><br>
+<b>Annul&eacute;: <TMPL_VAR NAME="wthdrawn"><br>
+<b><a
+href=/cgi-bin/koha/bookcount.pl?&bib=<TMPL_VAR NAME="biblionumber">&bi=<TMPL_VAR NAME="biblioitemnumber">&itm=<TMPL_VAR NAME="itemnumber">>Total
+Issues:</a></b> <TMPL_VAR NAME="issues"><br>
+<b>Num&eacute;ro de groupe:</b> <TMPL_VAR NAME="biblioitemnumber"> <br>
+<b>Num&eacute;ro de notice:</b> <TMPL_VAR NAME="biblionumber"> <br>
+
+
+
+</font>
+</TD>
+</tr>
+</table>
+</form>
+</TMPL_LOOP>
+
+<p>
+</form>
+</center>
+
+<TMPL_INCLUDE NAME="cat-bottom.inc">

diff --git a/koha-tmpl/opac-tmpl/default/fr/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/default/fr/opac-reserve.tmpl
index a8e622d..848c23c 100755 (executable)
--- a/koha-tmpl/opac-tmpl/default/fr/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/default/fr/opac-reserve.tmpl
@@ -1,13 +1,6 @@
-<TMPL_INCLUDE NAME="members-top.inc">
+<TMPL_INCLUDE NAME="opac-top.inc">
 
 <center>
-
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Connect&eacute;: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Accueil usagers</a>][<a href=/cgi-bin/koha/opac-logout.pl>D&eacute;connexion</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Se connecter</a> &agrave; Koha</p>
-</TMPL_IF>
-
 <TMPL_IF NAME="message">
 <table  cellpadding=5 cellspacing=0 border=1 >
 <tr bgcolor="#fecc99" >
@@ -26,10 +19,13 @@
 <p>
 R&eacute;servation du document suivant: <b><TMPL_VAR NAME="title"> ( <TMPL_VAR NAME="author"> )</b>
 </p>
-<p> Il y a d&eacute;j&agrave; <b><TMPL_VAR NAME="reservecount"></b> r&eacute;servations pour ce document. </p>
-<p>
-Veuillez s&eacute;lectionner les types de documents qui vous conviennent. Le premier document qui correspond &agrave; l'un de ces types sera mis de c&ocirc;t&eacute; pour vous.
+<TMPL_IF name="reservecount">
+       <p> Il y a d&eacute;j&agrave; <b><TMPL_VAR NAME="reservecount"></b> r&eacute;servations pour ce document. </p>
+<TMPL_ELSE>
+       <p>Ce document n'est réservé par personne actuellement</p>
+</TMPL_IF>
 <p>
+Veuillez s&eacute;lectionner les types de documents qui vous conviennent :<br>
 
 <FORM ACTION="/cgi-bin/koha/opac-reserve.pl" method=post>
 <input type="hidden" name="item_types_selected" value="1">
@@ -53,10 +49,11 @@ Veuillez s&eacute;lectionner les types de documents qui vous conviennent. Le pre
 </TMPL_LOOP>
 
 </table>
+<br>
 Veuillez s&eacute;lectionner la biblioth&egrave;que dans laquelle vous voulez retirer le document:
-<TMPL_VAR NAME="CGIbranch"><br>
+<TMPL_VAR NAME="CGIbranch"><br><br>
 
-<font size=4 face="arial,helvetica"><INPUT type="submit" value="Submit"></font>
+<font size=4 face="arial,helvetica"><INPUT type="submit" value="Réserver"></font>
 
 </FORM>
 
@@ -64,37 +61,26 @@ Veuillez s&eacute;lectionner la biblioth&egrave;que dans laquelle vous voulez re
 
 <!-- if the bibitems have already been selected -->
 <TMPL_IF NAME="item_types_selected">
-
-<p>
-Veuillez confirmer que vous souhaitez r&eacute;server ces types de documents:
-<p>
-
-<FORM ACTION="/cgi-bin/koha/opac-reserve.pl" method=post>
-<input type="hidden" name="place_reserve" value="1">
-<input type="hidden" name="bib" value="<TMPL_VAR NAME='biblionumber'>">
-<TABLE border=1>
-<tr><th bgcolor="#99cccc" background='<TMPL_VAR NAME="themelang">/images/background-opac.gif'>Type de document</th></tr>
-
-<TMPL_LOOP NAME="TYPES">
-
-  <tr>
-  <input type="hidden" name="itemtype" value="<TMPL_VAR NAME='itemtype'>"></td>
-  <td><TMPL_VAR NAME="description"></td>
-  </tr>
-
-</TMPL_LOOP>
-
-</table>
-
-Qui devra &ecirc;tre retir&eacute; à la biblioth&egrave;que :  <b><TMPL_VAR NAME="branchname"></b>.<br>
-<input type="hidden" name="bib" value="<TMPL_VAR NAME='branch'>">
-
-<TMPL_IF NAME="fee">
-<br>Attention, il y aura des frais de r&eacute;servation de <b><TMPL_VAR NAME="fee">&euro;</b><br>
-</TMPL_IF>
-
-<font size=4 face="arial,helvetica"><INPUT type="submit" value="R&eacute;server"></font>
-
-</FORM>
-
+       <p>
+       Veuillez confirmer votre réservation :
+       <p>
+       <FORM ACTION="/cgi-bin/koha/opac-reserve.pl" method=post>
+       <input type="hidden" name="place_reserve" value="1">
+       <input type="hidden" name="bib" value="<TMPL_VAR NAME='biblionumber'>">
+       <TABLE border=1>
+               <tr><th bgcolor="#99cccc" background='<TMPL_VAR NAME="themelang">/images/background-opac.gif'>Type de document</th></tr>
+               <TMPL_LOOP NAME="TYPES">
+                       <tr>
+                               <td><input type="hidden" name="itemtype" value="<TMPL_VAR NAME='itemtype'>"><TMPL_VAR NAME="description"></td>
+                       </tr>
+               </TMPL_LOOP>
+       </table><br>
+       Qui devra &ecirc;tre retir&eacute; à la biblioth&egrave;que :  <b><TMPL_VAR NAME="branchname"></b>.<br>
+       <input type="hidden" name="bib" value="<TMPL_VAR NAME='branch'>">
+       <TMPL_IF NAME="fee">
+               <br>Attention, il y aura des frais de r&eacute;servation de <b><TMPL_VAR NAME="fee">&euro;</b><br>
+       </TMPL_IF>
+       <br>
+       <font size=4 face="arial,helvetica"><INPUT type="submit" value="R&eacute;server"></font>
+       </FORM>
 </TMPL_IF>

diff --git a/koha-tmpl/opac-tmpl/default/fr/opac-search.tmpl b/koha-tmpl/opac-tmpl/default/fr/opac-search.tmpl
index 10f4ef8..4ee76cd 100755 (executable)
--- a/koha-tmpl/opac-tmpl/default/fr/opac-search.tmpl
+++ b/koha-tmpl/opac-tmpl/default/fr/opac-search.tmpl
@@ -1,12 +1,5 @@
 <TMPL_INCLUDE NAME="opac-top.inc">
 
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Logged in as: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Members Home</a>][<a href=/cgi-bin/koha/opac-logout.pl>Log Out</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Log In</a> to Koha</p>
-</TMPL_IF>
-
-
 <CENTER>
 <FORM ACTION="/cgi-bin/koha/opac-searchresults.pl" method=get>
 <TABLE >
@@ -54,14 +47,13 @@
 </TR>
 
 <tr>
-       <td>Classe</td>
+       <td>Catégorie</td>
        <td>
-               <select size="1"  name="class">
-               <option value="">Toutes
-               <!-- fetch class list -->
-               <TMPL_INCLUDE NAME="cat-class-list.inc">
-               <!--#include virtual="/includes/cat-class-list.inc" -->
-               </select>
+       <select size="1"  name="class">
+       <option value="">Toutes
+       <!-- fetch class list -->
+       <TMPL_VAR name="classlist">
+       </select>
        </td>
        <td></td>
 </tr>
@@ -74,7 +66,7 @@
 
 <TR VALIGN=TOP>
        <td></td>
-       <TD><font size=4 face="arial,helvetica"><INPUT TYPE="reset"  value="Clear All Fields"></font></td>
+       <TD><font size=4 face="arial,helvetica"><INPUT TYPE="reset"  value="Tout effacer"></font></td>
        <td></td>
 </tr>
 

diff --git a/koha-tmpl/opac-tmpl/default/fr/opac-searchresults.tmpl b/koha-tmpl/opac-tmpl/default/fr/opac-searchresults.tmpl
index 1fe6174..4d45a9e 100755 (executable)
--- a/koha-tmpl/opac-tmpl/default/fr/opac-searchresults.tmpl
+++ b/koha-tmpl/opac-tmpl/default/fr/opac-searchresults.tmpl
@@ -1,14 +1,6 @@
 <TMPL_INCLUDE NAME="opac-top.inc">
 
 <center>
-
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Connect&eacute;: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-user.pl>Accueil usagers</a>][<a href=/cgi-bin/koha/opac-logout.pl>D&eacute;connexion</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Se connecter</a> &agrave; Koha</p>
-</TMPL_IF>
-
-
 <TMPL_IF NAME="searchdesc">
     Votre recherche &eacute;tait <b><TMPL_VAR NAME="searchdesc"></b>
 <TMPL_ELSE>
@@ -65,7 +57,13 @@
 
     <table border=0 cellspacing=0 cellpadding=2 width=90%>
     <tr bgcolor=#99cccc background=<TMPL_VAR NAME="themelang">/images/background-opac.gif>
-           <th align=left>Titre</th><th align=left>Auteur</th><th>Ann&eacute;e</th><th>Nbre d'exemplaires</th><th>Localisation</th><th>&nbsp</th>
+           <th align=left>Titre</th>
+           <th align=left>Auteur</th>
+           <th>Ann&eacute;e</th>
+           <th>Nbre d'exemplaires</th>
+           <th>Localisation</th>
+           <th>Cote</th>
+           <th>&nbsp</th>
     </tr>
 
 
@@ -79,18 +77,17 @@
       <td align=center> <TMPL_VAR NAME="copyrightdate"> </td>
       <td align=center> <TMPL_VAR NAME="itemcount"> </td>
       <td> <TMPL_VAR NAME="location"> </td>
+      <td><TMPL_VAR name="classification"> <TMPL_VAR name="dewey"></td>
       <td>
 <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
 </TMPL_UNLESS>
-</td> 
+</td>
       </tr>
     </TMPL_LOOP>
 
-
-
-    <tr bgcolor=#99cccc background=<TMPL_VAR NAME="themelang">/images/background-opac.gif><td colspan=6>
+    <tr bgcolor=#99cccc background=<TMPL_VAR NAME="themelang">/images/background-opac.gif><td colspan=7>
        <table border=0 cellpadding=0 cellspacing=0 width=100%>
        <tr bgcolor=#99cccc background=<TMPL_VAR NAME="themelang">/images/background-opac.gif><td align=left>
        <TMPL_IF NAME="displayprev">

diff --git a/koha-tmpl/opac-tmpl/default/fr/opac-user.tmpl b/koha-tmpl/opac-tmpl/default/fr/opac-user.tmpl
index 41cc92b..4b44f1f 100755 (executable)
--- a/koha-tmpl/opac-tmpl/default/fr/opac-user.tmpl
+++ b/koha-tmpl/opac-tmpl/default/fr/opac-user.tmpl
@@ -1,4 +1,4 @@
-<TMPL_INCLUDE NAME="members-top.inc">
+<TMPL_INCLUDE NAME="opac-top.inc">
 
 <TMPL_LOOP NAME="BORROWER_INFO">
 
@@ -21,17 +21,14 @@ Des informations sont inexactes? Vous avez d&eacute;m&eacute;nag&eacute;, chang&
 
 </td></tr></table>
 
-
-
-<font size=6><em>Bonjour, <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></em></font> 
-[<a href="/cgi-bin/koha/opac-logout.pl">D&eacute;connexion</a>]<p>
-
+<font size=6><em>Bonjour, <TMPL_VAR NAME="firstname"> <TMPL_VAR NAME="surname"></em></font>
+<p>[<a href="/cgi-bin/koha/opac-logout.pl">D&eacute;connexion</a>] [<a href='/cgi-bin/koha/opac-account.pl'>Voir vos finances</a>]<p>
 
 <TMPL_IF NAME="amountoverfive">
 <table cellpadding=5 cellspacing=0 border=1>
 <tr bgcolor="#fecc99">
 <td>
-<font face="arial,helvetica" color="red" size=+2><B>Vous avez une amende de <TMPL_VAR NAME="amountoutstanding"></B></font>
+<font face="arial,helvetica" color="red" size=+2><B>Vous devez <TMPL_VAR NAME="amountoutstanding"> Euros à la bibliothèque</B></font>
 </td></tr></table>
 
 </TMPL_IF>
@@ -40,7 +37,7 @@ Des informations sont inexactes? Vous avez d&eacute;m&eacute;nag&eacute;, chang&
 <table cellpadding=5 cellspacing=0 border=1>
 <tr bgcolor="#fecc99">
 <td>
-<td><font face="arial,helvetica" size=+2><B>Vous avez une amende de <TMPL_VAR NAME="amountoutstanding"></B></font>
+<td><font face="arial,helvetica" size=+2><B>Vous devez <TMPL_VAR NAME="amountoutstanding"> Euros à la bibliothèque</B></font>
 </td></tr></table>
 </TMPL_IF>
 
@@ -48,10 +45,9 @@ Des informations sont inexactes? Vous avez d&eacute;m&eacute;nag&eacute;, chang&
 <table cellpadding=5 cellspacing=0 border=1>
 <tr bgcolor="#fecc99">
 <td>
-<td><font face="arial,helvetica" size=+2><B>Vous avez un cr&eacute;dit de <TMPL_VAR NAME="amountoutstanding"></B></font>
+<td><font face="arial,helvetica" size=+2><B>Vous avez un cr&eacute;dit de <TMPL_VAR NAME="amountoutstanding"> Euros</B></font>
 </td></tr></table>
 </TMPL_IF>
-<a href='/cgi-bin/koha/opac-account.pl'>Voir votre compte</a>
 
 </TMPL_LOOP>
 
@@ -69,63 +65,48 @@ Des informations sont inexactes? Vous avez d&eacute;m&eacute;nag&eacute;, chang&
 <p>
 
 <TMPL_IF NAME="issues_count">
-
-Vous avez <TMPL_VAR NAME="issues_count"> documents en pr&ecirc;t actuellement.<br>
-
-<TABLE  CELLPADDING=5  CELLSPACING=0 border=1 >
-
-<TR VALIGN=TOP  bgcolor="#99cccc"  background='<TMPL_VAR NAME="themelang">/images/background-opac.gif'>
-<TD><B>Titre</B></TD>
-<TD><B>Auteur</B></TD>
-<TD><B>Date de retour</B></TD>
-<TD><B>Type de doc.</B></TD>
-<TD><B>Amendes</B></TD>
-<TD><B>Pr&ecirc;ts en cours</B></TD>
-</TR>
-
-<TMPL_LOOP NAME="ISSUES">
-
-<TR VALIGN=TOP>
-<TD><TMPL_VAR NAME="title"></TD>
-<TD><TMPL_VAR NAME="author"></TD>
-<TD><TMPL_VAR NAME="date_due"></TD>
-<TD><TMPL_VAR NAME="itemtype"></TD>
-<TD><TMPL_IF NAME="charges">Oui<TMPL_ELSE>Non</TMPL_IF></TD>
-<TD><TMPL_IF NAME="status">Oui<TMPL_ELSE>Non</TMPL_IF></TD>
-</TR>
-
-</TMPL_LOOP>
-</table>
-
+       <p>Vous avez <TMPL_VAR NAME="issues_count"> document(s) en pr&ecirc;t actuellement :</p>
+       <TABLE  CELLPADDING=5  CELLSPACING=0 border=1 >
+       <TR VALIGN=TOP  bgcolor="#99cccc"  background='<TMPL_VAR NAME="themelang">/images/background-opac.gif'>
+               <TD><B>Titre</B></TD>
+               <TD><B>Auteur</B></TD>
+               <TD><B>Date de retour</B></TD>
+               <TD><B>Type de doc.</B></TD>
+               <TD><B>Amendes</B></TD>
+               <TD><B>Pr&ecirc;ts en cours</B></TD>
+       </TR>
+
+       <TMPL_LOOP NAME="ISSUES">
+               <TR VALIGN=TOP>
+               <TD><TMPL_VAR NAME="title"></TD>
+               <TD><TMPL_VAR NAME="author"></TD>
+               <TD><TMPL_VAR NAME="date_due"></TD>
+               <TD><TMPL_VAR NAME="itemtype"></TD>
+               <TD><TMPL_IF NAME="charges">Oui<TMPL_ELSE>Non</TMPL_IF></TD>
+               <TD><TMPL_IF NAME="status">Oui<TMPL_ELSE>Non</TMPL_IF></TD>
+               </TR>
+       </TMPL_LOOP>
+       </table>
 <TMPL_ELSE>
-Vous n'avez aucun pr&ecirc;t en cours.
+       <p>Vous n'avez aucun pr&ecirc;t en cours.</p>
 </TMPL_IF>
 
-<p>
-
-
 <TMPL_IF NAME="reserves_count">
-
-Vous avez r&eacute;serv&eacute; <TMPL_VAR NAME="reserves_count"> documents.<br>
-
-<TABLE  CELLPADDING=5  CELLSPACING=0 border=1 >
-
-<TR VALIGN=TOP  bgcolor="#99cccc" background='<TMPL_VAR NAME="themelang">/images/background-opac.gif'>
-<TD><B>Titre</B></TD>
-<TD><B>Auteur</B></TD>
-<TD><B>Date de r&eacute;servation</B></TD>
-</TR>
-
-<TMPL_LOOP NAME="RESERVES">
-
-<TR VALIGN=TOP>
-<TD><TMPL_VAR NAME="btitle"></TD>
-<TD><TMPL_VAR NAME="author"></TD>
-<TD><TMPL_VAR NAME="reservedate"></TD>
-</TR>
-
-</TMPL_LOOP>
-</table>
+       <p>Vous avez r&eacute;serv&eacute; <TMPL_VAR NAME="reserves_count"> document(s) :</p>
+       <TABLE  CELLPADDING=5  CELLSPACING=0 border=1 >
+               <TR VALIGN=TOP  bgcolor="#99cccc" background='<TMPL_VAR NAME="themelang">/images/background-opac.gif'>
+               <TD><B>Titre</B></TD>
+               <TD><B>Auteur</B></TD>
+               <TD><B>Date de r&eacute;servation</B></TD>
+               </TR>
+               <TMPL_LOOP NAME="RESERVES">
+                       <TR VALIGN=TOP>
+                       <TD><TMPL_VAR NAME="btitle"></TD>
+                       <TD><TMPL_VAR NAME="author"></TD>
+                       <TD><TMPL_VAR NAME="reservedate"></TD>
+                       </TR>
+               </TMPL_LOOP>
+       </table>
 </TMPL_IF>
 
 

diff --git a/koha-tmpl/opac-tmpl/default/fr/opac-userupdate.tmpl b/koha-tmpl/opac-tmpl/default/fr/opac-userupdate.tmpl
index e02d5fa..a01c557 100755 (executable)
--- a/koha-tmpl/opac-tmpl/default/fr/opac-userupdate.tmpl
+++ b/koha-tmpl/opac-tmpl/default/fr/opac-userupdate.tmpl
@@ -1,11 +1,4 @@
-<TMPL_INCLUDE NAME="members-top.inc">
-
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Connect&eacute;: <TMPL_VAR NAME="loggedinuser"> [<a href=/cgi-bin/koha/opac-logout.pl>D&eacute;connexion</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=/cgi-bin/koha/opac-user.pl>Se connecter</a> &agrave; Koha</p>
-</TMPL_IF>
-
+<TMPL_INCLUDE NAME="opac-top.inc">
 <i>Si des informations sont erronées, vous pouvez les corriger. <b>Notez</b> qu'un <b>mail</b> sera envoyé à la bibliothèque, qui <b>validera</b> vos modifications.<br/>
 en conséquence, vos modifications n'apparaitront pas immédiatement.</i><br/><br/>
 <TMPL_LOOP NAME="BORROWER_INFO">

diff --git a/koha-tmpl/opac-tmpl/default/fr/subject.tmpl b/koha-tmpl/opac-tmpl/default/fr/subject.tmpl
index 472bd5c..66bdb7f 100755 (executable)
--- a/koha-tmpl/opac-tmpl/default/fr/subject.tmpl
+++ b/koha-tmpl/opac-tmpl/default/fr/subject.tmpl
@@ -1,12 +1,5 @@
 <TMPL_INCLUDE NAME="opac-top.inc">
 
-
-<TMPL_IF NAME="loggedinuser">
-    <p align=left>Connect&eacute;: <TMPL_VAR NAME="loggedinuser"> [<a href=./logout.pl>D&eacute;connexion</a>]</p>
-<TMPL_ELSE>
-    <p align=left><a href=./userpage.pl>Se connecter</a> &agrave; Koha</p>
-</TMPL_IF>
-
 <center>
 
 <table border=0 cellspacing=0 cellpadding=2>

diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index ae8249d..749f3fb 100755 (executable)
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -49,8 +49,6 @@ foreach my $res (@$reserves) {
     }
 }
 
-
-
 $rank++;
 $template->param(rank => $rank);
 
@@ -69,8 +67,10 @@ my @select_branch;
 my %select_branches;
 
 foreach my $branch (keys %$branches) {
-       push @select_branch, $branch;
-       $select_branches{$branch} = $branches->{$branch}->{'branchname'};
+       if ($branch) {
+               push @select_branch, $branch;
+               $select_branches{$branch} = $branches->{$branch}->{'branchname'};
+       }
 }
 my $CGIbranch=CGI::scrolling_list( -name     => 'branch',
                        -values   => \@select_branch,
@@ -161,7 +161,7 @@ for (my $rownum=0;$rownum<$publictypes[0]->{'count'} ;$rownum++) {
        my @items = @{$pty->{'items'}};
        push @row, $items[$rownum] if defined $items[$rownum];
     }
-    my $last = @row; 
+    my $last = @row;
     $row[$last-1]->{'last'} =1 if $last == $width;
     my $fill = ($width - $last)*2;
     $fill-- if $fill;

diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index b116ce7..6b33fbe 100755 (executable)
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -42,7 +42,7 @@ if ($borr->{'amountoutstanding'} < 0) {
     $borr->{'amountoutstanding'} = -1*($borr->{'amountoutstanding'});
 }
 
-$borr->{'amountoutstanding'} = sprintf "\$%.02f", $borr->{'amountoutstanding'};
+$borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'};
 
 my @bordat;
 $bordat[0] = $borr;