View | Details | Raw Unified | Return to bug 6536
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc (-1 / +1 lines)
Lines 60-66 Link Here
60
60
61
<ul>
61
<ul>
62
	<!-- <li><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></li> -->
62
	<!-- <li><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></li> -->
63
    <li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 client targets</a></li>
63
    <li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a></li>
64
    <li><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></li>
64
    <li><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></li>
65
</ul>
65
</ul>
66
</div>
66
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc (-2 / +2 lines)
Lines 9-15 Link Here
9
		} 
9
		} 
10
	}
10
	}
11
    function PopupZ3950Confirmed() {
11
    function PopupZ3950Confirmed() {
12
        if (confirm(_("Please note that this Z39.50 search could replace the current record."))){
12
        if (confirm(_("Please note that this external search could replace the current record."))){
13
            PopupZ3950();
13
            PopupZ3950();
14
        }
14
        }
15
    }
15
    }
Lines 194-200 CAN_user_serials_create_subscription ) %] Link Here
194
194
195
            [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
195
            [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
196
            <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>
196
            <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>
197
            <li><a href="#" id="z3950copy">Replace record via Z39.50</a></li>
197
            <li><a href="#" id="z3950copy">Replace record via Z39.50/SRU</a></li>
198
198
199
                [% IF ( count ) %]
199
                [% IF ( count ) %]
200
                    <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>
200
                    <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>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc (-2 / +2 lines)
Lines 2-8 Link Here
2
<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin z3950 Admin Resident Search Box -->
2
<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin z3950 Admin Resident Search Box -->
3
<div id="header_search">
3
<div id="header_search">
4
    <div id="z3950_search" class="residentsearch">
4
    <div id="z3950_search" class="residentsearch">
5
    <p class="tip">Z39.50 server search:</p>
5
    <p class="tip">Z39.50/SRU server search:</p>
6
	<form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
6
	<form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
7
                <input type="text" name="searchfield" size="40" value="[% searchfield %]" />
7
                <input type="text" name="searchfield" size="40" value="[% searchfield %]" />
8
                <input type="submit" class="submit" name="search" value="Search" />
8
                <input type="submit" class="submit" name="search" value="Search" />
Lines 21-27 Link Here
21
	</div>
21
	</div>
22
	[% END %]
22
	[% END %]
23
			<ul>
23
			<ul>
24
            <li><a href="#z3950_search">Search Z39.50 servers</a></li>
24
            <li><a href="#z3950_search">Search Z39.50/SRU servers</a></li>
25
            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
25
            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
26
            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
26
            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
27
			</ul>	
27
			</ul>	
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt (-1 / +1 lines)
Lines 208-214 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
208
208
209
    [% ELSE %]
209
    [% ELSE %]
210
        [% IF ( emptyserverlist ) %]
210
        [% IF ( emptyserverlist ) %]
211
            <div class="dialog alert">You didn't select any Z39.50 target.</div>
211
            <div class="dialog alert">You didn't select any external target.</div>
212
        [% ELSE %]
212
        [% ELSE %]
213
            [% IF ( errconn ) %]
213
            [% IF ( errconn ) %]
214
                <div class="dialog alert">
214
                <div class="dialog alert">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt (-2 / +2 lines)
Lines 100-107 Link Here
100
<dl>
100
<dl>
101
	<!-- <dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
101
	<!-- <dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
102
	<dd>Printers (UNIX paths).</dd> -->
102
	<dd>Printers (UNIX paths).</dd> -->
103
    <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 client targets</a></dt>
103
    <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a></dt>
104
	<dd>Define which servers to query for MARC data in the integrated Z39.50 client.</dd>
104
    <dd>Define which external servers to query for MARC data.</dd>
105
    <dt><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></dt>
105
    <dt><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></dt>
106
    <dd>Choose which plugins to use to suggest searches to patrons and staff.</dd>
106
    <dd>Choose which plugins to use to suggest searches to patrons and staff.</dd>
107
</dl>
107
</dl>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt (-6 / +6 lines)
Lines 8-14 Link Here
8
    [% END %]
8
    [% END %]
9
[% END %]
9
[% END %]
10
10
11
<title>Koha &rsaquo; Administration &rsaquo; Z39.50 servers
11
<title>Koha &rsaquo; Administration &rsaquo; Z39.50/SRU servers
12
[% IF op == 'edit' %] &rsaquo; Modify [% PROCESS ServerType %] server [% server.servername %][% END %]
12
[% IF op == 'edit' %] &rsaquo; Modify [% PROCESS ServerType %] server [% server.servername %][% END %]
13
[% IF op ==  'add' %] &rsaquo; New [% PROCESS ServerType %] server[% END %]
13
[% IF op ==  'add' %] &rsaquo; New [% PROCESS ServerType %] server[% END %]
14
</title>
14
</title>
Lines 83-89 Link Here
83
[% INCLUDE 'z3950-admin-search.inc' %]
83
[% INCLUDE 'z3950-admin-search.inc' %]
84
84
85
<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;
85
<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;
86
<a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a>
86
<a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a>
87
[% IF op == 'edit' %]&rsaquo; Modify [% PROCESS ServerType %] server [% server.servername %][% END %]
87
[% IF op == 'edit' %]&rsaquo; Modify [% PROCESS ServerType %] server [% server.servername %][% END %]
88
[% IF op ==  'add' %]&rsaquo; New [% PROCESS ServerType %] server[% END %]
88
[% IF op ==  'add' %]&rsaquo; New [% PROCESS ServerType %] server[% END %]
89
</div>
89
</div>
Lines 94-104 Link Here
94
<div class="yui-b">
94
<div class="yui-b">
95
95
96
[% IF msg_deleted %]
96
[% IF msg_deleted %]
97
    <div class="dialog alert">Z39.50 server deleted ([% msg_add %])</div>
97
    <div class="dialog alert">Z39.50/SRU server deleted ([% msg_add %])</div>
98
[% ELSIF msg_updated %]
98
[% ELSIF msg_updated %]
99
    <div class="dialog message">Z39.50 server updated ([% msg_add %])</div>
99
    <div class="dialog message">Z39.50/SRU server updated ([% msg_add %])</div>
100
[% ELSIF msg_added %]
100
[% ELSIF msg_added %]
101
    <div class="dialog message">Z39.50 server added ([% msg_add %])</div>
101
    <div class="dialog message">Z39.50/SRU server added ([% msg_add %])</div>
102
[% ELSIF msg_notfound %]
102
[% ELSIF msg_notfound %]
103
    <div class="dialog alert">Error: Server with id [% msg_add %] not found</div>
103
    <div class="dialog alert">Error: Server with id [% msg_add %] not found</div>
104
[% END %]
104
[% END %]
Lines 205-211 Link Here
205
        <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>
205
        <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>
206
        <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>
206
        <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>
207
    </div>
207
    </div>
208
    <h3>Z39.50 servers administration</h3>
208
    <h3>Z39.50/SRU servers administration</h3>
209
    [% IF id %]
209
    [% IF id %]
210
        You searched for record [% id %]
210
        You searched for record [% id %]
211
    [% ELSIF searchfield %]
211
    [% ELSIF searchfield %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-1 / +1 lines)
Lines 331-337 var holdForPatron = function () { Link Here
331
                [% END %]
331
                [% END %]
332
                [% END %]
332
                [% END %]
333
333
334
                [% 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 %]
334
                [% 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 %]
335
            </div>
335
            </div>
336
        </div>
336
        </div>
337
    [% IF ( stopwords_removed ) %]<div><p class="tip">Ignored the following common words: "[% stopwords_removed %]"<p></div>[% END %]
337
    [% IF ( stopwords_removed ) %]<div><p class="tip">Ignored the following common words: "[% stopwords_removed %]"<p></div>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt (-2 / +2 lines)
Lines 70-76 Link Here
70
        });
70
        });
