koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha circ/branchoverdues.pl koha-tmpl/intranet-...


From: paul poulain
Subject: [Koha-cvs] koha circ/branchoverdues.pl koha-tmpl/intranet-...
Date: Tue, 29 May 2007 16:36:14 +0000

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     paul poulain <tipaul>   07/05/29 16:36:14

Modified files:
        circ           : branchoverdues.pl 
        koha-tmpl/intranet-tmpl/prog/en/authorities: authorities.tmpl 
                                                     detail.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/catalogue: MARCdetail.tmpl 
                                                   results.tmpl 
        koha-tmpl/intranet-tmpl/prog/en/includes: intranet2.css 
        koha-tmpl/intranet-tmpl/prog/en/members: moremember.tmpl 
        koha-tmpl/opac-tmpl/prog/en: opac-ISBDdetail.tmpl 
                                     opac-MARCdetail.tmpl 
                                     opac-advsearch.tmpl 
        koha-tmpl/opac-tmpl/prog/en/includes: opac.css 
        misc/translator/po: prog_intranet_fr_FR.po 
        misc/zebra     : record_biblios_unimarc.abs 

Log message:
        some minor bugfixes, templates improvements & zebra default config file 
changes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchoverdues.pl?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/en/includes/opac.css?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/misc/translator/po/prog_intranet_fr_FR.po?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/misc/zebra/record_biblios_unimarc.abs?cvsroot=koha&r1=1.5&r2=1.6

Patches:
Index: circ/branchoverdues.pl
===================================================================
RCS file: /sources/koha/koha/circ/branchoverdues.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- circ/branchoverdues.pl      22 May 2007 08:56:46 -0000      1.9
+++ circ/branchoverdues.pl      29 May 2007 16:36:11 -0000      1.10
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: branchoverdues.pl,v 1.9 2007/05/22 08:56:46 hdl Exp $
+# $Id: branchoverdues.pl,v 1.10 2007/05/29 16:36:11 tipaul Exp $
 #
 # This file is part of Koha.
 #
@@ -104,7 +104,8 @@
 my $counter = 0;
 
 my @getoverdues = GetOverduesForBranch( $default, $location );
-
+use Data::Dumper;
+warn "HERE : $default / $location".Dumper(@getoverdues);
 # search for location authorised value
 my ($tag,$subfield) = GetMarcFromKohaField('items.location','');
 my $tagslib = &GetMarcStructure(1,'');

Index: koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl        9 Mar 
2007 14:47:38 -0000       1.5
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/authorities.tmpl        29 May 
2007 16:36:12 -0000      1.6
@@ -1,15 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-Koha -- Authority details
+<Title>Koha -- Authority details</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>Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR 
name="authtypetext" -->)</legend>
+  <h1>Modify authority #<!-- TMPL_VAR NAME="authid" --> (<!-- TMPL_VAR 
name="authtypetext" -->)</h1>
 <!-- TMPL_ELSE -->
-  <legend>Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</legend>
+  <h1>Adding authority (<!-- TMPL_VAR name="authtypetext" -->)</h1>
 <!-- /TMPL_IF -->  
   <form method="post" name="f">
     <input type="hidden" name="op" value="add">
@@ -38,31 +38,58 @@
 <!-- /TMPL_IF -->
 
 <!-- TMPL_LOOP NAME="0XX" -->
-<!-- TMPL_IF name="tag" -->
-<p class="MARCtag">
+    <!-- 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>
+            <!-- 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_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="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">

Index: koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl     11 Mar 2007 
21:08:12 -0000      1.5
+++ koha-tmpl/intranet-tmpl/prog/en/authorities/detail.tmpl     29 May 2007 
16:36:12 -0000      1.6
@@ -76,7 +76,7 @@
 <div id="authorities_detail_details">
 <!-- TMPL_LOOP NAME="0XX" -->
                 <!-- TMPL_IF name="tag" -->
-                    <p>
+                    <p class="tag">
                         <!-- TMPL_VAR NAME="tag" -->
                     </p>
                 <!-- TMPL_ELSE -->

Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl   21 May 2007 
08:44:18 -0000      1.7
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/MARCdetail.tmpl   29 May 2007 
16:36:12 -0000      1.8
@@ -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 -->

Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl      23 May 2007 
12:10:12 -0000      1.6
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/results.tmpl      29 May 2007 
16:36:12 -0000      1.7
@@ -254,20 +254,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>

