[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/includes/m...
|
From: |
paul poulain |
|
Subject: |
[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/includes/m... |
|
Date: |
Wed, 30 May 2007 09:33:24 +0000 |
CVSROOT: /sources/koha
Module name: koha
Changes by: paul poulain <tipaul> 07/05/30 09:33:22
Modified files:
koha-tmpl/intranet-tmpl/prog/en/includes: menu-acqui.inc
menu-admin.inc
menu-catalogue.inc
menu-circ.inc
menu-members.inc
koha-tmpl/intranet-tmpl/prog/fr/authorities: authorities.tmpl
detail.tmpl
koha-tmpl/intranet-tmpl/prog/fr/catalogue: MARCdetail.tmpl
results.tmpl
koha-tmpl/intranet-tmpl/prog/fr/includes: intranet2.css
intranet2.css~
menu-acqui.inc
menu-admin.inc
menu-catalogue.inc
menu-circ.inc
menu-members.inc
koha-tmpl/intranet-tmpl/prog/fr/includes/calendar:
calendar-setup.js
calendar.js
koha-tmpl/intranet-tmpl/prog/fr/members: moremember.tmpl
koha-tmpl/intranet-tmpl/prog/fr/serials: serials-collection.tmpl
serials-edit.tmpl
subscription-add.tmpl
koha-tmpl/opac-tmpl/prog/fr: opac-ISBDdetail.tmpl
opac-MARCdetail.tmpl
opac-advsearch.tmpl
opac-results.tmpl
koha-tmpl/opac-tmpl/prog/fr/includes: opac.css opac.css~
misc/zebra : bib1_biblios.att ccl.properties
reserve : renewscript.pl
Log message:
cleaning duplicate entries in top menus & fixing a bug in "branch"
index (zebra) & updated french translation
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc?cvsroot=koha&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/authorities/authorities.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/authorities/detail.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/catalogue/MARCdetail.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css%126?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar-setup.js?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar.js?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/members/moremember.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/serials-collection.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/serials-edit.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/fr/opac-ISBDdetail.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/fr/opac-MARCdetail.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/fr/opac-advsearch.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/fr/opac-results.tmpl?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css%126?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/misc/zebra/bib1_biblios.att?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/misc/zebra/ccl.properties?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/renewscript.pl?cvsroot=koha&r1=1.7&r2=1.8
Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc 9 Mar 2007
14:47:39 -0000 1.4
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc 30 May 2007
09:33:18 -0000 1.5
@@ -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>
Index: koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc 9 Mar 2007
14:47:39 -0000 1.5
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc 30 May 2007
09:33:18 -0000 1.6
@@ -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>
Index: koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc 22 May 2007
09:13:57 -0000 1.6
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc 30 May 2007
09:33:18 -0000 1.7
@@ -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>
Index: koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc 23 Apr 2007
16:42:59 -0000 1.9
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc 30 May 2007
09:33:19 -0000 1.10
@@ -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>
Index: koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc 16 Mar 2007
01:25:09 -0000 1.5
+++ koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc 30 May 2007
09:33:19 -0000 1.6
@@ -1,5 +1,4 @@
<div id="submenu">
- <a href="/cgi-bin/koha/members/members-home.pl">Borrowers</a>
<a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A">Add
adult</a>
<a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C">Add
child</a>
<a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P">Add
professional</a>
Index: koha-tmpl/intranet-tmpl/prog/fr/authorities/authorities.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/authorities/authorities.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/authorities/authorities.tmpl 23 May
2007 09:55:30 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/authorities/authorities.tmpl 30 May
2007 09:33:19 -0000 1.2
@@ -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 @@
<!-- /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> <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="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="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/fr/authorities/detail.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/authorities/detail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/authorities/detail.tmpl 23 May 2007
09:55:30 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/authorities/detail.tmpl 30 May 2007
09:33:19 -0000 1.2
@@ -74,7 +74,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/fr/catalogue/MARCdetail.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/catalogue/MARCdetail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/catalogue/MARCdetail.tmpl 23 May 2007
09:55:32 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/catalogue/MARCdetail.tmpl 30 May 2007
09:33:20 -0000 1.2
@@ -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/fr/catalogue/results.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl 25 May 2007
16:27:58 -0000 1.2
+++ koha-tmpl/intranet-tmpl/prog/fr/catalogue/results.tmpl 30 May 2007
09:33:20 -0000 1.3
@@ -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>
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css 23 May 2007
10:03:54 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css 30 May 2007
09:33:20 -0000 1.2
@@ -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/fr/includes/intranet2.css~
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css~,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css~ 23 May 2007
10:03:54 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/intranet2.css~ 30 May 2007
09:33:20 -0000 1.2
@@ -436,6 +436,7 @@
#login {
font-size:0.7em;
}
+
/* the design of the INactives tab buttons (all other tabs) */
.tab_inactive {
background-color : #6699CC;
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc 23 May 2007
10:03:54 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/menu-acqui.inc 30 May 2007
09:33:20 -0000 1.2
@@ -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">
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc 23 May 2007
10:03:55 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/menu-admin.inc 30 May 2007
09:33:20 -0000 1.2
@@ -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>
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc 23 May 2007
10:03:55 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/menu-catalogue.inc 30 May 2007
09:33:20 -0000 1.2
@@ -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">
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc 23 May 2007
10:03:55 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/menu-circ.inc 30 May 2007
09:33:20 -0000 1.2
@@ -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">
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc 23 May 2007
10:03:55 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/menu-members.inc 30 May 2007
09:33:20 -0000 1.2
@@ -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&category_type=A">Inscription
adulte</a><a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C">Inscription
enfant</a><a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P">Inscription
professionnel</a4><a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=I">Inscription
collectivité</a>
+ <a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A">Add
adult</a> <a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C">Add
child</a> <a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P">Add
professional</a> <a
href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=I">Add
organisation</a>
</div>
<div id="main">
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar-setup.js
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar-setup.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar-setup.js 25 May
2007 16:27:58 -0000 1.2
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar-setup.js 30 May
2007 09:33:20 -0000 1.3
@@ -19,7 +19,7 @@
* than modifying calendar.js itself).
*/
-// $Id: calendar-setup.js,v 1.2 2007/05/25 16:27:58 tipaul Exp $
+// $Id: calendar-setup.js,v 1.3 2007/05/30 09:33:20 tipaul Exp $
/**
* This function "patches" an input field (or other element) to use a calendar
Index: koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar.js
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar.js 25 May
2007 16:27:58 -0000 1.2
+++ koha-tmpl/intranet-tmpl/prog/fr/includes/calendar/calendar.js 30 May
2007 09:33:21 -0000 1.3
@@ -10,7 +10,7 @@
* Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
*/
-// $Id: calendar.js,v 1.2 2007/05/25 16:27:58 tipaul Exp $
+// $Id: calendar.js,v 1.3 2007/05/30 09:33:21 tipaul Exp $
/** The Calendar object constructor. */
Calendar = function (firstDayOfWeek, dateStr, onSelected, onClose) {
Index: koha-tmpl/intranet-tmpl/prog/fr/members/moremember.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/members/moremember.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/members/moremember.tmpl 23 May 2007
09:55:39 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/members/moremember.tmpl 30 May 2007
09:33:21 -0000 1.2
@@ -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"> </td>
+ <td colspan="2"> </td>
</tr>
</table>
<div>
Index: koha-tmpl/intranet-tmpl/prog/fr/serials/serials-collection.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/serials-collection.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/serials/serials-collection.tmpl 23 May
2007 09:55:42 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/serials/serials-collection.tmpl 30 May
2007 09:33:21 -0000 1.2
@@ -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 @@
<!-- 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 -->
Index: koha-tmpl/intranet-tmpl/prog/fr/serials/serials-edit.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/serials-edit.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/intranet-tmpl/prog/fr/serials/serials-edit.tmpl 23 May 2007
09:55:42 -0000 1.1
+++ koha-tmpl/intranet-tmpl/prog/fr/serials/serials-edit.tmpl 30 May 2007
09:33:21 -0000 1.2
@@ -57,7 +57,7 @@
<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"-->')}" >
Index: koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl 25 May
2007 16:27:58 -0000 1.2
+++ koha-tmpl/intranet-tmpl/prog/fr/serials/subscription-add.tmpl 30 May
2007 09:33:21 -0000 1.3
@@ -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 @@
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 {
Index: koha-tmpl/opac-tmpl/prog/fr/opac-ISBDdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/fr/opac-ISBDdetail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/opac-tmpl/prog/fr/opac-ISBDdetail.tmpl 23 May 2007 16:17:48
-0000 1.1
+++ koha-tmpl/opac-tmpl/prog/fr/opac-ISBDdetail.tmpl 30 May 2007 09:33:21
-0000 1.2
@@ -4,26 +4,27 @@
<!--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" -->">
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" -->
+<!-- /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_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" -->
Index: koha-tmpl/opac-tmpl/prog/fr/opac-MARCdetail.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/fr/opac-MARCdetail.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/opac-tmpl/prog/fr/opac-MARCdetail.tmpl 23 May 2007 16:17:48
-0000 1.1
+++ koha-tmpl/opac-tmpl/prog/fr/opac-MARCdetail.tmpl 30 May 2007 09:33:21
-0000 1.2
@@ -5,19 +5,22 @@
<!--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" -->">
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" -->
+<!-- /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_IF -->
<a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->');
return false;">
Ajouter à mon panier
</a>
Index: koha-tmpl/opac-tmpl/prog/fr/opac-advsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/fr/opac-advsearch.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/opac-tmpl/prog/fr/opac-advsearch.tmpl 23 May 2007 16:17:49
-0000 1.1
+++ koha-tmpl/opac-tmpl/prog/fr/opac-advsearch.tmpl 30 May 2007 09:33:21
-0000 1.2
@@ -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
-->> Expression Titre</option>
- <option value="se" <!-- TMPL_IF NAME="selected"
-->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF
-->> 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>
+ <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" -->"/>
+ <!--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/fr/opac-results.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/fr/opac-results.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- koha-tmpl/opac-tmpl/prog/fr/opac-results.tmpl 23 May 2007 16:17:50
-0000 1.1
+++ koha-tmpl/opac-tmpl/prog/fr/opac-results.tmpl 30 May 2007 09:33:21
-0000 1.2
@@ -225,8 +225,8 @@
<!-- TMPL_ELSE -->
<!-- /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 @@
<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>
Index: koha-tmpl/opac-tmpl/prog/fr/includes/opac.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/opac-tmpl/prog/fr/includes/opac.css 23 May 2007 16:29:50
-0000 1.2
+++ koha-tmpl/opac-tmpl/prog/fr/includes/opac.css 30 May 2007 09:33:22
-0000 1.3
@@ -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;
@@ -348,11 +352,12 @@
}
.available {
- background-color: white;
+ font-size:0.75em;
}
.unavailable {
background-color: #FFED3D;
+ font-size:0.75em;
}
/* style for search terms in catalogsearch */
Index: koha-tmpl/opac-tmpl/prog/fr/includes/opac.css~
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/prog/fr/includes/opac.css~,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/opac-tmpl/prog/fr/includes/opac.css~ 23 May 2007 16:29:50
-0000 1.2
+++ koha-tmpl/opac-tmpl/prog/fr/includes/opac.css~ 30 May 2007 09:33:22
-0000 1.3
@@ -136,7 +136,7 @@
/* 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 @@
}
#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 @@
}
.available {
- background-color: white;
+ font-size:0.75em;
}
.unavailable {
background-color: #FFED3D;
+ font-size:0.75em;
}
/* style for search terms in catalogsearch */
Index: misc/zebra/bib1_biblios.att
===================================================================
RCS file: /sources/koha/koha/misc/zebra/bib1_biblios.att,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- misc/zebra/bib1_biblios.att 9 Mar 2007 15:47:25 -0000 1.2
+++ misc/zebra/bib1_biblios.att 30 May 2007 09:33:22 -0000 1.3
@@ -1,4 +1,4 @@
-# $Id: bib1_biblios.att,v 1.2 2007/03/09 15:47:25 tipaul Exp $
+# $Id: bib1_biblios.att,v 1.3 2007/05/30 09:33:22 tipaul Exp $
# Bib-1 Attribute Set
name bib1
reference Bib-1
@@ -98,7 +98,7 @@
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
Index: misc/zebra/ccl.properties
===================================================================
RCS file: /sources/koha/koha/misc/zebra/ccl.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- misc/zebra/ccl.properties 25 May 2007 16:27:58 -0000 1.3
+++ misc/zebra/ccl.properties 30 May 2007 09:33:22 -0000 1.4
@@ -1,5 +1,5 @@
# CCL field mappings
-# $Id: ccl.properties,v 1.3 2007/05/25 16:27:58 tipaul Exp $
+# $Id: ccl.properties,v 1.4 2007/05/30 09:33:22 tipaul Exp $
# There are four types of lines in a CCL profile:
# 1. qualifier specification
# qualifier-name [ attributeset ,] type = val [ attributeset
,] type = val ...
@@ -184,7 +184,7 @@
# 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
Index: reserve/renewscript.pl
===================================================================
RCS file: /sources/koha/koha/reserve/renewscript.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- reserve/renewscript.pl 18 Apr 2007 17:00:15 -0000 1.7
+++ reserve/renewscript.pl 30 May 2007 09:33:22 -0000 1.8
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: renewscript.pl,v 1.7 2007/04/18 17:00:15 tipaul Exp $
+# $Id: renewscript.pl,v 1.8 2007/05/30 09:33:22 tipaul Exp $
#written 18/1/2000 by address@hidden
#script to renew items from the web
@@ -48,8 +48,13 @@
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";
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/includes/m...,
paul poulain <=