From 74c50d19655ddb8acc11b5b00c0d254213861029 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Mon, 18 Jun 2007 07:56:03 +0000
Subject: [PATCH] french templates, updated

---
 .../prog/fr/admin/marctagstructure.tmpl       |   1 +
 koha-tmpl/intranet-tmpl/prog/fr/auth.tmpl     |   7 +
 .../prog/fr/authorities/authorities.tmpl      |   3 +-
 .../prog/fr/catalogue/results.tmpl            |  12 +-
 .../prog/fr/cataloguing/addbooks.tmpl         |  49 ++++-
 .../prog/fr/circ/transferstodo.tmpl           |   2 +-
 .../prog/fr/includes/intranet2.css            |  12 +-
 .../intranet-tmpl/prog/fr/includes/menus.inc  |  11 +-
 .../intranet-tmpl/prog/fr/serials/claims.tmpl |   2 +-
 .../prog/fr/serials/subscription-add.tmpl     |   2 +-
 .../prog/fr/serials/subscription-renew.tmpl   |   7 +-
 .../intranet-tmpl/prog/fr/tools/export.tmpl   |   2 +-
 .../opac-tmpl/prog/fr/includes/masthead.inc   |   8 +
 .../opac-tmpl/prog/fr/includes/navigation.inc |  22 --
 .../prog/fr/includes/opac-bottom.inc          |  18 +-
 koha-tmpl/opac-tmpl/prog/fr/includes/opac.css | 189 ++++++++++++------
 .../opac-tmpl/prog/fr/opac-advsearch.tmpl     |  34 ++--
 .../fr/opac-authoritiessearchresultlist.tmpl  |   2 +-
 koha-tmpl/opac-tmpl/prog/fr/opac-main.tmpl    |  31 +--
 19 files changed, 260 insertions(+), 154 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/admin/marctagstructure.tmpl
index 030e871792..f7f53ae34f 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/admin/marctagstructure.tmpl
@@ -66,6 +66,7 @@ return false;
 <!-- ------------------------------------------------------------------------ -->
     <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate">
+	<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
         <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
         <h2><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-modify-tag-p" -->Modifier le champ<!-- /TMPL_IF --><!-- TMPL_IF NAME="heading-add-tag-p" -->Ajouter un champ<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h2>
     <p><label>Champ</label><!-- TMPL_VAR NAME="searchfield" -->&nbsp;</p>
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/auth.tmpl
index 8ea1d8e37c..c1584be01a 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/auth.tmpl
@@ -53,4 +53,11 @@
 // ]]>
 </script>
 <!-- /TMPL_IF -->
+
+<script type="text/javascript">
+// <![CDATA[
+    document.getElementById('userid').focus(); // auto focus on login input when document is loaded.
+// ]]>
+</script>
+
 <!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/authorities/authorities.tmpl
index f4959e4536..5282d22d67 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/authorities/authorities.tmpl
@@ -54,13 +54,14 @@
     <!-- /TMPL_IF -->
     <div>
     <!-- TMPL_LOOP NAME="subfield_loop" -->
+        <p class="subfield">
         <!-- TMPL_IF NAME="visibility" -->
             <a tabindex="1" style="color: grey; font-size: 80%; cursor: se-resize;" id="label<!-- TMPL_VAR name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')">
                 <!-- TMPL_VAR NAME="subfield" -->
             </a>
         <!-- /TMPL_IF -->
-        <p class="subfield">
         <div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->">
+            <p>
             <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
                 <label <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield"> 
             <!-- /TMPL_UNLESS -->
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl
index 488641114f..a2a4e81059 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl
@@ -217,17 +217,17 @@
                                 <p>
                                     <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
                                         <a class="title" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                                            <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
-                                        </a>
+                                            <!-- TMPL_VAR NAME="title" -->
+                                        </a> <!-- TMPL_VAR NAME="subtitle" -->
                                     <!-- TMPL_ELSE -->
                                         <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
                                             <a class="title" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                                                <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
-                                            </a>
+                                                <!-- TMPL_VAR NAME="title" --> 
+                                            </a> <!-- TMPL_VAR NAME="subtitle" -->
                                         <!-- TMPL_ELSE -->
                                             <a class="title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                                                <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" -->
