Browse Source

Bug 6536: QA Follow-up for string changes referring to Z39.50

Z39.50 search now includes SRU targets.
This patch only touches strings referring to it.
No changes in behavior.
It replaces Z39.50 with Z39.50/SRU or external.

Deletes obsolete template z3950/searchresult.tt: not in use for some time.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
MM-OPAC/theme_dep
Marcel de Rooy 8 years ago
committed by Tomas Cohen Arazi
parent
commit
91d5a83849
  1. 2
      koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
  2. 4
      koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
  3. 4
      koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
  4. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
  5. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
  6. 12
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
  7. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
  8. 4
      koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
  9. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
  10. 6
      koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
  11. 45
      koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tt

2
koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc

@ -60,7 +60,7 @@
<ul>
<!-- <li><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></li> -->
<li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 client targets</a></li>
<li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a></li>
<li><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></li>
<li><a href="/cgi-bin/koha/admin/columns_settings.pl">Columns settings</a></li>
</ul>

4
koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc

@ -9,7 +9,7 @@
}
}
function PopupZ3950Confirmed() {
if (confirm(_("Please note that this Z39.50 search could replace the current record."))){
if (confirm(_("Please note that this external search could replace the current record."))){
PopupZ3950();
}
}
@ -194,7 +194,7 @@ CAN_user_serials_create_subscription ) %]
[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
<li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]&amp;frameworkcode=[% current_framework %]&amp;op=duplicate">Edit as new (duplicate)</a></li>
<li><a href="#" id="z3950copy">Replace record via Z39.50</a></li>
<li><a href="#" id="z3950copy">Replace record via Z39.50/SRU</a></li>
[% IF ( count ) %]
<li class="disabled"><a id="deletebiblio" data-toggle="tooltip" data-placement="left" title="[% count %] item(s) are attached to this record. You must delete all items before deleting this record." href="#">Delete record</a></li>

4
koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc

