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

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 441-443 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
441
('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
441
('z3950AuthorAuthFields','701,702,700',NULL,'Define the MARC biblio fields for Personal Name Authorities to fill biblio.author','free'),
442
('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo')
442
('z3950NormalizeAuthor','0','','If ON, Personal Name Authorities will replace authors in biblio.author','YesNo')
443
;
443
;
444
INSERT INTO systempreferences (variable,value) VALUES('OpacCustomSearch','');
(-)a/installer/data/mysql/updatedatabase.pl (+12 lines)
Lines 8471-8476 if ( CheckVersion($DBversion) ) { Link Here
8471
    SetVersion($DBversion);
8471
    SetVersion($DBversion);
8472
}
8472
}
8473
8473
8474
$DBversion = "3.12.10.001";
8475
if ( CheckVersion($DBversion) ) {
8476
    $dbh->do(
8477
        q{
8478
INSERT INTO systempreferences (variable,value) VALUES('OpacCustomSearch','');
8479
}
8480
    );
8481
    print
8482
"Upgrade to $DBversion done (Bug 12296 - search box replaceable with a system preference)\n";
8483
    SetVersion($DBversion);
8484
}
8485
8474
=head1 FUNCTIONS
8486
=head1 FUNCTIONS
8475
8487
8476
=head2 TableExists($table)
8488
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (+5 lines)
Lines 300-305 OPAC: Link Here
300
            - pref: NoLoginInstructions
300
            - pref: NoLoginInstructions
301
              type: textarea
301
              type: textarea
302
              class: code
302
              class: code
303
        -
304
            - "Replace the search box at the top of OPAC pages with the following HTML:"
305
            - pref: OpacCustomSearch
306
              type: textarea
307
              class: code
303
    Features:
308
    Features:
304
        -
309
        -
305
            - pref: opacuserlogin
310
            - pref: opacuserlogin
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc (-2 / +6 lines)
Lines 28-34 Link Here
28
28
29
[% IF ( OpacPublic ) %]
29
[% IF ( OpacPublic ) %]
30
<div id="fluid-offset">
30
<div id="fluid-offset">
31
[% UNLESS ( advsearch ) %]<form name="searchform" method="get" action="/cgi-bin/koha/opac-search.pl" id="searchform">
31
[% UNLESS ( advsearch ) %]
32
[% IF Koha.Preference('OpacCustomSearch') == '' %]
33
<form name="searchform" method="get" action="/cgi-bin/koha/opac-search.pl" id="searchform">
32
    <label for="masthead_search" class="left"> Search 
34
    <label for="masthead_search" class="left"> Search 
33
  [% UNLESS Koha.Preference( 'OpacAddMastheadLibraryPulldown' ) == 1 %]
35
  [% UNLESS Koha.Preference( 'OpacAddMastheadLibraryPulldown' ) == 1 %]
34
            [% IF ( mylibraryfirst ) %] (in [% mylibraryfirst %] only)[% END %]
36
            [% IF ( mylibraryfirst ) %] (in [% mylibraryfirst %] only)[% END %]
Lines 124-129 Link Here
124
[% IF ( virtualshelves ) %]<a href="/cgi-bin/koha/opac-shelves.pl" id="listsmenulink">Lists</a>[% END %]
126
[% IF ( virtualshelves ) %]<a href="/cgi-bin/koha/opac-shelves.pl" id="listsmenulink">Lists</a>[% END %]
125
    </form>
127
    </form>
126
[% ELSE %]
128
[% ELSE %]
129
    [% Koha.Preference('OpacCustomSearch') %]
130
[% END %]
131
[% ELSE %]
127
<div style="width:80%;*margin-bottom:-30px;">
132
<div style="width:80%;*margin-bottom:-30px;">
128
[% IF ( virtualshelves ) %]<a href="/cgi-bin/koha/opac-shelves.pl" id="listsmenulink">Lists</a>[% END %][% IF ( opacbookbag ) %]<span id="cmspan"></span>[% END %]
133
[% IF ( virtualshelves ) %]<a href="/cgi-bin/koha/opac-shelves.pl" id="listsmenulink">Lists</a>[% END %][% IF ( opacbookbag ) %]<span id="cmspan"></span>[% END %]
129
</div>
134
</div>
130
- 

Return to bug 12296