cleaning duplicate entries in top menus & fixing a bug in "branch" index (zebra)...

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc
index f3488bf..0a53694 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc
@@ -1,5 +1,4 @@
 <div id="submenu">
-    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Main page</a>
     <a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Add supplier</a>
     <a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a>
     <a href="/cgi-bin/koha/acqui/histsearch.pl">History search</a>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
index 71fc1e2..1f245e5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
@@ -1,22 +1,15 @@
 <div id="submenu">
     <p>
-        <a href="/cgi-bin/koha/admin/systempreferences.pl">System pref</a>
         <a href="/cgi-bin/koha/admin/branches.pl">Branches</a>
         <a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds</a>
-        <a href="/cgi-bin/koha/admin/currency.pl">Currencies</a>
-    </p>
-    <p>
         <a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a>
         <a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a>
         <a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a>
-        <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a>
     </p>
     <p>
         <a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio Framework</a>
         <a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Framework</a>
         <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a>
-        <a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links Koha-MARC DB</a>
-        <a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a>
     </p>
 </div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc
index 321646b..ce1d962 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc
@@ -1,9 +1,4 @@
 <div id="submenu">
-    <a href="/cgi-bin/koha/catalogue/search.pl">Search</a>
-    <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a>
-    <a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC record</a>
-    <a href="/cgi-bin/koha/serials/serials-home.pl">Subscriptions</a>
-    <a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a>
     <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Manage reviews</a>
 </div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
index d2a6d43..0a79b39 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
@@ -1,7 +1,4 @@
 <div id="submenu">
-    <a href="/cgi-bin/koha/circ/circulation.pl">Issues</a>
-    <a href="/cgi-bin/koha/circ/returns.pl">Returns</a>
-    <a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a>
     <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set branch</a>
     <a href="/cgi-bin/koha/circ/pendingreserves.pl" title="reserves waiting to have an item affected">Pending reserves</a>
     <a href="/cgi-bin/koha/circ/waitingreserves.pl" title="reserves waiting for member pickup">Waiting reserves</a>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
index c097e4a..cffe6b3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
@@ -1,9 +1,8 @@
 <div id="submenu">
-       <a href="/cgi-bin/koha/members/members-home.pl">Borrowers</a>
-       <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A">Add adult</a>
-       <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C">Add child</a>
-       <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P">Add professional</a>
-       <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Add organisation</a>
+    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A">Add adult</a>
+    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C">Add child</a>
+    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P">Add professional</a>
+    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Add organisation</a>
 </div>
 
 <div id="main">

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/authorities/authorities.tmpl
index 9dcb0a5..f4959e4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/authorities/authorities.tmpl
@@ -1,15 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-Koha -- Détails autorité
+<Title>Koha -- Détails autorité</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-authorities.inc" -->
 
-<fieldset id="authorities_authorities_add_or_modify">
+<div id="authorities_authorities_add_or_modify">
 <!-- TMPL_IF name="authid" -->
-  <legend>Modifier autorité N°<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</legend>
+  <h1>Modifier autorité N°<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR name="authtypetext" -->)</h1>
 <!-- TMPL_ELSE -->
-  <legend>Ajout autorité (<!-- TMPL_VAR name="authtypetext" -->)</legend>
+  <h1>Ajout autorité (<!-- TMPL_VAR name="authtypetext" -->)</h1>
 <!-- /TMPL_IF -->  
   <form method="post" name="f">
     <input type="hidden" name="op" value="add">
@@ -38,30 +38,57 @@ Koha -- Détails autorité
 <!-- /TMPL_IF -->
 
 <!-- TMPL_LOOP NAME="0XX" -->