-                                            </a>
+                                                <!-- TMPL_VAR NAME="title" --> 
+                                            </a> <!-- TMPL_VAR NAME="subtitle" -->
                                         <!-- /TMPL_IF -->
                                     <!-- /TMPL_IF -->
                                 </p>
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/addbooks.tmpl
index 2b5db12a1b..29bbfe7645 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/addbooks.tmpl
@@ -49,15 +49,21 @@
 <!-- TMPL_VAR NAME="total"--> réponses trouvées dans le catalogue.
 <div class="searchresults">
     <table>
-    <tr>
-       <th>Titre</th>
-    </tr>
-    <!-- TMPL_LOOP NAME="resultsloop" -->
         <tr>
+            <th>Titre</th>
+            <th>Localisation</th>
+            <th>&nbsp;</th>
+        </tr>
+    <!-- TMPL_LOOP NAME="resultsloop" -->
+        <!-- TMPL_IF name="even" -->
+            <tr class="highlight">
+        <!-- TMPL_ELSE -->
+            <tr>
+        <!-- /TMPL_IF -->
             <td>
-                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+                <p>
                     <!-- TMPL_VAR NAME="title" -->
-                </a>
+                <!-- TMPL_VAR NAME="subtitle" -->
                 <!-- TMPL_IF name="summary" -->
                     <p><!-- TMPL_VAR name="summary" --></p>
                 <!-- TMPL_ELSE -->
@@ -76,7 +82,36 @@
                         <!-- TMPL_IF name="timestamp" --> <i>(modifié le <!-- TMPL_VAR name="timestamp" -->)</i><!-- /TMPL_IF -->
                     </p>
                 <!-- /TMPL_IF -->
-</tr>
+                </td>
+                <td>
+                    <!-- TMPL_IF NAME="items_loop" -->
+                        <span class="available">
+                        <!-- TMPL_LOOP NAME="items_loop" -->
+                            <!-- TMPL_VAR NAME="count" --> <!-- TMPL_VAR NAME="branchname" -->
+                            <i>
+                        <!-- TMPL_IF name="location" --><!-- TMPL_VAR name="location" --><!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="itemcallnumber" --><!-- TMPL_VAR name="itemcallnumber" --><!-- /TMPL_IF -->
+                            <!-- TMPL_IF name="classification" -->
+                            <a href="/cgi-bin/koha/catalogue/search.pl?q=callnum:<!-- TMPL_VAR NAME="classification" ESCAPE="URL" -->">
+                                <!-- TMPL_VAR NAME="classification" -->
+                            </a>
+                        <!-- /TMPL_IF -->
+                        </i>
+                            <br />
+                        <!-- /TMPL_LOOP -->
+                        </span>
+                    <!-- /TMPL_IF -->
+                    <span class="unavailable">
+                        <!-- TMPL_IF NAME="onloancount" --> En prêt (<!-- TMPL_VAR NAME="onloancount" -->)<br /> <!-- /TMPL_IF -->
+                        <!-- TMPL_IF NAME="wthdrawncount" --> Exemplaire retiré (<!-- TMPL_VAR NAME="wthdrawncount" -->),<br /> <!-- /TMPL_IF -->
+                        <!-- TMPL_IF NAME="itemlostcount" --> Perdu (<!-- TMPL_VAR NAME="itemlostcount" -->)<br /><!-- /TMPL_IF -->
+                        <!-- TMPL_IF NAME="orderedcount" --> En commande (<!-- TMPL_VAR NAME="orderedcount" -->)<!-- /TMPL_IF -->
+                    </span>
+                </td>
+                <td>
+                    <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Editer notice</a>
+                </td>
+            </tr>
     <!-- /TMPL_LOOP -->
     </table>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/circ/transferstodo.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/circ/transferstodo.tmpl
index 4aa8f1770f..44d75cb451 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/circ/transferstodo.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/circ/transferstodo.tmpl
@@ -47,7 +47,7 @@
                     </td>
                     <td><p><!-- TMPL_VAR NAME="holdingbranch" --> <!-- TMPL_VAR NAME="itemcallnumber" --></p></td>
                     <td>
