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

(-)a/installer/data/mysql/sysprefs.sql (+6 lines)
Lines 411-413 INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ( Link Here
411
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('IDreamBooksReviews','0','Display book review snippets from IDreamBooks.com','','YesNo');
411
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('IDreamBooksReviews','0','Display book review snippets from IDreamBooks.com','','YesNo');
412
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('IDreamBooksReadometer','0','Display Readometer from IDreamBooks.com','','YesNo');
412
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('IDreamBooksReadometer','0','Display Readometer from IDreamBooks.com','','YesNo');
413
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('IDreamBooksResults','0','Display IDreamBooks.com rating in search results','','YesNo');
413
INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('IDreamBooksResults','0','Display IDreamBooks.com rating in search results','','YesNo');
414
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSearchItemType','both','Choose whether or not to show Item Type selection options on Fewer and More options pages','neither|moreonly|both','Choice');
415
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSearchLanguage','both','Choose whether or not to show Langague selection options on Fewer and More options pages','neither|moreonly|both','Choice');
416
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSearchLocation','both','Choose whether or not to show Location Availability selection options on Fewer and More options pages','neither|moreonly|both','Choice');
417
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSearchPubDate','both','Choose whether or not to show Publication Date Range selection options on Fewer and More options pages','neither|moreonly|both','Choice');
418
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSearchSorting','both','Choose whether or not to show the Sorting options on Fewer and More options pages','neither|moreonly|both','Choice');
419
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSearchSubtype','moreonly','Choose whether or not to show the Subtype Limiting  options on Fewer and More options pages','neither|moreonly|both','Choice');
(-)a/installer/data/mysql/updatedatabase.pl (+12 lines)
Lines 6400-6405 if ( CheckVersion($DBversion) ) { Link Here
6400
}
6400
}
6401
6401
6402
6402
6403
$DBversion = 'XXX';
6404
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
6405
   $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSearchItemType','both','Choose whether or not to show Item Type selection options on Fewer and More options pages','neither|moreonly|both','Choice');");
6406
   $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSearchLanguage','both','Choose whether or not to show Langague selection options on Fewer and More options pages','neither|moreonly|both','Choice');");
6407
   $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSearchLocation','both','Choose whether or not to show Location Availability selection options on Fewer and More options pages','neither|moreonly|both','Choice');");
6408
   $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSearchPubDate','both','Choose whether or not to show Publication Date Range selection options on Fewer and More options pages','neither|moreonly|both','Choice');");
6409
   $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSearchSorting','both','Choose whether or not to show the Sorting options on Fewer and More options pages','neither|moreonly|both','Choice');");
6410
   $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSearchSubtype','moreonly','Choose whether or not to show the Subtype Limiting  options on Fewer and More options pages','neither|moreonly|both','Choice');");
6411
   print "Upgrade to $DBversion done (Add OpacAdvSearchItemType, OpacAdvSearchLanguage, OpacAdvSearchLocation, OpacAdvSearchPubDate, OpacAdvSeachSorting, and OpacAdvSeachSubtype to syspref)\n";
6412
   SetVersion ($DBversion);
6413
}
6414
6403
=head1 FUNCTIONS
6415
=head1 FUNCTIONS
6404
6416
6405
=head2 TableExists($table)
6417
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (+45 lines)
Lines 573-575 OPAC: Link Here
573
            - pref: PatronSelfRegistrationBorrowerUnwantedField
573
            - pref: PatronSelfRegistrationBorrowerUnwantedField
574
              class: multi
574
              class: multi
575
            - (separate columns with |)
575
            - (separate columns with |)
576
            - "the item collection code when finding items for the shelf browser."
577
578
    Advanced Search Options:
579
        -
580
            - "Show item type search options"
581
            - pref: OpacAdvSearchItemType
582
              choices:
583
                neither: never
584
                moreonly: only on More Options page
585
                both: always
586
        -
587
            - "Show publication date range search options"
588
            - pref: OpacAdvSearchPubDate
589
              choices:
590
                neither: never
591
                moreonly: only on More Options page
592
                both: always
593
        -
594
            - "Show language search options"
595
            - pref: OpacAdvSearchLanguage
596
              choices:
597
                neither: never
598
                moreonly: only on More Options page
599
                both: always
600
        -
601
            - "Show location and availability search options"
602
            - pref: OpacAdvSearchLocation
603
              choices:
604
                neither: never
605
                moreonly: only on More Options page
606
                both: always
607
        -
608
            - "Show sorting search options"
609
            - pref: OpacAdvSearchSorting
610
              choices:
611
                neither: never
612
                moreonly: only on More Options page
613
                both: always
614
        -
615
            - "Show subtype search limits"
616
            - pref: OpacAdvSearchSubtype
617
              choices:
618
                neither: never
619
                moreonly: only on More Options page
620
                both: always
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt (-2 / +17 lines)
Lines 129-134 Link Here
129
    <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New search]</a>
129
    <a href="/cgi-bin/koha/opac-search.pl?do=Clear">[New search]</a>
130
130
131
<!-- /SEARCH BUTTONS --></div></div>
131
<!-- /SEARCH BUTTONS --></div></div>
132
[% IF OpacAdvSearchPubDate == "both" || ( OpacAdvSearchPubDate == "moreonly"  && expanded_options) %]
132
<div class="yui-g">
133
<div class="yui-g">
133
<div id="pubrange" class="container">
134
<div id="pubrange" class="container">
134
<fieldset>
135
<fieldset>
Lines 140-145 Link Here
140
<!-- /PUB RANGE OPTION -->
141
<!-- /PUB RANGE OPTION -->
141
</div>
142
</div>
142
</div>
143
</div>
144
[% END %]
145
<!-- ITEM TYPE OPTIONS -->
146
[% IF OpacAdvSearchItemType == "both" || (OpacAdvSearchItemType == "moreonly"  && expanded_options) %]
143
    <div class="yui-g">
