[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/bull bull-home.tmpl,1.1,1.2 result.tmpl,1.2,1.3 search.tmpl,1.2,1.3 subscription-add.tmpl,1.2,1.3 subscription-detail.tmpl,1.2,1.3
Paul POULAIN
tipaul at users.sourceforge.net
Tue Mar 1 14:42:00 CET 2005
- Previous message: [Koha-cvs] CVS: koha/misc/migration_tools build6xx.pl,1.1,1.2 buildEDITORS.pl,1.1,1.2 check_marc_definition.pl,1.1,1.2
- Next message: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue MARCdetail.tmpl,1.10,1.11 detail.tmpl,1.9,1.10 searchresults.tmpl,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915/koha-tmpl/intranet-tmpl/default/fr/bull
Modified Files:
bull-home.tmpl result.tmpl search.tmpl subscription-add.tmpl
subscription-detail.tmpl
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits done here
Index: bull-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/bull-home.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bull-home.tmpl 24 Nov 2004 16:13:33 -0000 1.1
--- bull-home.tmpl 1 Mar 2005 13:40:57 -0000 1.2
***************
*** 24,28 ****
<tr>
<td>
! <!-- TMPL_VAR name="title" -->
</td>
<td>
--- 24,28 ----
<tr>
<td>
! <!-- TMPL_VAR name="title" --> <!-- TMPL_IF name="notes" -->(<!-- TMPL_VAR name="notes" -->)<!-- /TMPL_IF -->
</td>
<td>
Index: result.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/result.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** result.tmpl 5 Jan 2005 14:35:18 -0000 1.2
--- result.tmpl 1 Mar 2005 13:40:57 -0000 1.3
***************
*** 5,9 ****
<p>
<!-- TMPL_IF NAME=displayprev -->
! <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
<img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
</a>
--- 5,9 ----
<p>
<!-- TMPL_IF NAME=displayprev -->
! <a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
<img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
</a>
***************
*** 13,21 ****
<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
<!-- TMPL_ELSE -->
! <a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF NAME=displaynext -->
! <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
<!-- /TMPL_IF -->
</p>
--- 13,21 ----
<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
<!-- TMPL_ELSE -->
! <a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF NAME=displaynext -->
! <a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
<!-- /TMPL_IF -->
</p>
***************
*** 48,52 ****
</td>
<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
! <a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" -->') ">Le choisir</a>
</td>
</tr>
--- 48,52 ----
</td>
<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
! <a class="transparent" href="#" onclick="GetIt('<!-- TMPL_VAR NAME="biblionumber" -->','<!-- TMPL_VAR name="title" escape="URL" -->') ">Le choisir</a>
</td>
</tr>
***************
*** 57,61 ****
<p>
<!-- TMPL_IF NAME=displayprev -->
! <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME=numbers -->
--- 57,61 ----
<p>
<!-- TMPL_IF NAME=displayprev -->
! <a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME=numbers -->
***************
*** 63,71 ****
<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
<!-- TMPL_ELSE -->
! <a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF NAME=displaynext -->
! <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
<!-- /TMPL_IF -->
</p>
--- 63,71 ----
<img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
<!-- TMPL_ELSE -->
! <a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- TMPL_IF NAME=displaynext -->
! <a href=subscription-bib-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
<!-- /TMPL_IF -->
</p>
Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/search.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** search.tmpl 5 Jan 2005 14:35:18 -0000 1.2
--- search.tmpl 1 Mar 2005 13:40:57 -0000 1.3
***************
*** 26,30 ****
<option value="100">100</option>
</select>
! Commandé par
<select name="orderby" size="1">
<option value="biblio.title">Titre</option>
--- 26,30 ----
<option value="100">100</option>
</select>
! Trié par
<select name="orderby" size="1">
<option value="biblio.title">Titre</option>
Index: subscription-add.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-add.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** subscription-add.tmpl 5 Jan 2005 14:35:18 -0000 1.2
--- subscription-add.tmpl 1 Mar 2005 13:40:57 -0000 1.3
***************
*** 90,94 ****
<p><label class="label100">Arrive le</label>
<select name="dow" size="1">
! <option value="">Sans</option>
<!-- TMPL_IF name="dow1" -->
<option value="1" selected>Lundi</option>
--- 90,94 ----
<p><label class="label100">Arrive le</label>
<select name="dow" size="1">
! <option value="">Aucun</option>
<!-- TMPL_IF name="dow1" -->
<option value="1" selected>Lundi</option>
Index: subscription-detail.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/bull/subscription-detail.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** subscription-detail.tmpl 5 Jan 2005 14:35:18 -0000 1.2
--- subscription-detail.tmpl 1 Mar 2005 13:40:57 -0000 1.3
***************
*** 4,7 ****
--- 4,10 ----
<h1 class="bull">Abonnement</h1>
<a href="subscription-add.pl?op=mod&subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Editer</a> <a href="statecollection.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->" class="button bull">Numéros</a> <a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="biblionumber" -->" class="button bull">Notice</a>
+ <!-- TMPL_UNLESS name="totalissues" -->
+ <a href="subscription-detail.pl?subscriptionid=<!-- TMPL_VAR name="subscriptionid" -->&op=del" class="button bull">Supprimer l'abonnement</a>
+ <!-- /TMPL_UNLESS -->
<form method="post" name="f">
<div id="bloc25">
- Previous message: [Koha-cvs] CVS: koha/misc/migration_tools build6xx.pl,1.1,1.2 buildEDITORS.pl,1.1,1.2 check_marc_definition.pl,1.1,1.2
- Next message: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/catalogue MARCdetail.tmpl,1.10,1.11 detail.tmpl,1.9,1.10 searchresults.tmpl,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Koha-cvs
mailing list