-                    <form name="dotransfer" action="waitingreservestransfers.pl" method="post">
+                    <form name="dotransfer" action="/cgi-bin/koha/circ/waitingreserves.pl" method="post">
                         <input type="hidden" name="itemnumber" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
                         <input type="hidden" name="fbr" value="<!-- TMPL_VAR NAME="holdingbranch" -->" />
                         <input type="hidden" name="tbr" value="<!-- TMPL_VAR NAME="branchcode" -->" />
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css b/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css
index 0e8892056d..9cab932f9d 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css
@@ -190,14 +190,22 @@ legend {
 #kohalogo {
     position:fixed;
     left:20px;
-    top:20px;
+    top:10px;
+}
+
+#kohalogo h3 {
+    padding-top:5px;
+    margin-left:0px;
+}
+#kohalogo h3 a {
+    color:white;
 }
 /* MAIN MENU STYLES */
 #mainmenu {
     display:block;
     position:fixed;
     font-weight : normal;
-    margin-top:20px;
+    margin-top:30px;
     margin-right: 5px;
     padding-right: 5px;
     font-size:0.9em;
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/menus.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/menus.inc
index 2ddd5f18fa..29985a3e3d 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/menus.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/menus.inc
@@ -1,11 +1,12 @@
 <div id="kohalogo">
     <img src="/intranet-tmpl/prog/images/koha-logo.png" height="60px"/>
+    <h3><a href="/cgi-bin/koha/mainpage.pl">Client Koha bibliothécaire</a></h3>
 </div>
 <div id="onlinehelp">
     <a href="#" onclick="javascript:window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes');">[?]</a>
 </div>
 <div id="mainmenu">
-<h3><a href="/cgi-bin/koha/mainpage.pl">Client Koha bibliothécaire</a></h3>
+
     <!-- TMPL_IF NAME="CAN_user_circulate" -->
     <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
     <ul>
@@ -56,13 +57,11 @@
         <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Ajout notice MARC</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Autorités</a></li>
         <li><a href="/cgi-bin/koha/serials/serials-home.pl">Périodiques</a></li>
-        <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
     </ul>
+    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
     <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_catalogue" -->
-    <ul>
-    <li><a href="/cgi-bin/koha/reports/reports-home.pl">Bilans et statistiques</a></li>
-    </ul>
+    <!-- TMPL_IF NAME="CAN_user_reports" -->
+        <a href="/cgi-bin/koha/reports/reports-home.pl">Bilans et statistiques</a></li>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="CAN_user_parameters" -->
     <a href="/cgi-bin/koha/admin/admin-home.pl">Administration Koha</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/serials/claims.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/serials/claims.tmpl
index 6510cc634f..4e086f20ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/serials/claims.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/serials/claims.tmpl
@@ -99,7 +99,7 @@ function Setorder(myorder){
 			<!-- /TMPL_LOOP -->
 		</table>
 		<!-- TMPL_ELSE -->
-		<p>Select a supplier</p>
+		<p>Sélectionnez un fournisseur</p>
 		<!-- /TMPL_IF -->
 
 	<!-- TMPL_IF Name="singlesupplier"-->
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl
index 800ce47f30..2ac841e438 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl
@@ -268,7 +268,7 @@ var textbox = '';
             }
             textbox +="<\/tr>";
         } else {
-          textbox +="<tr> <td>"+_('numéros(s) attendu(s)')+"</td><td><input type='text' name='issuesexpectedtemp1' size='4' onkeyup='moreoptionsupdate(\"issuesexpected1\",0)'><br/><a href='javascript:irregularity_check()'>"+_('Irrégularité ? ')+"</a></td></tr>";
+          textbox +="<tr> <td>"+_('1er numéro attendu')+"</td><td><input type='text' name='issuesexpectedtemp1' size='4' onkeyup='moreoptionsupdate(\"issuesexpected1\",0)'><br/><a href='javascript:irregularity_check()'>"+_('Irrégularité ? ')+"</a></td></tr>";
         }
         textbox +="<\/table>\n";
     }
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-renew.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-renew.tmpl
index 145c7d5bc7..22c2adc494 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-renew.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-renew.tmpl
@@ -1,4 +1,9 @@
-<!-- TMPL_INCLUDE NAME="popup-top.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha &rsaquo;  Renouveller l'abonnement #<!-- TMPL_VAR name="subscriptionid" --></title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_INCLUDE NAME="menus.inc" -->
+<!--TMPL_INCLUDE NAME="menu-serials.inc" -->
 <div id="mainbloc">
 
 <h1 class="serial">renouvellement d'abonnement pour <!-- TMPL_VAR name="bibliotitle" --></h1>
