[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/search.marc dictionary.tmpl,1.4,1.5 search.tmpl,1.24,1.25
Paul POULAIN
tipaul at users.sourceforge.net
Wed Jun 1 14:51:04 CEST 2005
Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13572/koha-tmpl/intranet-tmpl/default/en/search.marc
Modified Files:
dictionary.tmpl search.tmpl
Log Message:
some fixes & improvements for dictionnary search in librarian interface
Index: dictionary.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/dictionary.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** dictionary.tmpl 4 May 2005 12:46:28 -0000 1.4
--- dictionary.tmpl 1 Jun 2005 12:51:02 -0000 1.5
***************
*** 53,59 ****
<!-- TMPL_IF Name=search -->
! <div class="bloc100">
! <h2 class="catalogue">Dictionary Search results</h2>
! <!-- TMPL_IF NAME="authresult" -->
<div id="resultnumber">
<p><!-- TMPL_IF NAME="displayprev" -->
--- 53,59 ----
<!-- TMPL_IF Name=search -->
! <div class="bloc25">
! <h2 class="catalogue">Dictionary Search results</h2>
! <!-- TMPL_IF NAME="authresult" -->
<div id="resultnumber">
<p><!-- TMPL_IF NAME="displayprev" -->
***************
*** 84,97 ****
<tr>
<th class="catalogue">Summary</th>
! <th class="catalogue">Used</th>
<th class="catalogue">Select</th>
</tr>
<!-- TMPL_LOOP NAME="authresult" -->
<tr>
! <td><!-- TMPL_VAR NAME="summary" --></td>
! <td>
! <a href="../search.marc/search.pl?type=intranet&op=do_search&marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&operator==&value=<!-- TMPL_VAR NAME="authid" -->&and_or=and&excluding=" class="button catalogue"><!-- TMPL_VAR NAME="used" --> biblio(s)
! <td><img src="/images/arrow.gif" width="32" hspace="0" vspace="0" border="0">
</td>
</td>
</tr>
--- 84,113 ----
<tr>
<th class="catalogue">Summary</th>
! <th class="catalogue">Used in</th>
<th class="catalogue">Select</th>
</tr>
<!-- TMPL_LOOP NAME="authresult" -->
<tr>
! <!-- TMPL_IF NAME="even" -->
! <td class="hilighted">
! <!-- TMPL_ELSE -->
! <td>
! <!-- /TMPL_IF -->
! <!-- TMPL_VAR NAME="summary" -->
</td>
+ <!-- TMPL_IF NAME="even" -->
+ <td class="hilighted">
+ <!-- TMPL_ELSE -->
+ <td>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_VAR NAME="used" --> biblio(s)
+ </td>
+ <!-- TMPL_IF NAME="even" -->
+ <td class="hilighted">
+ <!-- TMPL_ELSE -->
+ <td>
+ <!-- /TMPL_IF -->
+ <a href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL" -->,0)" class="button catalogue">select</a>
+ <a href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL" -->,1)" class="button catalogue">sel&close</a>
</td>
</tr>
***************
*** 101,106 ****
<!-- TMPL_ELSE -->
<h3 class="catalogue">No results in Authorities</h3>
! <!-- /TMPL_IF -->
! <!-- TMPL_IF Name=catresult -->
<div id="resultnumber">
<p class="resultcount">
--- 117,124 ----
<!-- TMPL_ELSE -->
<h3 class="catalogue">No results in Authorities</h3>
! <!-- /TMPL_IF -->
!
!
! <!-- TMPL_IF Name=catresult -->
<div id="resultnumber">
<p class="resultcount">
***************
*** 114,133 ****
<tr>
<th class="catalogue">Summary</th>
! <th class="catalogue">Biblio Count</th>
<th class="catalogue">Select</th>
</tr>
<!-- TMPL_LOOP NAME="catresult" -->
<tr>
! <td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
<!-- TMPL_IF name="MARC_ON" -->
! <a class="transparent resultlist" href="search.pl?type=<!-- TMPL_VAR NAME="type" ESCAPE="URL" -->&marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE="URL" -->&operator=contains&op=do_search&and_or=and&value='<!-- TMPL_VAR Name=value ESCAPE="URL" -->'&excluding="><!-- TMPL_VAR NAME="value" --></a>
<!-- TMPL_ELSE -->
! <a class="transparent resultlist" href="search.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="value" --></a> <!-- /TMPL_IF -->
</td>
<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
! <!-- TMPL_VAR NAME="count" -->
</td>
<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
! <a href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL" -->)" class="button catalogue">Select</a>
</td>
</tr>
--- 132,157 ----
<tr>
<th class="catalogue">Summary</th>
! <th class="catalogue">Used in</th>
<th class="catalogue">Select</th>
</tr>
<!-- TMPL_LOOP NAME="catresult" -->
<tr>
! <!-- TMPL_IF NAME="even" -->
! <td class="hilighted">
! <!-- TMPL_ELSE -->
! <td>
! <!-- /TMPL_IF -->
<!-- TMPL_IF name="MARC_ON" -->
! <!-- TMPL_VAR NAME="value" -->
<!-- TMPL_ELSE -->
! <!-- TMPL_VAR NAME="value" -->
! <!-- /TMPL_IF -->
</td>
<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
! <!-- TMPL_VAR NAME="count" --> biblio(s)
</td>
<td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
! <a href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL" -->,0)" class="button catalogue">Select</a>
! <a href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL" -->,1)" class="button catalogue">Sel&close</a>
</td>
</tr>
***************
*** 156,171 ****
</p>
</div>
! <script language="JavaScript" type="text/javascript">
! function SelectEntry(myentry, myindex){
! if (opener.document.f.value[myindex].value!=""){
! opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
! } else {
! opener.document.f.value[myindex].value=myentry
}
! }
! </script>
</div>
<!-- /TMPL_IF -->
- <!-- /TMPL_IF -->
</div>
</body>
--- 180,199 ----
</p>
</div>
! <!-- /TMPL_IF -->
! <script language="JavaScript" type="text/javascript">
! function SelectEntry(myentry, myindex, wclose){
! if (opener.document.f.value[myindex].value!=""){
! opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
! } else {
! opener.document.f.value[myindex].value=myentry
! }
! if (wclose == 1) {
! // alert("closing")
! self.close();
! }
}
! </script>
</div>
<!-- /TMPL_IF -->
</div>
</body>
Index: search.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** search.tmpl 4 May 2005 12:52:34 -0000 1.24
--- search.tmpl 1 Jun 2005 12:51:02 -0000 1.25
***************
*** 17,21 ****
<input type="hidden" name="op" value="do_search">
<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! <label class="label100" for="keyword">Any word</label>
<input type="hidden" name="marclist" value="">
<input type="hidden" name="and_or" value="and">
--- 17,21 ----
<input type="hidden" name="op" value="do_search">
<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
! <label for="keyword">Any word</label>
<input type="hidden" name="marclist" value="">
<input type="hidden" name="and_or" value="and">
***************
*** 25,29 ****
</p>
<p>
! <label class="label100" for="title">Title</label>
<input type="hidden" name="marclist" value="biblio.title">
<input type="hidden" name="and_or" value="and">
--- 25,29 ----
</p>
<p>
! <label for="title">Title</label>
<input type="hidden" name="marclist" value="biblio.title">
<input type="hidden" name="and_or" value="and">
***************
*** 31,50 ****
<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&type=intranet&index=1',1)">
! <img src="/intranet-tmpl/default/en/includes/addressbook_section.png" width=12 height=12 alt="dict">
</a>
</p>
<p>
! <label class="label100" for="author">Author</label> <input type="hidden" name="marclist" value="biblio.author">
<input type="hidden" name="and_or" value="and">
<input type="hidden" name="excluding" value="">
<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&type=intranet&index=2',2)">
! <img src="/intranet-tmpl/default/en/includes/addressbook_section.png" width=12 height=12 alt="dict">
</a>
</p>
<p>
! <label class="label100" for="subject">Subject</label>
<input type="hidden" name="marclist" value="bibliosubject.subject">
<input type="hidden" name="and_or" value="and">
--- 31,50 ----
<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&type=intranet&index=1',1)" class="button catalogue">
! ...
</a>
</p>
<p>
! <label for="author">Author</label> <input type="hidden" name="marclist" value="biblio.author">
<input type="hidden" name="and_or" value="and">
<input type="hidden" name="excluding" value="">
<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&type=intranet&index=2',2)" class="button catalogue">
! ...
</a>
</p>
<p>
! <label for="subject">Subject</label>
<input type="hidden" name="marclist" value="bibliosubject.subject">
<input type="hidden" name="and_or" value="and">
***************
*** 52,61 ****
<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&type=intranet&index=3',3)">
! <img src="/intranet-tmpl/default/en/includes/addressbook_section.png" width=12 height=12 alt="dict">
</a>
</p>
<p>
! <label class="label100" for="itemtype">Item Type</label>
<input type="hidden" name="marclist" value="biblioitems.itemtype">
<input type="hidden" name="and_or" value="and">
--- 52,61 ----
<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&type=intranet&index=3',3)" class="button catalogue">
! ...
</a>
</p>
<p>
! <label for="itemtype">Item Type</label>
<input type="hidden" name="marclist" value="biblioitems.itemtype">
<input type="hidden" name="and_or" value="and">
***************
*** 65,69 ****
</p>
<p>
! <label class="label100" for="branch">Branch</label>
<input type="hidden" name="marclist" value="items.holdingbranch">
<input type="hidden" name="and_or" value="and">
--- 65,69 ----
</p>
<p>
! <label for="branch">Branch</label>
<input type="hidden" name="marclist" value="items.holdingbranch">
<input type="hidden" name="and_or" value="and">
***************
*** 76,80 ****
<h2 class="catalogue">Other options</h2>
<p>
! <label class="label100" for="barcode">Item barcode</label>
<input type="hidden" name="marclist" value="items.barcode">
<input type="hidden" name="and_or" value="and">
--- 76,80 ----
<h2 class="catalogue">Other options</h2>
<p>
! <label for="barcode">Item barcode</label>
<input type="hidden" name="marclist" value="items.barcode">
<input type="hidden" name="and_or" value="and">
***************
*** 84,88 ****
</p>
<p>
! <label class="label100" for="callno">Call Number</label>
<input type="hidden" name="marclist" value="items.itemcallnumber">
<input type="hidden" name="and_or" value="and">
--- 84,88 ----
</p>
<p>
! <label for="callno">Call Number</label>
<input type="hidden" name="marclist" value="items.itemcallnumber">
<input type="hidden" name="and_or" value="and">
***************
*** 92,96 ****
</p>
<p>
! <label class="label100" for="isbn">ISBN</label>
<input type="hidden" name="marclist" value="biblioitems.isbn">
<input type="hidden" name="and_or" value="and">
--- 92,96 ----
</p>
<p>
! <label for="isbn">ISBN</label>
<input type="hidden" name="marclist" value="biblioitems.isbn">
<input type="hidden" name="and_or" value="and">
***************
*** 100,104 ****
</p>
<p>
! <label class="label100" for="publisher">Publisher</label>
<input type="hidden" name="marclist" value="biblioitems.publishercode">
<input type="hidden" name="and_or" value="and">
--- 100,104 ----
</p>
<p>
! <label for="publisher">Publisher</label>
<input type="hidden" name="marclist" value="biblioitems.publishercode">
<input type="hidden" name="and_or" value="and">
***************
*** 160,164 ****
<p>
<input type="submit" value="Start search" class="button catalogue">
! <a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Suggestions</a>
</p>
</div>
--- 160,164 ----
<p>
<input type="submit" value="Start search" class="button catalogue">
! <a href="/cgi-bin/koha/search.marc/suggest.pl" onclick="PopupSuggestion(); return false;" class="button catalogue">Spelling suggestion</a>
</p>
</div>
***************
*** 188,192 ****
function Dopop(link,i) {
var searchstring=document.forms[0].value[i].value;
! newin=window.open(link+'&search='+searchstring,"popup",'width=550,height=550,toolbar=false,scrollbars=yes');
}
--- 188,192 ----
function Dopop(link,i) {
var searchstring=document.forms[0].value[i].value;
! newin=window.open(link+'&search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
}
More information about the Koha-cvs
mailing list