71
71
72
        $("#z3950search").click(function(){
72
        $("#z3950search").click(function(){
73
            if (confirm(_("Please note that this Z39.50 search could replace the current record."))){
73
            if (confirm(_("Please note that this external search could replace the current record."))){
74
                PopupZ3950();
74
                PopupZ3950();
75
            }
75
            }
76
        });
76
        });
Lines 456-462 function Changefwk(FwkList) { Link Here
456
    [% END %]
456
    [% END %]
457
457
458
    [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %]
458
    [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %]
459
        <div class="btn-group"><a class="btn btn-small" href="#" id="z3950search"><i class="icon-search"></i> Z39.50 search</a></div>
459
        <div class="btn-group"><a class="btn btn-small" href="#" id="z3950search"><i class="icon-search"></i> Z39.50/SRU search</a></div>
460
        [% IF (biblionumber) %]
460
        [% IF (biblionumber) %]
461
            [% IF ( BiblioDefaultViewmarc ) %]
461
            [% IF ( BiblioDefaultViewmarc ) %]
462
                <div class="btn-group">
462
                <div class="btn-group">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt (-1 / +1 lines)
Lines 62-68 Link Here
62
            </ul>
62
            </ul>
63
        </div>
63
        </div>
64
        <div class="btn-group">
64
        <div class="btn-group">
65
            <button class="btn btn-small" id="z3950search"><i class="icon-search"></i> New from Z39.50</button>
65
            <button class="btn btn-small" id="z3950search"><i class="icon-search"></i> New from Z39.50/SRU</button>
66
            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
66
            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
67
                <span class="caret"></span>
67
                <span class="caret"></span>
68
            </button>
68
            </button>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt (-3 / +3 lines)
Lines 1-5 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Z39.50 search results</title>
2
<title>Koha &rsaquo; Z39.50/SRU search results</title>
3
[% INCLUDE 'greybox.inc' %]
3
[% INCLUDE 'greybox.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
5
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
5
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
Lines 54-60 $(document).ready(function(){ Link Here
54
        });
54
        });