diff --git a/koha-tmpl/intranet-tmpl/prog/fr/tools/export.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/tools/export.tmpl
index e1b448ccd1..e0ff989e74 100644
--- a/koha-tmpl/intranet-tmpl/prog/fr/tools/export.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/tools/export.tmpl
@@ -7,7 +7,7 @@
 
 <h1>Sélectionnez les notices à exporter : </h1>
 <p>
-    <b>Note : The items are exported by this tool unless specified.</b>
+    <b>Remarque : les exemplaires sont exportés par cet outil, sauf si vous les excluez.</b>
 </p>
 
 <form method="post" action="/cgi-bin/koha/tools/export.pl">
diff --git a/koha-tmpl/opac-tmpl/prog/fr/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/fr/includes/masthead.inc
index 65f0e09a7c..f22c356382 100644
--- a/koha-tmpl/opac-tmpl/prog/fr/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/fr/includes/masthead.inc
@@ -9,3 +9,11 @@
 <div id="masthead">
         <!-- TMPL_VAR NAME="LibraryName" -->
 </div>
+<div id="opac-main-search">
+    <label for="masthead_search">Rechercher</label>
+    <form name="searchform" method="POST" action="/cgi-bin/koha/opac-search.pl" id="searchform">
+        <input type="text" name="q" style="width: 30%;"/>
+        <input type="submit" value="Rechercher" class="submit">
+    </form>
+    <a href="/cgi-bin/koha/opac-search.pl">plus d'options de recherche</a>
+</div>
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/fr/includes/navigation.inc b/koha-tmpl/opac-tmpl/prog/fr/includes/navigation.inc
index c9122ed87f..968a4307b7 100644
--- a/koha-tmpl/opac-tmpl/prog/fr/includes/navigation.inc
+++ b/koha-tmpl/opac-tmpl/prog/fr/includes/navigation.inc
@@ -31,28 +31,6 @@
                 <!-- /TMPL_IF -->
             <!-- /TMPL_IF -->
         </ul>
-        <br />
-    <div id="login">
-        <!-- TMPL_IF NAME="loggedinusername" -->
-            <a href="/cgi-bin/koha/opac-user.pl"><b>Info utilisateur</b></a>
-            <li>Connecté en tant que <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b></li>
-            <li><a href="/cgi-bin/koha/opac-logout.pl?logout=Log Out">Déconnexion</a></li>
-        <!-- TMPL_ELSE -->
-            <form action="/cgi-bin/koha/opac-user.pl" method="POST" name="auth" id="auth">
-                <li>
-                    <label for="userid">Utilisateur</label>
-                    <input type="text" id="userid" size="10" name="userid" />
-                </li>
-                <li>
-                    <label for="password">Mot de passe </label>
-                    <input type="password" id="password" size="10" name="password" />
-                </li>
-                <li>
-                    <input type="submit" value="Se connecter" class="submit">
-                </li>
-                </form>
-        <!-- /TMPL_IF -->
-    </div>
  </div>
 
  <div id="main"> <!-- MAIN Body start here -->
diff --git a/koha-tmpl/opac-tmpl/prog/fr/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/prog/fr/includes/opac-bottom.inc
index ccb00ad69f..717e48c7b9 100644
--- a/koha-tmpl/opac-tmpl/prog/fr/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/prog/fr/includes/opac-bottom.inc
@@ -1,5 +1,21 @@
 </div>
-
+<div id="login">
+    <!-- TMPL_IF NAME="loggedinusername" -->
+        <a href="/cgi-bin/koha/opac-user.pl"><b>Info utilisateur</b></a>
+        <p>Connecté en tant que <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b></p>
+        <p><a href="/cgi-bin/koha/opac-logout.pl?logout=Log Out">Déconnexion</a></p>
+    <!-- TMPL_ELSE -->
+        <form action="/cgi-bin/koha/opac-user.pl" method="POST" name="auth" id="auth">
+            <p>Utilisateur</p>
+            <input type="text" id="userid" size="10" name="userid" />
+            <p>Mot de passe</p>
+            <input type="password" id="password" size="10" name="password" />
+            <p>
+                <input type="submit" value="Se connecter" class="submit">
+            </p>
+            </form>
+    <!-- /TMPL_IF -->
+</div>
 <!-- TMPL_IF NAME="opaccredits" -->
     <div id="footer">
         <!-- TMPL_VAR NAME="opaccredits" -->