-<!-- TMPL_IF name="tag" -->
-<p class="MARCtag">
-       <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
-       <!-- TMPL_UNLESS name="hide_marc" --><a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a> <input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffffff;'" type="text" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> -
-<!-- TMPL_ELSE -->
-<input tabindex="1" type="hidden" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->"><!-- /TMPL_UNLESS -->
-       <!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR NAME="tag_lib" --><!-- /TMPL_UNLESS -->
-    <!-- TMPL_IF name="repeatable" --><a href="#<!-- TMPL_VAR NAME="tag" -->" onclick="javascript:this.nextSibling.type='text';this.nextSibling.focus()">+</a><input type="hidden"  value="" size="2" onchange="AddField('<!-- TMPL_VAR NAME="tag" -->',this.value)" ><!-- /TMPL_IF -->
-</p>
-<!-- /TMPL_IF -->
-<div><!-- TMPL_LOOP NAME="subfield_loop" -->
-<!-- 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 -->
-<div style="<!-- TMPL_VAR NAME='visibility' -->;" id="subfield<!-- TMPL_VAR NAME='tag' --><!-- TMPL_VAR NAME='index' -->"><!-- TMPL_UNLESS NAME="advancedMARCEditor" --><label <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield"> <!-- /TMPL_UNLESS --><!-- TMPL_UNLESS name="hide_marc" --><img <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/><input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
-<!-- TMPL_ELSE --><input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->"/><!-- /TMPL_UNLESS -->
-<!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF --><!-- TMPL_VAR NAME="marc_lib" --><!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF --></label><!-- /TMPL_UNLESS -->
-<!-- TMPL_VAR NAME="marc_value" --><!-- TMPL_IF NAME="repeatable" --><a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a><!-- /TMPL_IF -->
-<input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
-<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
-<input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
-<input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->"/>
-<input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
-</div><!-- /TMPL_LOOP --></div>
+    <!-- TMPL_IF name="tag" -->
+        <p class="tag">
+            <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
+            <!-- TMPL_UNLESS name="hide_marc" -->
+                <a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR NAME="tag" --></a> <input tabindex="1" onblur="this.style.backgroundColor='#ffffff';" onfocus="this.style.backgroundColor='#ffffff;'" type="text" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat"> -
+            <!-- TMPL_ELSE -->
+                <input tabindex="1" type="hidden" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator" value="<!-- TMPL_VAR NAME="indicator" -->">
+            <!-- /TMPL_UNLESS -->
+            <!-- TMPL_UNLESS NAME="advancedMARCEditor" --><!-- TMPL_VAR NAME="tag_lib" --><!-- /TMPL_UNLESS -->
+            <!-- TMPL_IF name="repeatable" -->
+                <a href="#<!-- TMPL_VAR NAME="tag" -->" onclick="javascript:this.nextSibling.type='text';this.nextSibling.focus()">+</a><input type="hidden"  value="" size="2" onchange="AddField('<!-- TMPL_VAR NAME="tag" -->',this.value)" >
+            <!-- /TMPL_IF -->
+        </p>
+    <!-- /TMPL_IF -->
+    <div>
+    <!-- TMPL_LOOP NAME="subfield_loop" -->
+        <!-- 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' -->">
+            <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
+                <label <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> class="labelsubfield"> 
+            <!-- /TMPL_UNLESS -->
+            <!-- TMPL_UNLESS name="hide_marc" -->
+                    <img <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')"/>
+                    <input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->" style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF -->border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
+                <!-- TMPL_ELSE -->
+                    <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->"/>
+                <!-- /TMPL_UNLESS -->
+                <!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
+                    <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
+                    <!-- TMPL_VAR NAME="marc_lib" -->
+                    <!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
+                    </label>
+                <!-- /TMPL_UNLESS -->
+                    <!-- TMPL_VAR NAME="marc_value" -->
+                    <!-- TMPL_IF NAME="repeatable" -->
+                        <a style="cursor: crosshair; color: grey; font-size: 80%;" onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR name="index" -->')">+</a>
+                    <!-- /TMPL_IF -->
+                    <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->"/>
+                    <input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR NAME="subfield" -->" size="2" maxlength="1"/>
+                    <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->"/>
+                    <input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->"/>
+                    <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->"/>
+                </p>
+        </div>
+    <!-- /TMPL_LOOP -->
+    </div>
 <!-- /TMPL_LOOP -->
 </div> 
                <div name="hidden" id="hidden" class="tab">

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/authorities/detail.tmpl
index 4aed667..0eccdca 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/authorities/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/authorities/detail.tmpl
@@ -74,7 +74,7 @@ function showChildren(mynumber) {
 <div id="authorities_detail_details">
 <!-- TMPL_LOOP NAME="0XX" -->
                 <!-- TMPL_IF name="tag" -->
-                    <p>
+                    <p class="tag">
                         <!-- TMPL_VAR NAME="tag" -->
                     </p>
                 <!-- TMPL_ELSE -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/catalogue/MARCdetail.tmpl
index 4e2f8fb..03895d7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/catalogue/MARCdetail.tmpl
@@ -82,7 +82,7 @@
     <div id="1XX" class="content_hidden">
         <!-- TMPL_LOOP NAME="1XX" -->
                 <!-- TMPL_IF name="tag" -->
-                    <p>
+                    <p class="tag">
                         <!-- TMPL_VAR NAME="tag" -->
                     </p>
                 <!-- TMPL_ELSE -->
@@ -110,7 +110,7 @@
     <div id="2XX" class="content_hidden">
         <!-- TMPL_LOOP NAME="2XX" -->
                 <!-- TMPL_IF name="tag" -->
-                    <p>
+                    <p class="tag">
                         <!-- TMPL_VAR NAME="tag" -->
                     </p>
                 <!-- TMPL_ELSE -->
@@ -138,7 +138,7 @@
     <div id="3XX" class="content_hidden">
         <!-- TMPL_LOOP NAME="3XX" -->
                 <!-- TMPL_IF name="tag" -->
-                    <p>
+                    <p class="tag">
                         <!-- TMPL_VAR NAME="tag" -->
                     </p>
                 <!-- TMPL_ELSE -->
@@ -166,7 +166,7 @@
     <div id="4XX" class="content_hidden">
         <!-- TMPL_LOOP NAME="4XX" -->
                 <!-- TMPL_IF name="tag" -->
-                    <p>
+                    <p class="tag">
                         <!-- TMPL_VAR NAME="tag" -->
                     </p>
                 <!-- TMPL_ELSE -->
@@ -194,7 +194,7 @@
     <div  id="5XX" class="content_hidden">
         <!-- TMPL_LOOP NAME="5XX" -->
                 <!-- TMPL_IF name="tag" -->
-                    <p>
+                    <p class="tag">
                         <!-- TMPL_VAR NAME="tag" -->
                     </p>
                 <!-- TMPL_ELSE -->
@@ -222,7 +222,7 @@
     <div id="6XX" class="content_hidden">
         <!-- TMPL_LOOP NAME="6XX" -->
                 <!-- TMPL_IF name="tag" -->
-                    <p>
+                    <p class="tag">
                         <!-- TMPL_VAR NAME="tag" -->
                     </p>
                 <!-- TMPL_ELSE -->
@@ -250,7 +250,7 @@
     <div  id="7XX" class="content_hidden">
         <!-- TMPL_LOOP NAME="7XX" -->
                 <!-- TMPL_IF name="tag" -->
-                    <p>
+                    <p class="tag">
                         <!-- TMPL_VAR NAME="tag" -->
                     </p>
                 <!-- TMPL_ELSE -->
@@ -278,7 +278,7 @@
     <div id="8XX" class="content_hidden">
         <!-- TMPL_LOOP NAME="8XX" -->
                 <!-- TMPL_IF name="tag" -->
-                    <p>
+                    <p class="tag">
                         <!-- TMPL_VAR NAME="tag" -->
                     </p>
                 <!-- TMPL_ELSE -->
@@ -306,7 +306,7 @@
     <div id="9XX" class="content_hidden">
         <!-- TMPL_LOOP NAME="9XX" -->
                 <!-- TMPL_IF name="tag" -->
-                    <p>
+                    <p class="tag">
                         <!-- TMPL_VAR NAME="tag" -->
                     </p>
                 <!-- TMPL_ELSE -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl
index fee42f6..28329be 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl
@@ -251,19 +251,20 @@
                                     </p>
                                 <!-- /TMPL_IF -->
                                 </td>
-                                <td style="white-space: nowrap">
+                                <td>
                                     <!-- TMPL_IF NAME="items_loop" -->
                                         <span class="available">
                                         <!-- TMPL_LOOP NAME="items_loop" -->
-                                            <!-- <!-- TMPL_VAR NAME="branchcode" --> -->
-                                            <!-- TMPL_VAR NAME="branchname" --> (<!-- TMPL_VAR NAME="count" -->
-                                                <!-- TMPL_IF name="itemcallnumber" --> <i><!-- TMPL_VAR name="itemcallnumber" -->)</i><!-- /TMPL_IF -->
-                                         <!-- TMPL_IF name="location" --> <i>(<!-- TMPL_VAR name="location" -->)</i><!-- /TMPL_IF -->
+                                            <!-- 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>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css b/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css
index 2c04079..0e88920 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css
@@ -167,11 +167,12 @@ legend {
 }
 
 .available {
-    background-color: white;
+    font-size:0.75em;
 }
 
 .unavailable {
     background-color: #FFED3D;
+    font-size:0.75em;
 }
 
 .hasexpirated {

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css~ b/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css~
index 5244eab..2c04079 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css~
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css~
@@ -436,6 +436,7 @@ legend {
 #login {
     font-size:0.7em;
 }
+
 /* the design of the INactives tab buttons (all other tabs) */
 .tab_inactive {
     background-color : #6699CC;

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc
index 06c52d1..cbf43b3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc
@@ -1,5 +1,5 @@
 <div id="submenu">
-    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Accueil</a> <a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Ajout fournisseur</a> <a href="/cgi-bin/koha/acqui/lateorders.pl">Commandes en retard</a> <a href="/cgi-bin/koha/acqui/histsearch.pl">Recherche historique</a> <a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=aorr_confirm">Gestion suggestions</a> <a href="/cgi-bin/koha/admin/aqbookfund.pl">Paramètres</a>
+    <a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Add supplier</a>  <a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a>  <a href="/cgi-bin/koha/acqui/histsearch.pl">History search</a>  <a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=aorr_confirm">Manage suggestions</a>  <a href="/cgi-bin/koha/admin/aqbookfund.pl">Parameters</a>
 </div>
 
 <div id="main">

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc
index e215e2b..80498e4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc
@@ -1,12 +1,9 @@
 <div id="submenu">
     <p>
-        <a href="/cgi-bin/koha/admin/systempreferences.pl">Préférences systèmes</a> <a href="/cgi-bin/koha/admin/branches.pl">Sites</a> <a href="/cgi-bin/koha/admin/aqbookfund.pl">Postes budgétaires</a> <a href="/cgi-bin/koha/admin/currency.pl">Devises</a>
+        <a href="/cgi-bin/koha/admin/branches.pl">Branches</a>  <a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds</a>  <a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a>  <a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a>  <a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a>
     </p>
     <p>
-        <a href="/cgi-bin/koha/admin/itemtypes.pl">Types documents</a> <a href="/cgi-bin/koha/admin/categorie.pl">Catégories d'adhérent</a><a href="/cgi-bin/koha/admin/issuingrules.pl">Règles de prêt</a><a href="/cgi-bin/koha/admin/z3950servers.pl">Serveurs z3950</a>
-    </p>
-    <p>
-        <a href="/cgi-bin/koha/admin/biblio_framework.pl">Grilles catalogage</a> <a href="/cgi-bin/koha/admin/authtypes.pl">Grilles Autorités</a> <a href="/cgi-bin/koha/admin/authorised_values.pl">Valeurs autorisées</a> <a href="/cgi-bin/koha/admin/koha2marclinks.pl">Liens Koha-MARC DB</a><a href="/cgi-bin/koha/admin/checkmarc.pl">Vérification MARC</a>
+        <a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio Framework</a>  <a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Framework</a>  <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a>
     </p>
 </div>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc
index b47b4b1..ce1d962 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc
@@ -1,5 +1,5 @@
 <div id="submenu">
-    <a href="/cgi-bin/koha/catalogue/search.pl">Recherche</a> <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Catalogage </a> <a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Ajout notice MARC</a> <a href="/cgi-bin/koha/serials/serials-home.pl">Abonnements</a> <a href="/cgi-bin/koha/bookshelves/shelves.pl">Etagères virtuelles</a> <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Gestion des commentaires</a>
+    <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Manage reviews</a>
 </div>
 
 <div id="main">

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc
index c0531c4..5f382bb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc
@@ -1,5 +1,5 @@
 <div id="submenu">
-    <a href="/cgi-bin/koha/circ/circulation.pl">Prêts</a> <a href="/cgi-bin/koha/circ/returns.pl">Retours</a> <a href="/cgi-bin/koha/circ/branchtransfers.pl">Transferts</a> <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Choix du site</a> <a href="/cgi-bin/koha/circ/pendingreserves.pl" title="reserves waiting to have an item affected">Réservations à traiter</a> <a href="/cgi-bin/koha/circ/waitingreserves.pl" title="reserves waiting for member pickup">Réservations en attente</a> <a href="/cgi-bin/koha/circ/transferstodo.pl" title="transfers to do from your library">Transferts à faire</a> <a href="/cgi-bin/koha/circ/transferstoreceive.pl" title="transfers to receive at your library">Transfertsà recevoir</a> <a href="/cgi-bin/koha/circ/branchoverdues.pl">Retards</a> <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Etat de caisse (aujourd'hui)</a> 
+    <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set branch</a>  <a href="/cgi-bin/koha/circ/pendingreserves.pl" title="reserves waiting to have an item affected">Pending reserves</a>  <a href="/cgi-bin/koha/circ/waitingreserves.pl" title="reserves waiting for member pickup">Waiting reserves</a>  <a href="/cgi-bin/koha/circ/transferstodo.pl" title="transfers to do from your library">Transfers to do</a>  <a href="/cgi-bin/koha/circ/transferstoreceive.pl" title="transfers to receive at your library">Transfers to receive</a>  <a href="/cgi-bin/koha/circ/branchoverdues.pl">Overdues</a>  <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Daily reconciliation</a>
 </div>
 
 <div id="main">

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc
index f718dd5..e567d50 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc
+++ b/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc
@@ -1,5 +1,5 @@
 <div id="submenu">
-       <a href="/cgi-bin/koha/members/members-home.pl">Recherche</a> <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A">Inscription adulte</a><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C">Inscription enfant</a><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P">Inscription professionnel</a4><a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Inscription collectivité</a>
+    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A">Add adult</a>  <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C">Add child</a>  <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P">Add professional</a>  <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Add organisation</a>
 </div>
 
 <div id="main">

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/members/moremember.tmpl
index a9d947b..beb816d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/members/moremember.tmpl
@@ -194,6 +194,7 @@
     <table>
         <tr>
             <th scope="col">Titre</th>
+            <th scope="col">Code à barres</th>
             <th scope="col">Date de retour</th>
             <th scope="col">Type de document</th>
             <th scope="col">Frais</th>
@@ -212,13 +213,17 @@
         <tr>
             <!-- /TMPL_IF -->
           <!-- /TMPL_IF -->
+            <td><!-- TMPL_VAR NAME="date_due" --></td>
             <td>
-                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+                <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
                     <!-- TMPL_VAR NAME="title" -->
-                </a>
-                <!-- TMPL_VAR name="author" -->
+                </a></p>
+                <p><!-- TMPL_VAR name="author" -->
+                    <!-- TMPL_IF name="publishercode" --> - <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF -->
+                    <!-- TMPL_IF name="publicationyear" -->- <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
+                </p>
             </td>
-            <td><!-- TMPL_VAR NAME="date_due" --></td>
+            <td><!-- TMPL_VAR NAME="barcode" --></td>
             <td>
                 <!-- TMPL_VAR NAME="itemtype_description" -->
                 <!-- TMPL_IF NAME="itemtype_image" -->
@@ -255,9 +260,9 @@
         </tr>
         <!-- /tmpl_loop -->
         <tr>
-            <td colspan="3">Coût total de remplacement :</td>
+            <td colspan="5">Coût total de remplacement :</td>
             <td><!-- TMPL_VAR NAME="totalprice" --></td>
-            <td colspan="3">&nbsp;</td>
+            <td colspan="2">&nbsp;</td>
         </tr>
         </table>
         <div>

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/serials/serials-collection.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/serials/serials-collection.tmpl
index 91c3cbe..543d13d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/serials/serials-collection.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/serials/serials-collection.tmpl
@@ -7,7 +7,7 @@
 
 
 <script language="JavaScript" type="text/javascript">
-showlayer(<!-- TMPL_VAR NAME="yearmax"-->);
+showlayer('<!-- TMPL_VAR NAME="yearmax"-->');
 
 function showlayer(numlayer)
 {
@@ -164,9 +164,9 @@ function popup(link) {
     <!-- TMPL_LOOP NAME="years" -->
         <!-- TMPL_IF NAME="year" -->
         <!-- TMPL_IF NAME="first" -->
-            <a  id="link<!-- TMPL_VAR NAME="year" -->" class="tab_active" href="javascript:showlayer(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a>
+            <a  id="link<!-- TMPL_VAR NAME="year" -->" class="tab_active" href="javascript:showlayer('<!-- TMPL_VAR NAME="year" -->')"><!-- TMPL_VAR NAME="year" --></a>
         <!-- TMPL_ELSE -->
-            <a  id="link<!-- TMPL_VAR NAME="year" -->" class="tab_inactive" href="javascript:showlayer(<!-- TMPL_VAR NAME="year" -->)"><!-- TMPL_VAR NAME="year" --></a>
+            <a  id="link<!-- TMPL_VAR NAME="year" -->" class="tab_inactive" href="javascript:showlayer('<!-- TMPL_VAR NAME="year" -->')"><!-- TMPL_VAR NAME="year" --></a>
         <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/serials/serials-edit.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/serials/serials-edit.tmpl
index 5eca87c..c61bd0b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/serials/serials-edit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/serials/serials-edit.tmpl
@@ -57,7 +57,7 @@ Erreur : code à barres pas unique pour le périodique <!--TMPL_VAR Name="errser
             <input type="text" name="planneddate" value="<!-- TMPL_VAR name="planneddate" -->" size=10 maxlength=15>
         </td>
         <td>
-            <!--TMPL_IF Name="subscriptionexpired"-->
+            <!--TMPL_IF EXPR="subscriptionexpired and status1"-->
               <select name="status" size="1" id="status<!-- TMPL_VAR NAME="num" -->" disabled >
             <!--TMPL_ELSE-->
               <select name="status" size="1" id="status<!-- TMPL_VAR NAME="num" -->" OnChange="javascript:if (this.value==2){unHideItems('items'+<!-- TMPL_VAR NAME="subscriptionid" -->+<!-- TMPL_VAR NAME="serialid" -->,'label<!-- TMPL_VAR NAME="subscriptionid" --><!--TMPL_VAR Name="serialid"-->')}" >

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 8b2831f..76e93ab 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl
@@ -20,7 +20,7 @@
     function _(s) { return s } // dummy function for gettext
 
 // the english words used in display purposes
-var text = new Array(_('Numéro'),_('Volume'),_('Prêt'),_('Mois'),_('Semaine'),_('Commence par : '),_('Retour à : '),_('Choisir l'hémisphère : '),_('Nord'),_('Sud'),
+var text = new Array(_('Numéro'),_('Volume'),_('Prêt'),_('Mois'),_('Semaine'),_('Commence par : '),_('Retour à : '),_('Choisir hémisphère : '),_('Nord'),_('Sud'),
 _('Automne'),_('Hiver'),_('Printemps'),_('Été'),_('Automne'),_('Saison'),_('Année'));
 var is_season = 0;
 var is_hemisphere = 1;
@@ -1044,7 +1044,7 @@ function Check(f) {
             if(f.numbering_pattern.value == ''){
                 alert(_("Vous devez choisir une formule de numérotation"));
             } else {
-                alert(_("Vous devez vérifier les irrégularités en cliquant sur "Irrégularités?""));
+                alert(_("Vous devez vérifier les irrégularités en cliquant sur 'Irrégularités?'"));
             }
         }
     } else {

diff --git a/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css b/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css
index faa5c27..3197109 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css
@@ -146,10 +146,14 @@ tr.highlight td, tr.highlight th {
 #advsearch-itemtype table {
     border-collapse: separate;
     border-spacing: 3px;
+    border : 0px;
+    margin : 0px;
 }
 #advsearch-itemtype table tr td {
     background-color:#CCCCCC;
-    width:100%;
+    border : 0px;
+    margin : 0px;
+    width:700px;
 }
 #advsearch-itemtype table tr td p {
     font-size:0.8em;
@@ -348,11 +352,12 @@ color:#384b73;
 }
 
 .available {
-    background-color: white;
+    font-size:0.75em;
 }
 
 .unavailable {
     background-color: #FFED3D;
+    font-size:0.75em;
 }
 
 /* style for search terms in catalogsearch */

diff --git a/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css~ b/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css~
index 573abca..8db2687 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css~
+++ b/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css~
@@ -136,7 +136,7 @@ tr.highlight td, tr.highlight th {
 /* The image on the top-left (the logo) */
 #masthead-image {
     position:fixed;
-    padding-left:30px;
+    padding-left:0px;
     padding-top:0px;
 }
 #masthead-image img {
@@ -149,7 +149,9 @@ tr.highlight td, tr.highlight th {
 }
 #advsearch-itemtype table tr td {
     background-color:#CCCCCC;
-    width:100%;
+    border : 0px;
+    margin : 0px;
+    width:700px;
 }
 #advsearch-itemtype table tr td p {
     font-size:0.8em;
@@ -348,11 +350,12 @@ color:#384b73;
 }
 
 .available {
-    background-color: white;
+    font-size:0.75em;
 }
 
 .unavailable {
     background-color: #FFED3D;
+    font-size:0.75em;
 }
 
 /* style for search terms in catalogsearch */

diff --git a/koha-tmpl/opac-tmpl/prog/fr/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/fr/opac-ISBDdetail.tmpl
index 52ce7e8..10a5cff 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/fr/opac-ISBDdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/fr/opac-ISBDdetail.tmpl
@@ -4,26 +4,27 @@
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-    <div id="action">
-        <!-- TMPL_UNLESS NAME="norequests" -->
-               <!-- TMPL_IF NAME="RequestOnOpac" -->
-        <a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-            Faire une Réservation
+<div id="action">
+
+<!-- TMPL_UNLESS NAME="norequests" -->
+       <!-- TMPL_IF NAME="RequestOnOpac" -->
+               <a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+               Faire une Réservation
+               </a>
+       <!-- /TMPL_IF -->
+<!-- /TMPL_UNLESS -->
+        <a href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"> Vue MARC </a> <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"> ISBD</a> <a href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;"> Imprimer </a>
+<!-- TMPL_IF name="virtualshelves" -->
+    <!-- TMPL_IF NAME="loggedinusername" -->
+        <a href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+            Ajouter à mon étagère virtuelle
         </a>
-               <!-- /TMPL_IF -->
-        <!-- /TMPL_UNLESS -->
-        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Vue normale</a> <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a><a href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Imprimer</a>
-        <!-- TMPL_IF name="virtualshelves" -->
-            <!-- TMPL_IF NAME="loggedinusername" -->
-            <a href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
-                Ajouter à mon étagère virtuelle
-            </a>
-            <!-- /TMPL_IF -->
-        <!-- /TMPL_IF -->
+    <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
         <a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
             Ajouter à mon panier
         </a>
-    </div>
+</div>
     
     <h1>ISBD</h1>
     <!-- TMPL_VAR name="ISBD" -->

diff --git a/koha-tmpl/opac-tmpl/prog/fr/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/fr/opac-MARCdetail.tmpl
index 174c515..6c06790 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/fr/opac-MARCdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/fr/opac-MARCdetail.tmpl
@@ -5,22 +5,25 @@
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
 <div id="action">
-    <!-- TMPL_UNLESS NAME="norequests" -->
-       <!-- TMPL_IF NAME="RequestOnOpac" -->
-    <a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-        Faire une Réservation
-    </a>
-       <!-- /TMPL_IF -->
-    <!-- /TMPL_UNLESS -->
-    <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Vue normale</a> <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a><a href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Imprimer</a>
-    <!-- TMPL_IF name="virtualshelves" -->
-    <a href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
-        Ajouter à mon étagère virtuelle
-    </a>
+
+<!-- TMPL_UNLESS NAME="norequests" -->
+       <!-- TMPL_IF NAME="RequestOnOpac" -->
+               <a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+               Faire une Réservation
+               </a>
+       <!-- /TMPL_IF -->
+<!-- /TMPL_UNLESS -->
+        <a href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"> Vue MARC </a> <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"> ISBD</a> <a href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;"> Imprimer </a>
+<!-- TMPL_IF name="virtualshelves" -->
+    <!-- TMPL_IF NAME="loggedinusername" -->
+        <a href="/cgi-bin/koha/opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+            Ajouter à mon étagère virtuelle
+        </a>
     <!-- /TMPL_IF -->
-    <a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
-        Ajouter à mon panier
-    </a>
+<!-- /TMPL_IF -->
+        <a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+            Ajouter à mon panier
+        </a>
 </div>
 
 <h1>Vue MARC</h1>

diff --git a/koha-tmpl/opac-tmpl/prog/fr/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/fr/opac-advsearch.tmpl
index 473a9d6..5f81977 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/fr/opac-advsearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/fr/opac-advsearch.tmpl
@@ -79,8 +79,8 @@
             <option value="ti" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Titre</option>
             <!-- TMPL_IF NAME="expanded_options" -->
                 <option value="ti,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp;Expression Titre</option>
-                <option value="se" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp;Titre de collection</option>
             <!-- /TMPL_IF -->
+                <option value="se" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Titre de collections</option>
         </select>
         <input type="text" size="30" name="q" title="Saisissez les termes de la recherche" value="">
         <!-- TMPL_IF NAME="expanded_options" -->
@@ -90,17 +90,19 @@
     <!-- /TMPL_LOOP -->
     </fieldset>
 <!-- /BOOLEAN SEARCH OPTIONS -->
-<div id="advsearch-itemtype">
-<fieldset>
-<legend>Types de document : sélectionner les critères suivants </legend>
-    <table><tr>
-    <!--TMPL_LOOP Name="itemtypeloop"-->
-    <td><p><input type="checkbox" id="mt-<!--TMPL_VAR Name="number" -->" name="limit" value="mt:<!--TMPL_VAR Name="code" -->"/><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" /> <!--TMPL_VAR Name="description" --></p></td>
-    <!-- TMPL_UNLESS name="count5" --></tr><tr><!-- /TMPL_UNLESS -->
-    <!--/TMPL_LOOP-->
+    <div id="advsearch-itemtype">
+    <h2>Itemtype limit to any of the following:</h2>
+    <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;
+        <!--TMPL_VAR Name="description" --></p></td>
+        <!-- TMPL_UNLESS name="count5" --></tr><tr><!-- /TMPL_UNLESS -->
+      <!--/TMPL_LOOP-->
+      </tr>
     </table>
-    </fieldset>
-</div>
+    </div>
 <!-- TMPL_IF NAME="expanded_options" -->
     <!-- BASIC LIMITS -->
     <!--TMPL_IF Name="usmarc"-->

diff --git a/koha-tmpl/opac-tmpl/prog/fr/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/fr/opac-results.tmpl
index 88bea70..3d6c014 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/fr/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/fr/opac-results.tmpl
@@ -225,8 +225,8 @@ Erreur :
                             <!-- TMPL_ELSE -->
                             &nbsp;
                             <!-- /TMPL_IF -->
-                            <!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
                             <!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
+                            <!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
                             <!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
                             <!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
                             <!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
@@ -240,11 +240,15 @@ Erreur :
                         <span class="available">
                             <!-- TMPL_LOOP NAME="items_loop" -->
                                 <!-- TMPL_VAR NAME="count" --> <!-- TMPL_VAR NAME="branchname" -->
-                                <!-- TMPL_IF name="itemcallnumber" --> <i>(<!-- TMPL_VAR name="itemcallnumber" -->)</i><!-- /TMPL_IF -->
-                                <!-- TMPL_IF name="location" --> <i>(<!-- TMPL_VAR name="location" -->)</i><!-- /TMPL_IF -->
+                                <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" -->
-                                    <i>(<a href="/cgi-bin/koha/opac-search.pl?q=callnum:<!-- TMPL_VAR NAME="classification" ESCAPE="URL" -->"> <!-- TMPL_VAR NAME="classification" --> </a>)</i>
+                                    <a href="/cgi-bin/koha/opac-search.pl?q=callnum:<!-- TMPL_VAR NAME="classification" ESCAPE="URL" -->">
+                                        <!-- TMPL_VAR NAME="classification" -->
+                                    </a>
                                 <!-- /TMPL_IF -->
+                                </i>
                                 <br />
                             <!-- /TMPL_LOOP -->
                         </span>

diff --git a/misc/zebra/bib1_biblios.att b/misc/zebra/bib1_biblios.att
index 04dff49..cb1155c 100644 (file)
--- a/misc/zebra/bib1_biblios.att
+++ b/misc/zebra/bib1_biblios.att
@@ -98,7 +98,7 @@ att 1028            Stock-number
 att 1030            Thematic-number
 att 1031            Material-type
 att 1032            Doc-id
-att 1033            Host-item
+att 1033            Branch
 att 1034            Content-type
 att 1035            Anywhere
 att 1036            Author-Title-Subject

diff --git a/misc/zebra/ccl.properties b/misc/zebra/ccl.properties
index bc01009..cfbc73b 100644 (file)
--- a/misc/zebra/ccl.properties
+++ b/misc/zebra/ccl.properties
@@ -184,7 +184,7 @@ au Author
 #                           number from a system not
 #                           specified elsewhere in this
 #                           list of attributes.
-Local-classification 1=20
+Local-classification 4=1 1=20
 lcn Local-classification
 callnum Local-classification
 #Local-classification cc callnum dewey

diff --git a/reserve/renewscript.pl b/reserve/renewscript.pl
index ba95040..26dea47 100755 (executable)
--- a/reserve/renewscript.pl
+++ b/reserve/renewscript.pl
@@ -48,9 +48,14 @@ my $borrowernumber = $input->param("borrowernumber");
 
 foreach my $itemno (@data) {
     #check status before renewing issue
+    warn "CanBookbeRenewed";
     if (CanBookBeRenewed($borrowernumber,$itemno)){
+       warn "$itemno can be renewed for $borrowernumber";
         AddRenewal($borrowernumber,$itemno);
-    }
+       warn "renewal added";
+    }else {
+       warn "cannot renew";
+       }
 }
 
 #