Index: koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css      23 May 2007 
09:55:26 -0000      1.2
+++ koha-tmpl/intranet-tmpl/prog/en/includes/intranet2.css      29 May 2007 
16:36:12 -0000      1.3
@@ -167,11 +167,12 @@
 }
 
 .available {
-    background-color: white;
+    font-size:0.75em;
 }
 
 .unavailable {
     background-color: #FFED3D;
+    font-size:0.75em;
 }
 
 .hasexpirated {

Index: koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl     22 May 2007 
09:08:58 -0000      1.21
+++ koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl     29 May 2007 
16:36:12 -0000      1.22
@@ -213,6 +213,7 @@
     <table>
         <tr>
             <th scope="col">Title</th>
+            <th scope="col">Barcode</th>
             <th scope="col">Date due</th>
             <th scope="col">Itemtype</th>
             <th scope="col">Charge</th>
@@ -231,13 +232,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" -->
@@ -274,9 +279,9 @@
         </tr>
         <!-- /tmpl_loop -->
         <tr>
-            <td colspan="3">Total replacement cost:</td>
+            <td colspan="5">Total replacement cost:</td>
             <td><!-- TMPL_VAR NAME="totalprice" --></td>
-            <td colspan="3">&nbsp;</td>
+            <td colspan="2">&nbsp;</td>
         </tr>
         </table>
         <div>

Index: koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl    9 Mar 2007 14:48:06 
-0000       1.2
+++ koha-tmpl/opac-tmpl/prog/en/opac-ISBDdetail.tmpl    29 May 2007 16:36:12 
-0000      1.3
@@ -4,16 +4,17 @@
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
-    <div id="action">
-        <!-- TMPL_UNLESS NAME="norequests" -->
+<div id="action">
+
+<!-- TMPL_UNLESS NAME="norequests" -->
                <!-- TMPL_IF NAME="RequestOnOpac" -->
         <a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" -->">
             Place Reserve
         </a>
                <!-- /TMPL_IF -->
-        <!-- /TMPL_UNLESS -->
-        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" -->">
-            Normal View
+<!-- /TMPL_UNLESS -->
+        <a href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" -->">
+            MARC View
         </a>
         <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" -->">
             ISBD
@@ -21,17 +22,17 @@
         <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;">
             Print
         </a>
-        <!-- TMPL_IF name="virtualshelves" -->
+<!-- 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;">
                 Add to My Book List
             </a>
             <!-- /TMPL_IF -->
-        <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
         <a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" 
-->'); return false;">
             Add to My Book Bag
         </a>
-    </div>
+</div>
     
     <h1>ISBD</h1>
     <!-- TMPL_VAR name="ISBD" -->

Index: koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl    9 Mar 2007 14:48:06 
-0000       1.2
+++ koha-tmpl/opac-tmpl/prog/en/opac-MARCdetail.tmpl    29 May 2007 16:36:12 
-0000      1.3
@@ -5,15 +5,16 @@
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 
 <div id="action">
-    <!-- TMPL_UNLESS NAME="norequests" -->
+
+<!-- TMPL_UNLESS NAME="norequests" -->
        <!-- TMPL_IF NAME="RequestOnOpac" -->
     <a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" -->">
         Place Reserve
     </a>
        <!-- /TMPL_IF -->
-    <!-- /TMPL_UNLESS -->
-    <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" -->">
-        Normal View
+<!-- /TMPL_UNLESS -->
+        <a href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" -->">
+            MARC View
     </a>
     <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" -->">
         ISBD
@@ -21,11 +22,13 @@
     <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;">
         Print
     </a>
-    <!-- TMPL_IF name="virtualshelves" -->
+<!-- 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;">
         Add to My Book List
     </a>
     <!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
     <a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); 
return false;">
         Add to My Book Bag
     </a>