diff --git a/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css b/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css
index 31971097cd..bed3eecef6 100644
--- a/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css
@@ -1,8 +1,14 @@
 /* color scheme :
+- #6699CC smooth blue for buttons background
+- #FFFFCC smooth yellow for button text
+- grey (
+
+- #990033 (red) for hovered links
 - #384b73 : light blue, for menus, text enhancement, footer & header
+
 - #eeeeee : light grey, for background color
 - #CCCCCC : for table backgrounds
-- #EEC95A : orange for action buttons & hyperlinks
+- #6BA037 : green for action buttons
 */
 
 /* attribute for standard html tags */
@@ -10,7 +16,7 @@
 body {
     font-family : Verdana, Geneva, Arial, sans-serif;
     font-size : 1em;
-    background-color : #eeeeee;
+    background-color : white;
     text-align: left;
     margin-bottom:0px;
 }
@@ -22,6 +28,14 @@ h1 {
     text-align:left;
 }
 
+h2 {
+    color:#384b73;
+}
+
+h3 {
+    color:#384b73;
+}
+
 p {
     margin:0px;
     padding:0px;
@@ -29,12 +43,12 @@ p {
 }
 
 label {
-    font-style:italic;
     vertical-align:top;
     display:block;
     float:left;
-    width:10em;
     margin-right:0.2em;
+    width:10em;
+    font-size:0.8em;
 }
 
 a:link, a:visited, a:active {
@@ -44,12 +58,14 @@ a:link, a:visited, a:active {
 
 a:hover {
     text-decoration : none;
-    background-color : #EEC95A;
+    color: #990033;
+
 }
 
 fieldset {
     display:inline;
     border: 1px solid #384b73;
+    background-color:#F9F9FF;
 }
 
 table {
@@ -71,8 +87,11 @@ td,th {
 }
 
 th {
-    background-color: #384b73;
-    color:white;
+    background:url( /opac-tmpl/prog/images/member-menu-background.gif);
+    background-repeat:repeat-x;
+    background-color:#ADC4E2;
+    color:#096C9D;
+    font-size:0.8em;
     border : 1px solid #CCCCCC;
     border-right: 1px solid #CCCCCC;
 }
@@ -82,10 +101,11 @@ th[scope=row] {
 }
 
 input[type=submit], input[type=button], input[type=reset] {
-    background-color : #EEC95A;
+    background-color : #6BA037;
     color : #FFFFFF;
-    font-size : 1em;
+    font-size : 0.8em;
     font-weight : bold;
+    border: 1px outset #666666;
 }
 
 li {
@@ -115,7 +135,7 @@ p.searchresults {
     color : #006699;
 }
 .searchresults table tr:hover {
-    background-color: #CCFFFF;
+    background-color: #FFFFCC;
 }
 tr.highlight td, tr.highlight th {
     background-color : #EEEEEE;
@@ -125,21 +145,24 @@ tr.highlight td, tr.highlight th {
 
 /* the top part of the opac : (the LibraryName) */
 #masthead {
-    color:#384b73;
+    color: #000066;
     margin-left:15%;
     text-align:left;
     font-size:150%;
     font-weight:bold;
-    margin-bottom:25px;
+    margin-bottom:5px;
 }
 
 /* The image on the top-left (the logo) */
 #masthead-image {
-    position:fixed;
-    padding-left:0px;
-    padding-top:0px;
+    position:absolute;
+    left:10px;
+    top:10px;
+    background-color:white;
 }
+
 #masthead-image img {
+    background-color:white;
 }
 
 /* the itemtype list in advanced search */
@@ -148,31 +171,39 @@ tr.highlight td, tr.highlight th {
     border-spacing: 3px;
     border : 0px;
     margin : 0px;
+    background-color: white;
+    border: 0px solid #D8DEB8;
+}
 }
 #advsearch-itemtype table tr td {
-    background-color:#CCCCCC;
+    background-color: #F8F8EB;
     border : 0px;
     margin : 0px;
     width:700px;
 }
-#advsearch-itemtype table tr td p {
+#advsearch-itemtype td {
     font-size:0.8em;
+    background-color:#F8F8EB;
 }
 
 /* the content part of every page */
 #main {
-    margin-left:25%;
+    margin-left:15%;
     margin-bottom:0px;
 }
 
-/* the main menu (home, adv search, login...) */
+/* the main menu (home, adv search) */
+
 #menu {
