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

(-)a/installer/data/mysql/sysprefs.sql (+1 lines)
Lines 199-204 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
199
('OAI-PMH:MaxCount','50',NULL,'OAI-PMH maximum number of records by answer to ListRecords and ListIdentifiers queries','Integer'),
199
('OAI-PMH:MaxCount','50',NULL,'OAI-PMH maximum number of records by answer to ListRecords and ListIdentifiers queries','Integer'),
200
('OCLCAffiliateID','','','Use with FRBRizeEditions and XISBN. You can sign up for an AffiliateID here: http://www.worldcat.org/wcpa/do/AffiliateUserServices?method=initSelfRegister','free'),
200
('OCLCAffiliateID','','','Use with FRBRizeEditions and XISBN. You can sign up for an AffiliateID here: http://www.worldcat.org/wcpa/do/AffiliateUserServices?method=initSelfRegister','free'),
201
('OpacAddMastheadLibraryPulldown','0','','Adds a pulldown menu to select the library to search on the opac masthead.','YesNo'),
201
('OpacAddMastheadLibraryPulldown','0','','Adds a pulldown menu to select the library to search on the opac masthead.','YesNo'),
202
('OpacAdvSearch','pubdate|itemtype|language|subtype|sorting|location','Show search options','pubdate|itemtype|language|subtype|sorting|location','multiple'),
202
('OPACAllowHoldDateInFuture','0','','If set, along with the AllowHoldDateInFuture system preference, OPAC users can set the date of a hold to be in the future.','YesNo'),
203
('OPACAllowHoldDateInFuture','0','','If set, along with the AllowHoldDateInFuture system preference, OPAC users can set the date of a hold to be in the future.','YesNo'),
203
('OpacAllowPublicListCreation','1',NULL,'If set, allows opac users to create public lists','YesNo'),
204
('OpacAllowPublicListCreation','1',NULL,'If set, allows opac users to create public lists','YesNo'),
204
('OpacAllowSharingPrivateLists','0',NULL,'If set, allows opac users to share private lists with other patrons','YesNo'),
205
('OpacAllowSharingPrivateLists','0',NULL,'If set, allows opac users to share private lists with other patrons','YesNo'),
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 7155-7160 if ( CheckVersion($DBversion) ) { Link Here
7155
    SetVersion($DBversion);
7155
    SetVersion($DBversion);
7156
}
7156
}
7157
7157
7158
$DBversion = "3.13.00.XXX";
7159
if ( CheckVersion($DBversion) ) {
7160
   $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSearch','pubdate|itemtype|language|subtype|sorting|location','Show search options','pubdate|itemtype|language|subtype|sorting|location','multiple');");
7161
   print "Upgrade to $DBversion done (Bug 9043: Add OpacAdvSearch)\n";
7162
   SetVersion ($DBversion);
7163
}
7164
7158
=head1 FUNCTIONS
7165
=head1 FUNCTIONS
7159
7166
7160
=head2 TableExists($table)
7167
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (+11 lines)
Lines 619-621 OPAC: Link Here
619
            - pref: PatronSelfRegistrationAdditionalInstructions
619
            - pref: PatronSelfRegistrationAdditionalInstructions
620
              type: textarea
620
              type: textarea
621
              class: html
621
              class: html
622
    Advanced Search Options:
623
        -
624
            - Show search options
625
            - pref: OpacAdvSearch
626
              multiple:
627
                pubdate: Publication date
628
                itemtype: Item types
629
                language: Language
630
                subtype: Subtypes
631
                sorting: Sorting
632
                location: Location
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt (-2 / +19 lines)
Lines 154-159 Link Here
154
    <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New search]</a>
154
    <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New search]</a>
155
155
156
<!-- /SEARCH BUTTONS --></div></div>
156
<!-- /SEARCH BUTTONS --></div></div>
157
[% IF OpacAdvSearch.grep('pubdate').size > 0 || expanded_options %]
157
<div class="yui-g">
158
<div class="yui-g">
158
<div id="pubrange" class="container">
159
<div id="pubrange" class="container">
159
<fieldset>
160
<fieldset>
Lines 165-171 Link Here
165
<!-- /PUB RANGE OPTION -->
166
<!-- /PUB RANGE OPTION -->
166
</div>
167
</div>
167
</div>
168
</div>
169
[% END %]
170
168
    <div class="yui-g">
171
    <div class="yui-g">
172
[% IF OpacAdvSearch.grep('itemtype').size > 0 || expanded_options %]
169
      <div id="advsearches" class="toptabs">
173
      <div id="advsearches" class="toptabs">
170
      <ul>
174
      <ul>
171
      [% FOREACH advsearchloo IN advancedsearchesloop %]
175
      [% FOREACH advsearchloo IN advancedsearchesloop %]
Lines 197-202 Link Here
197
    </div>
201
    </div>
198
    [% END %]