@ -2,7 +2,7 @@
<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin z3950 Admin Resident Search Box -->
<div id="header_search">
<div id="z3950_search" class="residentsearch">
<p class="tip">Z39.50 server search:</p>
<p class="tip">Z39.50/SRU server search:</p>
<form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
<input type="text" name="searchfield" size="40" value="[% searchfield %]" />
<input type="submit" class="submit" name="search" value="Search" />
@ -21,7 +21,7 @@
</div>
[% END %]
<ul>
<li><a href="#z3950_search">Search Z39.50 servers</a></li>
<li><a href="#z3950_search">Search Z39.50/SRU servers</a></li>
[% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
[% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
</ul>

2
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt

@ -208,7 +208,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
[% ELSE %]
[% IF ( emptyserverlist ) %]
<div class="dialog alert">You didn't select any Z39.50 target.</div>
<div class="dialog alert">You didn't select any external target.</div>
[% ELSE %]
[% IF ( errconn ) %]
<div class="dialog alert">

4
koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt

@ -100,8 +100,8 @@
<dl>
<!-- <dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
<dd>Printers (UNIX paths).</dd> -->
<dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 client targets</a></dt>
<dd>Define which servers to query for MARC data in the integrated Z39.50 client.</dd>
<dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a></dt>
<dd>Define which external servers to query for MARC data.</dd>
<dt><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></dt>
<dd>Choose which plugins to use to suggest searches to patrons and staff.</dd>
<dt><a href="/cgi-bin/koha/admin/columns_settings.pl">Configure columns</a></dt>

12
koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt

@ -8,7 +8,7 @@
[% END %]
[% END %]
<title>Koha &rsaquo; Administration &rsaquo; Z39.50 servers
<title>Koha &rsaquo; Administration &rsaquo; Z39.50/SRU servers
[% IF op == 'edit' %] &rsaquo; Modify [% PROCESS ServerType %] server [% server.servername %][% END %]
[% IF op == 'add' %] &rsaquo; New [% PROCESS ServerType %] server[% END %]
</title>
@ -83,7 +83,7 @@
[% INCLUDE 'z3950-admin-search.inc' %]
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
<a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a>
<a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a>
[% IF op == 'edit' %]&rsaquo; Modify [% PROCESS ServerType %] server [% server.servername %][% END %]
[% IF op == 'add' %]&rsaquo; New [% PROCESS ServerType %] server[% END %]
</div>
@ -94,11 +94,11 @@
<div class="yui-b">
[% IF msg_deleted %]
<div class="dialog alert">Z39.50 server deleted ([% msg_add %])</div>
<div class="dialog alert">Z39.50/SRU server deleted ([% msg_add %])</div>
[% ELSIF msg_updated %]
<div class="dialog message">Z39.50 server updated ([% msg_add %])</div>
<div class="dialog message">Z39.50/SRU server updated ([% msg_add %])</div>
[% ELSIF msg_added %]
<div class="dialog message">Z39.50 server added ([% msg_add %])</div>
<div class="dialog message">Z39.50/SRU server added ([% msg_add %])</div>
[% ELSIF msg_notfound %]
<div class="dialog alert">Error: Server with id [% msg_add %] not found</div>
[% END %]
@ -205,7 +205,7 @@
<a id="newserver" class="btn btn-small" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=zed"><i class="icon-plus"></i> New Z39.50 server</a>
<a id="newserver" class="btn btn-small" href="/cgi-bin/koha/admin/z3950servers.pl?op=add&type=sru"><i class="icon-plus"></i> New SRU server</a>
</div>
<h3>Z39.50 servers administration</h3>
<h3>Z39.50/SRU servers administration</h3>
[% IF id %]
You searched for record [% id %]
[% ELSIF searchfield %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt

@ -331,7 +331,7 @@ var holdForPatron = function () {
[% END %]
[% END %]
[% IF ( CAN_user_editcatalogue_edit_catalogue ) %] <div class="btn-group"><a class="btn btn-mini" id="z3950submit" href="#"><i class="icon-search"></i> Z39.50 search</a></div>[% END %]
[% IF ( CAN_user_editcatalogue_edit_catalogue ) %] <div class="btn-group"><a class="btn btn-mini" id="z3950submit" href="#"><i class="icon-search"></i> Z39.50/SRU search</a></div>[% END %]
</div>
</div>
[% IF ( stopwords_removed ) %]<div><p class="tip">Ignored the following common words: "[% stopwords_removed %]"<p></div>[% END %]

4
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt

@ -70,7 +70,7 @@
});
$("#z3950search").click(function(){
if (confirm(_("Please note that this Z39.50 search could replace the current record."))){
if (confirm(_("Please note that this external search could replace the current record."))){
PopupZ3950();
}
});
@ -456,7 +456,7 @@ function Changefwk(FwkList) {
[% END %]
[% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %]
<div class="btn-group"><a class="btn btn-small" href="#" id="z3950search"><i class="icon-search"></i> Z39.50 search</a></div>
<div class="btn-group"><a class="btn btn-small" href="#" id="z3950search"><i class="icon-search"></i> Z39.50/SRU search</a></div>
[% IF (biblionumber) %]
[% IF ( BiblioDefaultViewmarc ) %]
<div class="btn-group">

2
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt

@ -62,7 +62,7 @@
</ul>
</div>
<div class="btn-group">
<button class="btn btn-small" id="z3950search"><i class="icon-search"></i> New from Z39.50</button>
<button class="btn btn-small" id="z3950search"><i class="icon-search"></i> New from Z39.50/SRU</button>
<button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>

6
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt

@ -1,5 +1,5 @@
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Z39.50 search results</title>
<title>Koha &rsaquo; Z39.50/SRU search results</title>
[% INCLUDE 'greybox.inc' %]
[% INCLUDE 'doc-head-close.inc' %]
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
@ -54,7 +54,7 @@ $(document).ready(function(){
});
$("form[name='f']").submit(function(){
if ($('input[type=checkbox]').filter(':checked').length == 0) {
alert(_("Please choose at least one Z39.50 target"));
alert(_("Please choose at least one external target"));
return false;
} else
return true;
@ -101,7 +101,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
[% END %]
<div id="bd">
[% IF ( opsearch ) %]
<h2>Z39.50 search points</h2>
<h2>Z39.50/SRU search</h2>
<form method="post" action="z3950_search.pl" name="f" class="checkboxed">
<input type="hidden" name="op" id="op" value="do_search" />
<div class="yui-g">

45
koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tt

@ -1,45 +0,0 @@
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Z39.50 search results</title>
[% INCLUDE 'doc-head-close.inc' %]
<script type="text/javascript">
//<![CDATA[
function Import(GetThisOne) {
opener.document.location= "../cataloguing/addbiblio.pl?z3950=1&oldbiblionumber=[% oldbiblionumber %]&breedingid="+GetThisOne;
self.close();
return false;
}
//]]>
</script>
</head>
<body id="cat_searchresult" class="cat">
<h2>Z3950 search results</h2>
[% IF ( breeding_loop ) %]
<table>
<tr>
<th>Title</th>
<th>Author</th>
<th>ISBN</th>
<th>Coming from</th>
<th>&nbsp;</th>
<th>&nbsp;</th>
</tr>
[% FOREACH breeding_loo IN breeding_loop %]
<tr bgcolor="[% breeding_loo.toggle %]">
<td>[% breeding_loo.title |html %]</td>
<td>[% breeding_loo.author %]</td>
<td>[% breeding_loo.isbn %]</td>
<td>[% breeding_loo.file %]</td>
<td><a href="javascript:Import([% breeding_loo.id %])">Import this biblio</a></td>
</tr>
[% END %]
</table>
[% ELSE %]
<p>Nothing found</p>
[% END %]
[% IF ( numberpending ) %]<h1>Still [% numberpending %] requests to go</h1>[% END %]
</body>
</html>
Loading…
Cancel
Save