-    position:fixed;
-    margin-top:100px;
-    border-right:1px solid black;
-    padding:0px;
+    position:absolute;
+    padding:10px;
+    left:0px;
+    top:100px;
+    width:12%;
     font-size:0.8em;
+    font-weight:bold;
     color:#384b73;
+    background-color:#dddddd;
 }
 #menu ul a {
     display:block;
@@ -181,56 +212,70 @@ tr.highlight td, tr.highlight th {
     text-decoration:none;
     color:#384b73;
     white-space: nowrap;
+    margin:0px;
+    padding:0px;
 }
 #menu ul a:hover {
     display:block;
-    margin:5px 5px 0px 5px;
-    padding :5px 5px 0px 5px;
+    margin:0;
+    padding :0;
     text-decoration:none;
-    background-color:#384b73;
-    color:white;
+    color:#990033;
     white-space: nowrap;
 }
 #menu ul {
     padding-left:0px;
-    margin-bottom:0px;
-    margin-top:0px;
+    margin:0;
+    padding-bottom:0px;
 }
 #menu li {
     list-style-type:none;
+    margin:0px;
+    padding-bottom:10px;
 }
-#menu label {
-    font-style:italic;
-    display:block;
-    float:left;
-    width:5em;
-}
 
+
+
+/***************/
+/* login block */
+/***************/
 #login {
-    font-size:0.9em;
+    position:absolute;
+    left:0px;
+    bottom:10px;
+    font-size:0.8em;
+    background-color : #dddddd;
+    padding:10px;
+    margin-right:84%;
+    width:12%;
 }
 #login input {
     font-size:0.8em;
 }
+#login label {
+    width:5em;
+}
+#login p {
+    margin:0px;
+}
+
+/***********************************************************/
 /* the user menu, for user option (and biblio detail view) */
+/***********************************************************/
 #usermenu {
     float:right;
 }
 #usermenu a {
-    background-color : #EEC95A;
+    background-color : #6BA037;
     color : #FFFFFF;
-    font-size : 1em;
-    border: 2px outset;
+    font-size : 0.8em;
     font-weight : bold;
-    margin:0px 5px 0px 0px;
-    padding:2px 5px 2px 5px;
-    text-decoration:none;
-    display: block;
-    white-space: nowrap;
+    border: 1px outset #666666;
+    display:block;
+    margin-bottom:3px;
 }
 #usermenu a:hover {
-    border: 2px inset;
-    background-color:#384b73;
+    border: 1px inset #666666;
 }
 
 /* the opac-news */
@@ -251,21 +296,21 @@ background-color:red;
 }
 
 /* action buttons */
+#action {
+    margin-top:15px;
+}
 #action a {
-    background-color : #EEC95A;
-    color : #FFFFFF;
-    font-size : 1em;
-    border: 2px outset;
+    background-color : #6699cc;
+    color : #eeeeee;
+    font-size : 0.8em;
     font-weight : bold;
-    margin:0px 5px 0px 0px;
-    padding-right:5px;
-    padding-left:5px;
-    text-decoration:none;
-    display: inline;
+    border: 1px outset #666666;
+    margin-right:5px;
+    padding:0 5px 0 5px;
 }
 #action a:hover {
-    border: 2px inset;
-    background-color:#CCCCCC;
+    color : white;
+    border: 1px inset;
 }
 
 #auth {
@@ -279,19 +324,21 @@ background-color:red;
     font-size:0.8em;
     margin:0px;
     background-color:#eeeeee;
-    border:1px solid #CCCCCC;
+    border:0px;
 }
 
 #facets dl {
     margin:0px;
+    border:1px solid #CCCCCC;
 }
 #facets dd {
     margin:0px;
 }
 #facets dt {
     font-weight:bold;
-    background-color:#EEC95A;
-    border:0px;
+    background-color:#6BA037;
+    border: 1px outset #666666;
+    color:white;
 }
 
 #facets li {
@@ -363,6 +410,28 @@ color:#384b73;
 /* style for search terms in catalogsearch */
 .term {
 background-color:lightyellow;
+color: #990033;
+}
+
+#opac-main-search {
+    background-image:url( /opac-tmpl/prog/images/menu-background.gif);
+    background-repeat:repeat-x;
+    background-color: #6699CC;
+    border-top: 1px solid #335599;
+    border-bottom: 1px solid #335599;
+    margin: 0 0 0 15%;
+    padding: 15px 0 15px 10px;
+    color:#FFFFCC;
+    font-weight:bold;
+}
+#opac-main-search a {
+    color:#FFFFCC;
+}
+#opac-main-search a:visited {
+    color:#FFFFCC;
+}
+#opac-main-search a:hover {
+    color:#FFFFFF;
 }
 
 #opac-main-search form {