147
    <div class="yui-g">
144
      <div id="advsearches" class="toptabs">
148
      <div id="advsearches" class="toptabs">
145
      <ul>
149
      <ul>
Lines 172-177 Link Here
172
    </div>
176
    </div>
173
    [% END %]
177
    [% END %]
174
    </div>
178
    </div>
179
    [% END %]
180
<!-- /ITEM TYPE OPTIONS -->
181
[% IF OpacAdvSearchLanguage == "both" || ( OpacAdvSearchLanguage == "moreonly"  && expanded_options) %]
175
    <div id="langfilter">
182
    <div id="langfilter">
176
    <fieldset><legend>Language</legend>
183
    <fieldset><legend>Language</legend>
177
    <!-- LANGUAGE LIMIT -->
184
    <!-- LANGUAGE LIMIT -->
Lines 189-195 Link Here
189
    <!-- /LANGUAGE LIMIT -->
196
    <!-- /LANGUAGE LIMIT -->
190
    </fieldset>
197
    </fieldset>
191
    </div>
198
    </div>
192
[% IF ( expanded_options ) %]
199
    [% END %]
200
    <!-- SUB TYPE OPTIONS -->
201
[% IF OpacAdvSeachSubtype == "both" || ( OpacAdvSeachSubtype == "moreonly"  && expanded_options) %]
193
    [% IF ( usmarc ) %]
202
    [% IF ( usmarc ) %]
194
        <!-- SUBTYPE LIMITS -->
203
        <!-- SUBTYPE LIMITS -->
195
            <div id="subtypes" class="container"><fieldset>
204
            <div id="subtypes" class="container"><fieldset>
Lines 261-269 Link Here
261
        <div id="subtypes_unimarc" class="container"><!-- SUBTYPE LIMITS -->
270
        <div id="subtypes_unimarc" class="container"><!-- SUBTYPE LIMITS -->
262
    [% INCLUDE 'subtypes_unimarc.inc' %]</div>
271
    [% INCLUDE 'subtypes_unimarc.inc' %]</div>
263
    [% END %]
272
    [% END %]
264
[% END %]
273
[% END %]<!-- SUB TYPE OPTIONS -->
265
        
274
        
266
</div>
275
</div>
276
277
[% IF OpacAdvSearchLocation == "both" || ( OpacAdvSearchLocation == "moreonly"  && expanded_options) %]
267
<div class="yui-g">
278
<div class="yui-g">
268
279
269
<div class="yui-u first">
280
<div class="yui-u first">
Lines 296-301 Link Here
296
    [% END %]
307
    [% END %]
297
<!-- /AVAILABILITY LIMITS -->
308
<!-- /AVAILABILITY LIMITS -->
298
</div>
309
</div>
310
[% END %]
311
312
[% IF OpacAdvSeachSorting == "both" || ( OpacAdvSeachSorting == "moreonly"  && expanded_options) %]
299
<div class="yui-u">
313
<div class="yui-u">
300
<!-- RANK LIMITS -->
314
<!-- RANK LIMITS -->
301
    <div id="sortby" class="container"><fieldset><legend>Sorting: </legend>
315
    <div id="sortby" class="container"><fieldset><legend>Sorting: </legend>
Lines 305-310 Link Here
305
<!-- RANK LIMITS -->
319
<!-- RANK LIMITS -->
306
</div>
320
</div>
307
</div>
321
</div>
322
[% END %]
308
323
309
<div class="yui-g"><div class="container" style="text-align: center;"><!-- SEARCH BUTTONS -->
324
<div class="yui-g"><div class="container" style="text-align: center;"><!-- SEARCH BUTTONS -->
310
325
(-)a/opac/opac-search.pl (-1 / +9 lines)
Lines 128-133 $template->param( 'AllowOnShelfHolds' => C4::Context->preference('AllowOnShelfHo Link Here
128
$template->param( 'OPACNoResultsFound' => C4::Context->preference('OPACNoResultsFound') );
128
$template->param( 'OPACNoResultsFound' => C4::Context->preference('OPACNoResultsFound') );
129
129
130
$template->param(
130
$template->param(
131
    'OpacAdvSearchItemType' => C4::Context->preference('OpacAdvSearchItemType'),
132
    'OpacAdvSearchPubDate'  => C4::Context->preference('OpacAdvSearchPubDate'),
133
    'OpacAdvSearchLanguage' => C4::Context->preference('OpacAdvSearchLanguage'),
134
    'OpacAdvSearchLocation' => C4::Context->preference('OpacAdvSearchLocation'),
135
    'OpacAdvSeachSorting'   => C4::Context->preference('OpacAdvSearchSorting'),
136
    'OpacAdvSeachSubtype'   => C4::Context->preference('OpacAdvSearchSubtype'),
137
);
138
139
$template->param(
131
    OpacStarRatings => C4::Context->preference("OpacStarRatings") );
140
    OpacStarRatings => C4::Context->preference("OpacStarRatings") );
132
141
133
if (C4::Context->preference('BakerTaylorEnabled')) {
142
if (C4::Context->preference('BakerTaylorEnabled')) {
134
- 

Return to bug 9043