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

(-)a/C4/Auth.pm (-4 lines)
Lines 526-535 sub get_template_and_user { Link Here
526
            OPACFRBRizeEditions                   => C4::Context->preference("OPACFRBRizeEditions"),
526
            OPACFRBRizeEditions                   => C4::Context->preference("OPACFRBRizeEditions"),
527
            OpacHighlightedWords                  => C4::Context->preference("OpacHighlightedWords"),
527
            OpacHighlightedWords                  => C4::Context->preference("OpacHighlightedWords"),
528
            OPACShelfBrowser                      => "" . C4::Context->preference("OPACShelfBrowser"),
528
            OPACShelfBrowser                      => "" . C4::Context->preference("OPACShelfBrowser"),
529
            OPACURLOpenInNewWindow                => "" . C4::Context->preference("OPACURLOpenInNewWindow"),
530
            OPACUserCSS                           => "" . C4::Context->preference("OPACUserCSS"),
531
            OpacAuthorities                       => C4::Context->preference("OpacAuthorities"),
532
            OpacZ3950                             => C4::Context->preference("OpacZ3950"),
533
            opac_css_override                     => $ENV{'OPAC_CSS_OVERRIDE'},
529
            opac_css_override                     => $ENV{'OPAC_CSS_OVERRIDE'},
534
            opac_search_limit                     => $opac_search_limit,
530
            opac_search_limit                     => $opac_search_limit,
535
            opac_limit_override                   => $opac_limit_override,
531
            opac_limit_override                   => $opac_limit_override,
(-)a/installer/data/mysql/atomicupdate/bug11361.perl (+8 lines)
Line 0 Link Here
1
$DBversion = "XXX";
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do("ALTER TABLE z3950servers ADD COLUMN opac TINYINT(1) AFTER attributes;");
4
    $dbh->do("INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES('OPACZ3950','0','','Allow patrons to search for bibliographic records in other libraries via Z39.50.','YesNo')");
5
    print "Add opac column to z3950servers table.";
6
    print "Add OPACZ3950 preference".;
7
    SetVersion($DBversion);
8
}
(-)a/installer/data/mysql/sysprefs.sql (-2 / +2 lines)
Lines 405-410 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
405
('OPACXSLTDetailsDisplay','default','','Enable XSL stylesheet control over details page display on OPAC','Free'),
405
('OPACXSLTDetailsDisplay','default','','Enable XSL stylesheet control over details page display on OPAC','Free'),
406
('OPACXSLTListsDisplay','default','','Enable XSLT stylesheet control over lists pages display on OPAC','Free'),
406
('OPACXSLTListsDisplay','default','','Enable XSLT stylesheet control over lists pages display on OPAC','Free'),
407
('OPACXSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on OPAC','Free'),
407
('OPACXSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on OPAC','Free'),
408
('OPACZ3950','0','','Allow patrons to search for bibliographic records in other libraries via Z39.50.','YesNo'),
408
('OpenLibraryCovers','0',NULL,'If ON Openlibrary book covers will be show','YesNo'),
409
('OpenLibraryCovers','0',NULL,'If ON Openlibrary book covers will be show','YesNo'),
409
('OpenLibrarySearch','0',NULL,'If Yes Open Library search results will show in OPAC','YesNo'),
410
('OpenLibrarySearch','0',NULL,'If Yes Open Library search results will show in OPAC','YesNo'),
410
('OrderPdfFormat','pdfformat::layout3pages','Controls what script is used for printing (basketgroups)','','free'),
411
('OrderPdfFormat','pdfformat::layout3pages','Controls what script is used for printing (basketgroups)','','free'),
Lines 603-608 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
603
('XSLTListsDisplay','default','','Enable XSLT stylesheet control over lists pages display on intranet','Free'),
604
('XSLTListsDisplay','default','','Enable XSLT stylesheet control over lists pages display on intranet','Free'),
604
('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),
605
('XSLTResultsDisplay','default','','Enable XSL stylesheet control over results page display on intranet','Free'),
605
('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
606
('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
606
('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo'),
607
('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo')
607
('OPACZ3950','0','','Allow patrons to search for bibliographic records in other libraries via Z39.50.','YesNo')
608
;
608
;
(-)a/installer/data/mysql/updatedatabase.pl (-8 lines)
Lines 15613-15626 if( CheckVersion( $DBversion ) ) { Link Here
15613
    print "Upgrade to $DBversion done (Bug 13287 - Add system preference PurgeSuggestionsOlderThan)\n";
15613
    print "Upgrade to $DBversion done (Bug 13287 - Add system preference PurgeSuggestionsOlderThan)\n";
15614
}
15614
}
15615
15615
15616
$DBversion = "XXX";
15617
if( CheckVersion( $DBversion ) ) {
15618
    $dbh->do("ALTER TABLE z3950servers ADD COLUMN opac TINYINT(1);");
15619
    $dbh->do("INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES('OPACZ3950','0','','Allow patrons to search for bibliographic records in other libraries via Z39.50.','YesNo')");
15620
    print "Add opac column to z3950servers table.\nAdd OPACZ3950 preference.\n";
15621
    SetVersion($DBversion);
15622
}
15623
15624
15616
15625
# DEVELOPER PROCESS, search for anything to execute in the db_update directory
15617
# DEVELOPER PROCESS, search for anything to execute in the db_update directory
15626
# SEE bug 13068
15618
# SEE bug 13068
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc (-1 / +1 lines)
Lines 278-284 Link Here
278
                                    [% IF ( Koha.Preference( 'UseCourseReserves' ) == 1 ) %]<li><a href="/cgi-bin/koha/opac-course-reserves.pl">Course reserves</a></li>[% END %]
278
                                    [% IF ( Koha.Preference( 'UseCourseReserves' ) == 1 ) %]<li><a href="/cgi-bin/koha/opac-course-reserves.pl">Course reserves</a></li>[% END %]
279
                                    [% IF Koha.Preference( 'OpacBrowser' ) == 1 %]<li><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a></li>[% END %]
279
                                    [% IF Koha.Preference( 'OpacBrowser' ) == 1 %]<li><a href="/cgi-bin/koha/opac-browser.pl">Browse by hierarchy</a></li>[% END %]
280
                                    [% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]<li><a href="/cgi-bin/koha/opac-authorities-home.pl">Authority search</a></li>[% END %]
280
                                    [% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]<li><a href="/cgi-bin/koha/opac-authorities-home.pl">Authority search</a></li>[% END %]
281
                                    [% IF Koha.Preference( 'OpacZ3950' ) %]<li><span id="z3950searchOpac"><a target="_blank" href="#" >Z39.50 Search</a></span></li>[% END %]
281
                                    [% IF Koha.Preference( 'OpacZ3950' ) %]<li><span id="z3950searchOpac"><a target="_blank" href="#" >Search other catalogs</a></span></li>[% END %]
282
                                    [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'reviewson' ) == 1 ) && ( Koha.Preference( 'OpacShowRecentComments' ) == 1 ) ) %]<li><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a></li>[% END %]