diff --git a/koha-tmpl/opac-tmpl/prog/fr/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/fr/opac-advsearch.tmpl
index 5f81977d82..278977db72 100644
--- a/koha-tmpl/opac-tmpl/prog/fr/opac-advsearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/fr/opac-advsearch.tmpl
@@ -43,10 +43,18 @@
 
     <!-- BOOLEAN SEARCH OPTIONS -->
     <fieldset>
-    <legend>Rechercher par :</legend>
+    <legend>Rechercher :</legend>
     <!-- TMPL_LOOP NAME="search_boxes_loop" -->
     
-        <!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_IF NAME="search_boxes_label" --><p style="text-indent: 4.5em;"><!-- TMPL_ELSE --><p><!-- /TMPL_IF --><!-- TMPL_ELSE --><p><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="expanded_options" -->
+            <!-- TMPL_IF NAME="search_boxes_label" -->
+                <p style="text-indent: 4.5em;">
+            <!-- TMPL_ELSE -->
+                <p>
+            <!-- /TMPL_IF -->
+        <!-- TMPL_ELSE -->
+            <p>
+        <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="expanded_options" --><!-- TMPL_VAR NAME="left_content" --><!-- /TMPL_IF --> 
         <select name="idx">
             <option value="kw" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Mot de la notice</option>
@@ -84,19 +92,19 @@
         </select>
         <input type="text" size="30" name="q" title="Saisissez les termes de la recherche" value="">
         <!-- TMPL_IF NAME="expanded_options" -->
-            <!-- TMPL_IF NAME="scan_index" --><!-- TMPL_VAR NAME="scan_index" --><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="scan_index" --><input type='checkbox' name='scan' id='scan' value='1'/> Parcourir l'index<!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="add_field" --><a href="JavaScript:add_field();" id="ButtonPlus" title="Ajouter un autre champ">[+]</a><!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
     </fieldset>
 <!-- /BOOLEAN SEARCH OPTIONS -->
     <div id="advsearch-itemtype">
-    <h2>Itemtype limit to any of the following:</h2>
+    <h3>Limiter le type de document à :</h3>
     <table>
         <tr>
       <!--TMPL_LOOP Name="itemtypeloop"-->
         <td><p>
-        <!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF --><input type="checkbox" id="mt-<!--TMPL_VAR Name="number" -->" name="limit" value="mt:<!--TMPL_VAR Name="code" -->"/>&nbsp;
+        <input type="checkbox" id="mt-<!--TMPL_VAR Name="number" -->" name="limit" value="mt:<!--TMPL_VAR Name="code" -->"/><!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF -->&nbsp;
         <!--TMPL_VAR Name="description" --></p></td>
         <!-- TMPL_UNLESS name="count5" --></tr><tr><!-- /TMPL_UNLESS -->
       <!--/TMPL_LOOP-->
@@ -107,8 +115,8 @@
     <!-- BASIC LIMITS -->
     <!--TMPL_IF Name="usmarc"-->
         <fieldset>
-        <legend>Limiter le type à : sélectionner ci-dessous</legend>
-        <table class="itemtypes">
+            <legend>Limiter le type à : sélectionner ci-dessous</legend>
+            <table class="itemtypes">
                 <tr>
                     <td><input type="checkbox" id="mc-bks" name="limit" value="mc:t"/><label for="mc-bks" title="Livres, pamphlets, rapports techniques, manuscrits, Textes de lois, Mémoires et thèses"><img border="0" src="/intranet-tmpl/prog/en/images/AF.gif" alt="Livres">Livres</label></td>
                     <td><input type="checkbox" id="mc-vis" name="limit" value="mc:v"/><label for="mc-vis" title="Films, Enregistrements vidéos, Film fixe, Diapositives, Transparents, Photos, Cartes, Graphiques, Dessins"><img border="0" src="/intranet-tmpl/prog/en/images/AV Aids.gif" alt="Documents visuels">Documents visuels</label></td>
@@ -127,9 +135,9 @@
                 </tr>
                 
                 </table>