Index: koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl     28 May 2007 15:59:30 
-0000      1.3
+++ koha-tmpl/opac-tmpl/prog/en/opac-advsearch.tmpl     29 May 2007 16:36:13 
-0000      1.4
@@ -91,17 +91,19 @@
     <!-- /TMPL_LOOP -->
     </fieldset>
 <!-- /BOOLEAN SEARCH OPTIONS -->
-<div id="advsearch-itemtype">
-<fieldset>
-<legend>Itemtype to: match any of the following </legend>
-    <table><tr>
+    <div id="advsearch-itemtype">
+    <h2>Itemtype limit to any of the following:</h2>
+    <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>
+        <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"-->

Index: koha-tmpl/opac-tmpl/prog/en/includes/opac.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/en/includes/opac.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- koha-tmpl/opac-tmpl/prog/en/includes/opac.css       28 May 2007 16:28:44 
-0000      1.5
+++ koha-tmpl/opac-tmpl/prog/en/includes/opac.css       29 May 2007 16:36:13 
-0000      1.6
@@ -146,10 +146,14 @@
 #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;

Index: misc/translator/po/prog_intranet_fr_FR.po
===================================================================
RCS file: /sources/koha/koha/misc/translator/po/prog_intranet_fr_FR.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- misc/translator/po/prog_intranet_fr_FR.po   23 May 2007 16:19:41 -0000      
1.2
+++ misc/translator/po/prog_intranet_fr_FR.po   29 May 2007 16:36:13 -0000      
1.3
@@ -1,3 +1,4 @@
+# translation of prog_intranet_fr_FR.po to
 # translation of prog_intranet_fr_FR_10.po to
 # translation of prog_intranet_fr_FR_9.po to
 # translation of prog_intranet_fr_FR_7bis.po to
@@ -14,9 +15,9 @@
 # paul POULAIN <address@hidden>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: prog_intranet_fr_FR_10\n"
+"Project-Id-Version: prog_intranet_fr_FR\n"
 "POT-Creation-Date: 2007-05-18 16:21+0200\n"
-"PO-Revision-Date: 2007-05-23 18:02+0200\n"
+"PO-Revision-Date: 2007-05-29 16:31+0200\n"
 "Last-Translator: paul POULAIN <address@hidden>\n"
 "Language-Team:  <address@hidden>\n"
 "MIME-Version: 1.0\n"
@@ -5442,7 +5443,7 @@
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:646
 msgid "Choose Hemisphere:"
-msgstr "Choisir l'hémisphère : "
+msgstr "Choisir hémisphère : "
 
 #: ../../koha-tmpl/intranet-tmpl/prog/en/cataloguing/addbooks.tmpl:30
 msgid "Choose a Framework:"
@@ -19090,7 +19091,7 @@
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:1057
 msgid "need to check for irregularity by clicking 'Irregularity?'"
-msgstr "Vous devez vérifier les irrégularités en cliquant sur 
\"Irrégularités?\""
+msgstr "Vous devez vérifier les irrégularités en cliquant sur 
'Irrégularités?'"
 
 #. SCRIPT
 #: ../../koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl:1057

Index: misc/zebra/record_biblios_unimarc.abs
===================================================================
RCS file: /sources/koha/koha/misc/zebra/record_biblios_unimarc.abs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- misc/zebra/record_biblios_unimarc.abs       28 May 2007 16:28:44 -0000      
1.5
+++ misc/zebra/record_biblios_unimarc.abs       29 May 2007 16:36:14 -0000      
1.6
@@ -1,4 +1,4 @@
-# $Id: record_biblios_unimarc.abs,v 1.5 2007/05/28 16:28:44 tipaul Exp $
+# $Id: record_biblios_unimarc.abs,v 1.6 2007/05/29 16:36:14 tipaul Exp $
 
 # indexing rules. It
 # results in a server which provides a passable Bath level 0 and 1 service
@@ -359,8 +359,7 @@
 #############"# item information (based on 995) ###############
 melm 995$j             LC-card-number:s
 
-melm 995$k             Call-Number
-melm 995$k             Local-classification
+melm 995$k             Call-Number:p,Local-classification:p,lcn:p
 
 #melm 952$a            Local-classification
 #melm 995$a            Record-source




reply via email to

[Prev in Thread] Current Thread [Next in Thread]