202
    [% END %]
199
    </div>
203
    </div>
204
[% END %]
205
206
[% IF OpacAdvSearch.grep('language').size > 0 || expanded_options %]
200
    <div id="langfilter">
207
    <div id="langfilter">
201
    <fieldset><legend>Language</legend>
208
    <fieldset><legend>Language</legend>
202
    <!-- LANGUAGE LIMIT -->
209
    <!-- LANGUAGE LIMIT -->
Lines 214-220 Link Here
214
    <!-- /LANGUAGE LIMIT -->
221
    <!-- /LANGUAGE LIMIT -->
215
    </fieldset>
222
    </fieldset>
216
    </div>
223
    </div>
217
[% IF ( expanded_options ) %]
224
[% END %]
225
226
[% IF OpacAdvSearch.grep('subtype').size > 0 || expanded_options %]
218
    [% IF ( usmarc ) %]
227
    [% IF ( usmarc ) %]
219
        <!-- SUBTYPE LIMITS -->
228
        <!-- SUBTYPE LIMITS -->
220
            <div id="subtypes" class="container"><fieldset>
229
            <div id="subtypes" class="container"><fieldset>
Lines 287-296 Link Here
287
    [% INCLUDE 'subtypes_unimarc.inc' %]</div>
296
    [% INCLUDE 'subtypes_unimarc.inc' %]</div>
288
    [% END %]
297
    [% END %]
289
[% END %]
298
[% END %]
290
        
291
</div>
299
</div>
300
292
<div class="yui-g">
301
<div class="yui-g">
293
302
303
[% IF OpacAdvSearch.grep('location').size > 0 || expanded_options %]
294
<div class="yui-u first">
304
<div class="yui-u first">
295
<!-- AVAILABILITY LIMITS -->
305
<!-- AVAILABILITY LIMITS -->
296
    [% UNLESS ( singleBranchMode ) %]
306
    [% UNLESS ( singleBranchMode ) %]
Lines 321-326 Link Here
321
    [% END %]
331
    [% END %]
322
<!-- /AVAILABILITY LIMITS -->
332
<!-- /AVAILABILITY LIMITS -->
323
</div>
333
</div>
334
[% END%]
335
336
[% IF OpacAdvSearch.grep('sorting').size > 0 || expanded_options %]
324
<div class="yui-u">
337
<div class="yui-u">
325
<!-- RANK LIMITS -->
338
<!-- RANK LIMITS -->
326
    <div id="sortby" class="container"><fieldset><legend>Sorting: </legend>
339
    <div id="sortby" class="container"><fieldset><legend>Sorting: </legend>
Lines 329-336 Link Here
329
</select></fieldset></div>
342
</select></fieldset></div>
330
<!-- RANK LIMITS -->
343
<!-- RANK LIMITS -->
331
</div>
344
</div>
345
[% END %]
332
</div>
346
</div>
333
347
348
[% IF OpacAdvSearch.size > 0 || expanded_options %]
334
<div class="yui-g"><div class="container" style="text-align: center;"><!-- SEARCH BUTTONS -->
349
<div class="yui-g"><div class="container" style="text-align: center;"><!-- SEARCH BUTTONS -->
335
350
336
    <input class="submit" type="submit" accesskey="s" name="do" title="Search" value="Search" />
351
    <input class="submit" type="submit" accesskey="s" name="do" title="Search" value="Search" />
Lines 344-349 Link Here
344
<!-- /SEARCH BUTTONS --></div></div>
359
<!-- /SEARCH BUTTONS --></div></div>
345
</form>
360
</form>
346
</div>
361
</div>
362
[% END %]
363
347
<script type="text/javascript" language="javascript">
364
<script type="text/javascript" language="javascript">
348
    /* This function allows to display a new field to search.
365
    /* This function allows to display a new field to search.
349
    */
366
    */
(-)a/opac/opac-search.pl (-2 / +4 lines)
Lines 147-154 elsif (C4::Context->preference("marcflavour") eq "MARC21" ) { Link Here
147
$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
147
$template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHolds') );
148
$template->param( 'OPACNoResultsFound' => C4::Context->preference('OPACNoResultsFound') );
148
$template->param( 'OPACNoResultsFound' => C4::Context->preference('OPACNoResultsFound') );
149
149
150
my @advsearch_limits = split /\|/, C4::Context->preference('OpacAdvSearch');
150
$template->param(
151
$template->param(
151
    OpacStarRatings => C4::Context->preference("OpacStarRatings") );
152
    OpacStarRatings => C4::Context->preference("OpacStarRatings"),
153
    OpacAdvSearch => \@advsearch_limits,
154
);
152
155
153
if (C4::Context->preference('BakerTaylorEnabled')) {
156
if (C4::Context->preference('BakerTaylorEnabled')) {
154
    $template->param(
157
    $template->param(
155
- 

Return to bug 9043