55
    $("form[name='f']").submit(function(){
55
    $("form[name='f']").submit(function(){
56
        if ($('input[type=checkbox]').filter(':checked').length == 0) {
56
        if ($('input[type=checkbox]').filter(':checked').length == 0) {
57
            alert(_("Please choose at least one Z39.50 target"));
57
            alert(_("Please choose at least one external target"));
58
            return false;
58
            return false;
59
        } else
59
        } else
60
            return true;
60
            return true;
Lines 101-107 tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : Link Here
101
[% END %]
101
[% END %]
102
      <div id="bd">
102
      <div id="bd">
103
	  [% IF ( opsearch ) %]
103
	  [% IF ( opsearch ) %]
104
<h2>Z39.50 search points</h2>
104
<h2>Z39.50/SRU search</h2>
105
    <form method="post" action="z3950_search.pl" name="f" class="checkboxed">
105
    <form method="post" action="z3950_search.pl" name="f" class="checkboxed">
106
    <input type="hidden" name="op" id="op" value="do_search" />
106
    <input type="hidden" name="op" id="op" value="do_search" />
107
	<div class="yui-g">
107
	<div class="yui-g">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/z3950/searchresult.tt (-46 lines)
Lines 1-45 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Z39.50 search results</title>
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript">
5
//<![CDATA[
6
    function Import(GetThisOne) {
7
        opener.document.location= "../cataloguing/addbiblio.pl?z3950=1&oldbiblionumber=[% oldbiblionumber %]&breedingid="+GetThisOne;
8
        self.close();
9
        return false;
10
    }
11
//]]>
12
</script>
13
</head>
14
<body id="cat_searchresult" class="cat">
15
16
    <h2>Z3950 search results</h2>
17
    
18
    [% IF ( breeding_loop ) %]
19
<table>
20
    <tr>
21
        <th>Title</th>
22
        <th>Author</th>
23
        <th>ISBN</th>
24
        <th>Coming from</th>
25
        <th>&nbsp;</th>
26
        <th>&nbsp;</th>
27
    </tr>
28
                [% FOREACH breeding_loo IN breeding_loop %]
29
        <tr bgcolor="[% breeding_loo.toggle %]">
30
                        <td>[% breeding_loo.title |html %]</td>
31
            <td>[% breeding_loo.author %]</td>
32
            <td>[% breeding_loo.isbn %]</td>
33
            <td>[% breeding_loo.file %]</td>
34
            <td><a href="javascript:Import([% breeding_loo.id %])">Import this biblio</a></td>
35
        </tr>
36
    [% END %]
37
        </table>
38
    [% ELSE %]
39
                <p>Nothing found</p>
40
    [% END %]
41
    [% IF ( numberpending ) %]<h1>Still [% numberpending %] requests to go</h1>[% END %]
42
    
43
44
</body>
45
</html>
46
- 

Return to bug 6536