[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc result.tmpl,1.24,1.25 search.tmpl,1.26,1.27 suggest.tmpl,1.3,1.4

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30201/koha-tmpl/intranet-tmpl/default/en/search.marc

Modified Files:
        result.tmpl search.tmpl suggest.tmpl 
Log Message:
big commit, still breaking things...

* synch with rel_2_2. Probably the last non manual synch, as rel_2_2 should not 
be modified deeply.
* code cleaning (cleaning warnings from perl -w) continued

Index: result.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** result.tmpl 12 Aug 2005 13:55:14 -0000      1.24
--- result.tmpl 26 Oct 2005 09:17:07 -0000      1.25
***************
*** 21,25 ****
                        <!-- TMPL_LOOP NAME="result" -->
                        <tr>
!                               <td<!-- TMPL_IF NAME="even" --> 
class="hilighted"<!-- /TMPL_IF -->>
                                                        <!-- TMPL_IF 
name="MARC_ON" -->
                                                                <a 
class="transparent resultlist" 
href="/cgi-bin/koha/MARCdetail.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
--- 21,29 ----
                        <!-- TMPL_LOOP NAME="result" -->
                        <tr>
!                               <!-- TMPL_IF NAME="even" -->
!                                       <td class="hilighted">
!                               <!-- TMPL_ELSE -->
!                                       <td>
!                               <!-- /TMPL_IF -->
                                                        <!-- TMPL_IF 
name="MARC_ON" -->
                                                                <a 
class="transparent resultlist" 
href="/cgi-bin/koha/MARCdetail.pl?biblionumber=<!-- TMPL_VAR 
NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>

Index: search.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** search.tmpl 22 Sep 2005 15:34:17 -0000      1.26
--- search.tmpl 26 Oct 2005 09:17:07 -0000      1.27
***************
*** 31,37 ****
                        <input type="hidden" name="operator" value="contains">
                        <input type="text" name="value" id="title" 
onchange="sql_update()" size="35">
!                       <a 
href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)"
 class="button catalogue">
!                               ...
!                       </a>
                </p>
                <p>
--- 31,39 ----
                        <input type="hidden" name="operator" value="contains">
                        <input type="text" name="value" id="title" 
onchange="sql_update()" size="35">
!                       <!-- TMPL_UNLESS Name="Disable_Dictionary" -->
!                               <a 
href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)"
 class="button catalogue">
!                                       ...
!                               </a>
!                       <!-- /TMPL_UNLESS -->
                </p>
                <p>
***************
*** 41,47 ****
                        <input type="hidden" name="operator" value="contains">
                        <input type="text" name="value" id="author" 
onchange="sql_update()" size="35">
!                       <a 
href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)"
 class="button catalogue">
!                               ...
!                       </a>
                </p>
                <p>
--- 43,51 ----
                        <input type="hidden" name="operator" value="contains">
                        <input type="text" name="value" id="author" 
onchange="sql_update()" size="35">
!                       <!-- TMPL_UNLESS Name="Disable_Dictionary" -->
!                               <a 
href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)"
 class="button catalogue">
!                                       ...
!                               </a>
!                       <!-- /TMPL_UNLESS -->
                </p>
                <p>
***************
*** 52,58 ****
                        <input type="hidden" name="operator" value="contains">  
                        <input type="text" name="value" id="subject" 
onchange="sql_update()" size="35">
!                       <a 
href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)"
 class="button catalogue">
!                               ...
!                       </a>
                </p>
                <p>
--- 56,64 ----
                        <input type="hidden" name="operator" value="contains">  
                        <input type="text" name="value" id="subject" 
onchange="sql_update()" size="35">
!                       <!-- TMPL_UNLESS Name="Disable_Dictionary" -->
!                               <a 
href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)"
 class="button catalogue">
!                                       ...
!                               </a>
!                       <!-- /TMPL_UNLESS -->
                </p>
                <p>
***************
*** 187,196 ****
  function AddStatement() {
  
!       document.forms[0].op.value="AddStatement";
        document.f.submit();
  }
  
  function Dopop(link,i) {
!       var searchstring=document.forms[0].value[i].value;
        
newin=window.open(link+'&amp;search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
  }
--- 193,202 ----
  function AddStatement() {
  
!       document.forms['f'].op.value="AddStatement";
        document.f.submit();
  }
  
  function Dopop(link,i) {
!       var searchstring=document.forms['f'].value[i].value;
        
newin=window.open(link+'&amp;search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
  }

Index: suggest.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** suggest.tmpl        23 Jun 2005 08:58:30 -0000      1.3
--- suggest.tmpl        26 Oct 2005 09:17:07 -0000      1.4
***************
*** 40,46 ****
        function Import(Replaced,ReplaceBy) {
                for (i=0 ; i<opener.document.f.value.length ; i++) {
!                               opener.document.forms[0].value[i].value = 
opener.document.forms[0].value[i].value.replace(Replaced,ReplaceBy);
! //                    if (document.forms[0].kohafield[i].value == 
"biblioitems.isbn" && document.forms[0].field_value[i].value.length>0) {
! //                            strQuery += 
"&isbn="+document.forms[0].field_value[i].value;
  //                    }
  //                    opener.document.location= 
"../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR 
NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
--- 40,46 ----
        function Import(Replaced,ReplaceBy) {
                for (i=0 ; i<opener.document.f.value.length ; i++) {
!                               opener.document.forms['f'].value[i].value = 
opener.document.forms['f'].value[i].value.replace(Replaced,ReplaceBy);
! //                    if (document.forms['f'].kohafield[i].value == 
"biblioitems.isbn" && document.forms['f'].field_value[i].value.length>0) {
! //                            strQuery += 
"&isbn="+document.forms['f'].field_value[i].value;
  //                    }
  //                    opener.document.location= 
"../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR 
NAME="oldbiblionumber" -->&breedingid="+GetThisOne;