-    </fieldset>
-    <!-- /TYPE LIMITS -->
-    <div id="sidebar">
+        </fieldset>
+        <!-- /TYPE LIMITS -->
+        <div id="sidebar">
         <!-- SUBTYPE LIMITS -->
             <fieldset>
             <legend>Limites secondaires</legend><p>
@@ -196,8 +204,8 @@
     </fieldset>
     <!--/TMPL_IF -->
     <!--TMPL_IF Name="UNIMARC" -->
-    <div id="sidebar">
-    <!-- SUBTYPE LIMITS -->
+        <div id="sidebar">
+        <!-- SUBTYPE LIMITS -->
             <fieldset>
             <legend>Critères annexes</legend>
             <p>
@@ -399,8 +407,8 @@
                 <option value="Graphics-support:z">Autres</option>
             </select>
             </p>
-    
     </fieldset>
+    </div>
     <!--/TMPL_IF-->
 <!--/TMPL_IF-->
 <!-- AVAILABILITY LIMITS -->
diff --git a/koha-tmpl/opac-tmpl/prog/fr/opac-authoritiessearchresultlist.tmpl b/koha-tmpl/opac-tmpl/prog/fr/opac-authoritiessearchresultlist.tmpl
index 9fea0dfefd..54d1312f71 100644
--- a/koha-tmpl/opac-tmpl/prog/fr/opac-authoritiessearchresultlist.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/fr/opac-authoritiessearchresultlist.tmpl
@@ -38,7 +38,7 @@
 				<!-- TMPL_UNLESS name="isEDITORS" -->
 					<th width="10%">Notices bibliographiques</th>
 				<!-- /TMPL_UNLESS -->
-				<th width="10%">Vedettes autorisées complètes</th>				
+				<th width="10%">Vedette entière</th>				
 			</tr>
 			<!-- TMPL_LOOP NAME="result" -->
 				<tr>
diff --git a/koha-tmpl/opac-tmpl/prog/fr/opac-main.tmpl b/koha-tmpl/opac-tmpl/prog/fr/opac-main.tmpl
index ddc20b2878..794d512713 100644
--- a/koha-tmpl/opac-tmpl/prog/fr/opac-main.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/fr/opac-main.tmpl
@@ -22,35 +22,6 @@
 </div>
 <!-- /TMPL_IF -->
 
-<div id="opac-main-search">
-<h1>Chercher dans notre catalogue</h1>
-    <ul><li>
-    <label for="masthead_search">Chercher dans le catalogue</label>
-    <form name="searchform" method="POST" action="/cgi-bin/koha/opac-search.pl" id="searchform">
-        <input type="text" name="q" style="width: 30%;"/>
-        <input type="submit" value="Rechercher" class="submit">
-    </form>
-    <i>(<a href="/cgi-bin/koha/opac-search.pl">Recherche avancée</a>)</i>
-    </li>
-    <!-- TMPL_IF name="OpacBrowser" -->
-        <li><a href="/cgi-bin/koha/opac-browser.pl">Feuilleter le catalogue</a>, grâce à une hiérarchie de sujets</li>
-    <!-- /TMPL_IF -->
-    <!-- TMPL_IF name="OpacAuthorities" -->
-        <li>Rechercher dans les <a href="/cgi-bin/koha/opac-authorities-home.pl">autorités</a></li>
-    <!-- /TMPL_IF -->
-    <!-- TMPL_IF name="OpacCloud" -->
-        <li>Chercher dans le <a href="/cgi-bin/koha/opac-tags_subject.pl">nuage de sujets</a></li>
-    <!-- /TMPL_IF -->
-        <li>
-            <form name="recent-acqui" action="/cgi-bin/koha/opac-main.pl" method="POST">
-                <label for="recentacqui">Trouver les derniers</label>
-                <input id="recentacqui" type="text" name="recentacqui" value="30" size="3"/> Acquisitions
-                <input type="submit" value=" OK " />
-            </form>
-        </li>
-    </ul>
-</div>
-
 <!-- TMPL_IF NAME="languages" -->
 <div id="opac-main-changelanguage">
     <h1>Changer la langue</h1>
@@ -64,7 +35,7 @@
                 </option>
             <!-- /TMPL_LOOP -->
         </select>
-        <input type="submit" value="Change" />
+        <input type="submit" value="Changer">
     </form>
     </ul>
 </div>
-- 
2.39.5