[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/fr/circ circulation.tmpl,1.11,1.12 selectbranchprinter.tmpl,1.3,1.4

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20915/koha-tmpl/intranet-tmpl/default/fr/circ

Modified Files:
        circulation.tmpl selectbranchprinter.tmpl 
Log Message:
merging 2.2 branch with head. Sorry for not making it before, many many commits 
done here

Index: circulation.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/circulation.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** circulation.tmpl    5 Jan 2005 14:35:19 -0000       1.11
--- circulation.tmpl    1 Mar 2005 13:40:57 -0000       1.12
***************
*** 30,35 ****
                        <h2 class="circulation">Information lecteur</h2>
                        <p>
!                               <a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
NAME="borrowernumber" -->" onclick="openWindow(this,'Member', 480, 640)">
!                                       <!-- TMPL_VAR NAME="firstname" --> <!-- 
TMPL_VAR NAME="surname" -->
                                </a>
                        </p>
--- 30,35 ----
                        <h2 class="circulation">Information lecteur</h2>
                        <p>
!                               <a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR 
NAME="borrowernumber" --> " onclick="openWindow(this,'Member', 480, 640)">
!                                       <!-- TMPL_VAR NAME="firstname" --> <!-- 
TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR name="cardnumber" -->)
                                </a>
                        </p>
***************
*** 43,47 ****
                        <p><!-- TMPL_VAR NAME="issuecount" --> Sorties<!-- 
TMPL_IF NAME="overduecount" -->,<!-- TMPL_VAR NAME="overduecount" --> En 
retard<!-- /TMPL_IF --></p>
                        <p><b><!-- TMPL_VAR NAME="borrowernotes" --></b></p>
! 
                <!-- TMPL_ELSE -->
                                <h2 class="circulation">
--- 43,56 ----
                        <p><!-- TMPL_VAR NAME="issuecount" --> Sorties<!-- 
TMPL_IF NAME="overduecount" -->,<!-- TMPL_VAR NAME="overduecount" --> En 
retard<!-- /TMPL_IF --></p>
                        <p><b><!-- TMPL_VAR NAME="borrowernotes" --></b></p>
!                       <!-- TMPL_IF NAME="dbarred" -->
!                               <span class="error">Suspendu</span> Le lecteur 
est exclu 
!                               <form 
action="/cgi-bin/koha/members/setdebar.pl" method="post">
!                                       <input type="hidden" 
name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
!                                       <input type="hidden" name="cardnumber" 
value="<!-- TMPL_VAR NAME="cardnumber" -->" />
!                                       <input type="hidden" value="circ" 
name="destination" />
!                                       <input type="hidden" name="status" 
value="0" />
!                                       <input type="submit" class="button 
circulation" value="Lift Debarment" />
!                               </form>
!                       <!-- /TMPL_IF -->
                <!-- TMPL_ELSE -->
                                <h2 class="circulation">
***************
*** 111,115 ****
                                <option value="6"<!-- TMPL_IF NAME="month6" --> 
selected="selected"<!-- /TMPL_IF -->>Juin</option>
                                <option value="7"<!-- TMPL_IF NAME="month7" --> 
selected="selected"<!-- /TMPL_IF -->>Juil</option>
!                               <option value="8"<!-- TMPL_IF NAME="month8" --> 
selected="selected"<!-- /TMPL_IF -->>Aoû</option>
                                <option value="9"<!-- TMPL_IF NAME="month9" --> 
selected="selected"<!-- /TMPL_IF -->>Sept</option>
                                <option value="10"<!-- TMPL_IF NAME="month10" 
--> selected="selected"<!-- /TMPL_IF -->>Oct</option>
--- 120,124 ----
                                <option value="6"<!-- TMPL_IF NAME="month6" --> 
selected="selected"<!-- /TMPL_IF -->>Juin</option>
                                <option value="7"<!-- TMPL_IF NAME="month7" --> 
selected="selected"<!-- /TMPL_IF -->>Juil</option>
!                               <option value="8"<!-- TMPL_IF NAME="month8" --> 
selected="selected"<!-- /TMPL_IF -->>Aou</option>
                                <option value="9"<!-- TMPL_IF NAME="month9" --> 
selected="selected"<!-- /TMPL_IF -->>Sept</option>
                                <option value="10"<!-- TMPL_IF NAME="month10" 
--> selected="selected"<!-- /TMPL_IF -->>Oct</option>

Index: selectbranchprinter.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/fr/circ/selectbranchprinter.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** selectbranchprinter.tmpl    24 Nov 2004 16:14:39 -0000      1.3
--- selectbranchprinter.tmpl    1 Mar 2005 13:40:58 -0000       1.4
***************
*** 30,34 ****
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input value="Soumettre" type="changesettings" class="button"></p>
  </form>
  
--- 30,34 ----
  <!-- /TMPL_IF --></p>
  <p><input type="hidden" name="setcookies" value="1">
! <input value="Valider" type="changesettings" class="button"></p>
  </form>