koha-cvs
[Top][All Lists]
Advanced

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

[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc resu


From: Owen Leonard
Subject: [Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc result.tmpl,1.14,1.15 search.tmpl,1.17,1.18 suggest.tmpl,1.1,1.2
Date: Mon, 19 Jul 2004 13:59:37 -0700

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

Modified Files:
        result.tmpl search.tmpl suggest.tmpl 
Log Message:
Corrections to make markup more valid (quoting attributes, encoding ampersands, 
etc.)

Index: result.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** result.tmpl 17 Jun 2004 08:23:46 -0000      1.14
--- result.tmpl 19 Jul 2004 20:59:34 -0000      1.15
***************
*** 8,32 ****
        <div id="resultnumber">
                <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 -->
!                               <!-- TMPL_IF NAME=highlight -->
!                                       <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>
                <p>
!                       <!-- TMPL_IF name=total -->
!                       &nbsp<b>Results <!-- TMPL_VAR name="from" --> to <!-- 
TMPL_VAR name="to" --> of <!-- TMPL_VAR name="total" --></b><br><br>
                        <!-- TMPL_ELSE -->
!                       &nbsp No results found.<br>
                        <!-- /TMPL_IF -->
                </p>
--- 8,32 ----
        <div id="resultnumber">
                <p>
!                       <!-- TMPL_IF NAME="displayprev" -->
!                               <a href="search.pl?startfrom=<!-- TMPL_VAR 
NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR 
NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP 
-->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search">
!                                       <img 
src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
                                </a>
                        <!-- /TMPL_IF -->
!                       <!-- TMPL_LOOP NAME="numbers" -->
!                               <!-- TMPL_IF NAME="highlight" -->
!                                       <img 
src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" 
-->-highlight.gif">
                                <!-- TMPL_ELSE -->
!                                       <a href="search.pl?startfrom=<!-- 
TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- 
TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- 
/TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;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" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR 
NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP 
-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search"><img 
src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
                                <!-- /TMPL_IF -->
                </p>
                <p>
!                       <!-- TMPL_IF NAME="total" -->
!                       &nbsp;<b>Results <!-- TMPL_VAR NAME="from" --> to <!-- 
TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --></b><br><br>
                        <!-- TMPL_ELSE -->
!                       &nbsp;No results found.<br>
                        <!-- /TMPL_IF -->
                </p>
***************
*** 40,66 ****
                        <th class="catalogue">&nbsp;</th>
                        </tr>
!                       <!-- TMPL_LOOP name="result" -->
                        <tr>
!                               <td <!-- TMPL_IF name="even" 
-->class="hilighted"<!-- /TMPL_IF -->>
                                        <p>
                                                <p>                             
                        <b><a class="transparent" 
href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b></p>
                                                <p><!-- TMPL_VAR NAME="author" 
-->
!                                               <!-- TMPL_IF 
name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /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 -->
!                                               <!-- TMPL_IF name="size" --> ; 
<!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
                                        </p>
                                </td>
!                               <td align="center" <!-- TMPL_IF name="even" --> 
class="hilighted"<!-- /TMPL_IF -->>
!                                       <!-- TMPL_VAR name="totitem" -->
                                </td>
!                               <td <!-- TMPL_IF name="even" 
-->class="hilighted"<!-- /TMPL_IF -->>
!                                       <!-- TMPL_LOOP name="CN" -->
!                                               <!-- TMPL_VAR 
name="holdingbranch" --> <!-- TMPL_IF name="itemcallnumber" -->(<!-- TMPL_VAR 
name="itemcallnumber" -->)<!-- /TMPL_IF -->
                                        <!-- /TMPL_LOOP -->
                                </td>
!                               <td <!-- TMPL_IF name="even" 
-->class="hilighted"<!-- /TMPL_IF -->>
!                                       <!-- TMPL_UNLESS NAME="norequests" -->
                                                <a class="transparent" 
href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
ESCAPE="URL" -->">Request</a>
                                        <!-- TMPL_ELSE -->
--- 40,66 ----
                        <th class="catalogue">&nbsp;</th>
                        </tr>
!                       <!-- TMPL_LOOP NAME="result" -->
                        <tr>
!                               <td <!-- TMPL_IF NAME="even" 
-->class="hilighted"<!-- /TMPL_IF -->>
                                        <p>
                                                <p>                             
                        <b><a class="transparent" 
href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b></p>
                                                <p><!-- TMPL_VAR NAME="author" 
-->
!                                               <!-- TMPL_IF 
NAME="publishercode" -->- <!-- TMPL_VAR NAME="publishercode" --><!-- /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 -->
!                                               <!-- TMPL_IF NAME="size" --> ; 
<!-- TMPL_VAR NAME="size" --><!-- /TMPL_IF -->
                                        </p>
                                </td>
!                               <td align="center" <!-- TMPL_IF NAME="even" --> 
class="hilighted"<!-- /TMPL_IF -->>
!                                       <!-- TMPL_VAR NAME="totitem" -->
                                </td>
!                               <td <!-- TMPL_IF NAME="even" 
-->class="hilighted"<!-- /TMPL_IF -->>
!                                       <!-- TMPL_LOOP NAME="CN" -->
!                                               <!-- TMPL_VAR 
NAME="holdingbranch" --> <!-- TMPL_IF NAME="itemcallnumber" -->(<!-- TMPL_VAR 
NAME="itemcallnumber" -->)<!-- /TMPL_IF -->
                                        <!-- /TMPL_LOOP -->
                                </td>
!                               <td <!-- TMPL_IF NAME="even" 
-->class="hilighted"<!-- /TMPL_IF -->>
!                                       <!-- TMPL_UNLESS name="norequests" -->
                                                <a class="transparent" 
href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
ESCAPE="URL" -->">Request</a>
                                        <!-- TMPL_ELSE -->
***************
*** 74,89 ****
        <div id="resultnumber">
                <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 -->
!                               <!-- TMPL_IF NAME=highlight -->
!                               <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>
--- 74,89 ----
        <div id="resultnumber">
                <p>
!                       <!-- TMPL_IF NAME="displayprev" -->
!                       <a href="search.pl?startfrom=<!-- TMPL_VAR 
NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR 
NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP 
-->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;op=do_search"><img 
src="/intranet-tmpl/default/images/numbers/prev.gif" border="0"></a>
                        <!-- /TMPL_IF -->
!                       <!-- TMPL_LOOP NAME="numbers" -->
!                               <!-- TMPL_IF NAME="highlight" -->
!                               <img 
src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" 
-->-highlight.gif">
                                <!-- TMPL_ELSE -->
!                               <a href="search.pl?startfrom=<!-- TMPL_VAR 
NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR 
NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP 
-->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;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" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR 
NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP 
-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" 
-->&amp;type=intranet&amp;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/en/search.marc/search.tmpl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** search.tmpl 3 May 2004 09:28:41 -0000       1.17
--- search.tmpl 19 Jul 2004 20:59:34 -0000      1.18
***************
*** 68,72 ****
                        <input type="hidden" name="excluding" value="">
                        <input type="hidden" name="operator" value="=">
!                       <!-- TMPL_VAR name="CGIitemtype" -->
                </p>
                                                <p>
--- 68,72 ----
                        <input type="hidden" name="excluding" value="">
                        <input type="hidden" name="operator" value="=">
!                       <!-- TMPL_VAR NAME="CGIitemtype" -->
                </p>
                                                <p>
***************
*** 76,80 ****
                                <input type="hidden" name="excluding" value="">
                                <input type="hidden" name="operator" value="=">
!                               <!-- TMPL_VAR name="CGIbranch" -->
        </p>
  
--- 76,80 ----
                                <input type="hidden" name="excluding" value="">
                                <input type="hidden" name="operator" value="=">
!                               <!-- TMPL_VAR NAME="CGIbranch" -->
        </p>
  
***************
*** 88,92 ****
                                        <option <!-- TMPL_IF NAME="or" 
-->selected <!-- /TMPL_IF -->value="or">or</option>
                                </select>
!                               <!-- TMPL_VAR name="marclist" -->
                                <select name="excluding" size="1" 
onchange="sql_update()">
                                        <option value="0"> </option>
--- 88,92 ----
                                        <option <!-- TMPL_IF NAME="or" 
-->selected <!-- /TMPL_IF -->value="or">or</option>
                                </select>
!                               <!-- TMPL_VAR NAME="marclist" -->
                                <select name="excluding" size="1" 
onchange="sql_update()">
                                        <option value="0"> </option>
***************
*** 112,116 ****
                <p>
                        <div name="sql">
!                               <textarea name="sql" rows=3 cols=70 disabled 
readonly></textarea>
                        </div>
                </p>
--- 112,116 ----
                <p>
                        <div name="sql">
!                               <textarea name="sql" rows="3" cols="70" 
disabled readonly></textarea>
                        </div>
                </p>
***************
*** 137,141 ****
  </form>
  
! <script>
  function sql_update() {
  document.f.sql.value="";
--- 137,141 ----
  </form>
  
! <script language="javascript" type="text/javascript">
  function sql_update() {
  document.f.sql.value="";

Index: suggest.tmpl
===================================================================
RCS file: 
/cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** suggest.tmpl        16 Apr 2004 07:28:22 -0000      1.1
--- suggest.tmpl        19 Jul 2004 20:59:34 -0000      1.2
***************
*** 19,34 ****
                                </th>
                        </tr>
!               <!-- TMPL_LOOP name="loop" -->
                        <tr>
                                <td>
!                                       <!-- TMPL_VAR name="word" -->
                                </td>
                                <td>
!                                       <a href="javascript:Import('<!-- 
TMPL_VAR name="word" -->','<!-- TMPL_VAR name="suggestion" -->')">
!                                               <!-- TMPL_VAR name="suggestion" 
-->
                                        </a>
                                </td>
                                <td>
!                                       <!-- TMPL_VAR name="count" -->
                                </td>
                        </tr>
--- 19,34 ----
                                </th>
                        </tr>
!               <!-- TMPL_LOOP NAME="loop" -->
                        <tr>
                                <td>
!                                       <!-- TMPL_VAR NAME="word" -->
                                </td>
                                <td>
!                                       <a href="javascript:Import('<!-- 
TMPL_VAR NAME="word" -->','<!-- TMPL_VAR NAME="suggestion" -->')">
!                                               <!-- TMPL_VAR NAME="suggestion" 
-->
                                        </a>
                                </td>
                                <td>
!                                       <!-- TMPL_VAR NAME="count" -->
                                </td>
                        </tr>
***************
*** 37,41 ****
        </div>
  </div>
! <script>
        function Import(Replaced,ReplaceBy) {
                for (i=0 ; i<opener.document.f.value.length ; i++) {
--- 37,41 ----
        </div>
  </div>
! <script language="javascript" type="text/javascript">
        function Import(Replaced,ReplaceBy) {
                for (i=0 ; i<opener.document.f.value.length ; i++) {
***************
*** 44,48 ****
  //                            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;
  //                    self.close();
  //                    return false;
--- 44,48 ----
  //                            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;
  //                    self.close();
  //                    return false;




reply via email to

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