282
                                    [% IF ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'reviewson' ) == 1 ) && ( Koha.Preference( 'OpacShowRecentComments' ) == 1 ) ) %]<li><a href="/cgi-bin/koha/opac-showreviews.pl">Recent comments</a></li>[% END %]
283
                                    [% IF Koha.Preference( 'TagsEnabled' ) == 1 %]<li><a href="/cgi-bin/koha/opac-tags.pl">Tag cloud</a></li>[% END %]
283
                                    [% IF Koha.Preference( 'TagsEnabled' ) == 1 %]<li><a href="/cgi-bin/koha/opac-tags.pl">Tag cloud</a></li>[% END %]
284
                                    [% IF Koha.Preference( 'OpacCloud' ) == 1 %]<li><a href="/cgi-bin/koha/opac-tags_subject.pl">Subject cloud</a></li>[% END %]
284
                                    [% IF Koha.Preference( 'OpacCloud' ) == 1 %]<li><a href="/cgi-bin/koha/opac-tags_subject.pl">Subject cloud</a></li>[% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-z3950-search.tt (-3 / +3 lines)
Lines 65-71 Koha &rsaquo; Z39.50/SRU search results Link Here
65
        <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
65
        <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
66
        <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
66
        <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
67
        <div id="search_params" class="span6 form-horizontal">
67
        <div id="search_params" class="span6 form-horizontal">
68
            <h2>Search Parameters</h2>
68
            <h2>Search parameters</h2>
69
            <div id="search_field" class="well">
69
            <div id="search_field" class="well">
70
                [% FOREACH field IN search_fields %]
70
                [% FOREACH field IN search_fields %]
71
                    <div class="input-prepend input-block-level">
71
                    <div class="input-prepend input-block-level">
Lines 181-191 Koha &rsaquo; Z39.50/SRU search results Link Here
181
        <div class="span4">
181
        <div class="span4">
182
            <div class="input-prepend input-append">
182
            <div class="input-prepend input-append">
183
                [% IF ( show_prevbutton ) %]
183
                [% IF ( show_prevbutton ) %]
184
                    <button class="btn" type="button" name="changepage_prev" onclick="$('#current_page').val([% current_page %]-1);$('#page_form').submit();">Previous Page</button>
184
                    <button class="btn" type="button" name="changepage_prev" onclick="$('#current_page').val([% current_page %]-1);$('#page_form').submit();">Previous page</button>
185
                [% END %]
185
                [% END %]
186
                <span class="add-on">Page [% current_page %] / [% total_pages %]</span>
186
                <span class="add-on">Page [% current_page %] / [% total_pages %]</span>
187
                [% IF ( show_nextbutton ) %]
187
                [% IF ( show_nextbutton ) %]
188
                    <button class="btn" type="button" name="changepage_next" onclick="$('#current_page').val([% current_page %]+1);$('#page_form').submit();">Next Page</button>
188
                    <button class="btn" type="button" name="changepage_next" onclick="$('#current_page').val([% current_page %]+1);$('#page_form').submit();">Next page</button>
189
                [% END %]
189
                [% END %]
190
            </div>
190
            </div>
191
        </div>
191
        </div>
(-)a/opac/opac-z3950-search.pl (-4 / +2 lines)
Lines 18-25 Link Here
18
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# with Koha; if not, write to the Free Software Foundation, Inc.,
19
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20
20
21
use strict;
21
use Modern::Perl;
22
use warnings;
23
use CGI;
22
use CGI;
24
23
25
use C4::Auth;
24
use C4::Auth;
Lines 52-58 my ( $template, $loggedinuser, $cookie ) = get_template_and_user({ Link Here
52
        template_name   => "opac-z3950-search.tt",
51
        template_name   => "opac-z3950-search.tt",
53
        query           => $input,
52
        query           => $input,
54
        type            => "opac",
53
        type            => "opac",
55
        authnotrequired => 1,
54
        authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
56
        debug           => 1,
55
        debug           => 1,
57
});
56
});
58
57
59
- 

Return to bug 11361