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

(-)a/installer/data/mysql/sysprefs.sql (+6 lines)
Lines 386-388 INSERT INTO systempreferences (variable,value,explanation,type) VALUES('OPACdidy Link Here
386
INSERT INTO systempreferences (variable,value,explanation,type) VALUES('INTRAdidyoumean',NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free');
386
INSERT INTO systempreferences (variable,value,explanation,type) VALUES('INTRAdidyoumean',NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free');
387
INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('BlockReturnOfWithdrawnItems', '1', '0', 'If enabled, items that are marked as withdrawn cannot be returned.', 'YesNo');
387
INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('BlockReturnOfWithdrawnItems', '1', '0', 'If enabled, items that are marked as withdrawn cannot be returned.', 'YesNo');
388
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('HoldsToPullStartDate','2','Set the default start date for the Holds to pull list to this many days ago',NULL,'Integer');
388
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('HoldsToPullStartDate','2','Set the default start date for the Holds to pull list to this many days ago',NULL,'Integer');
389
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');
390
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');
391
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');
392
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');
393
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSeachSorting','both','Choose whether or not to show the Sorting options on Fewer and More options pages','neither|moreonly|both','Choice');
394
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSeachSubtype','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 6049-6054 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
6049
}
6049
}
6050
6050
6051
6051
6052
$DBversion = 'XXX';
6053
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
6054
   $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');");
6055
   $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');");
6056
   $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');");
6057
   $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');");
6058
   $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSeachSorting','both','Choose whether or not to show the Sorting options on Fewer and More options pages','neither|moreonly|both','Choice');");
6059
   $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('OpacAdvSeachSubtype','moreonly','Choose whether or not to show the Subtype Limiting  options on Fewer and More options pages','neither|moreonly|both','Choice');");
6060
   print "Upgrade to $DBversion done (Add OpacAdvSearchItemType, OpacAdvSearchLanguage, OpacAdvSearchLocation, OpacAdvSearchPubDate, OpacAdvSeachSorting, and OpacAdvSeachSubtype to syspref)\n";
6061
   SetVersion ($DBversion);
6062
}
6063
6052
=head1 FUNCTIONS
6064
=head1 FUNCTIONS
6053
6065
6054
=head2 TableExists($table)
6066
=head2 TableExists($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-1 / +45 lines)
Lines 526-529 OPAC: Link Here
526
              choices:
526
              choices:
527
                  yes: Use
527
                  yes: Use
528
                  no: "Don't use"
528
                  no: "Don't use"
529
            - "the item collection code when finding items for the shelf browser."      
529
            - "the item collection code when finding items for the shelf browser."
530
531
    Advanced Search Options:
532
        -
533
            - "Show item type search options"
534
            - pref: OpacAdvSearchItemType
535
              choices:
536
                neither: never
537
                moreonly: only on More Options page
538
                both: always
539
        -
540
            - "Show publication date range search options"
541
            - pref: OpacAdvSearchPubDate
542
              choices:
543
                neither: never
544
                moreonly: only on More Options page
545
                both: always
546
        -
547
            - "Show language search options"
548
            - pref: OpacAdvSearchLanguage
549
              choices:
550
                neither: never
551
                moreonly: only on More Options page
552
                both: always
553
        -
554
            - "Show location and availability search options"
555
            - pref: OpacAdvSearchLocation
556
              choices:
557
                neither: never
558
                moreonly: only on More Options page
559
                both: always
560
        -
561
            - "Show sorting search options"
562
            - pref: OpacAdvSeachSorting
563
              choices:
564
                neither: never
565
                moreonly: only on More Options page
566
                both: always
567
        -
568
            - "Show subtype search limits"
569
            - pref: OpacAdvSeachSubtype
570
              choices:
571
                neither: never
572
                moreonly: only on More Options page
573
                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 257-265 Link Here
257
        <div id="subtypes_unimarc" class="container"><!-- SUBTYPE LIMITS -->
266
        <div id="subtypes_unimarc" class="container"><!-- SUBTYPE LIMITS -->
258
    [% INCLUDE 'subtypes_unimarc.inc' %]</div>
267
    [% INCLUDE 'subtypes_unimarc.inc' %]</div>
259
    [% END %]
268
    [% END %]
260
[% END %]
269
[% END %]<!-- SUB TYPE OPTIONS -->
261
        
270
        
262
</div>
271
</div>
272
273
[% IF OpacAdvSearchLocation == "both" || ( OpacAdvSearchLocation == "moreonly"  && expanded_options) %]
263
<div class="yui-g">
274
<div class="yui-g">
264
275
265
<div class="yui-u first">
276
<div class="yui-u first">
Lines 292-297 Link Here
292
    [% END %]
303
    [% END %]
293
<!-- /AVAILABILITY LIMITS -->
304
<!-- /AVAILABILITY LIMITS -->
294
</div>
305
</div>
306
[% END %]
307
308
[% IF OpacAdvSeachSorting == "both" || ( OpacAdvSeachSorting == "moreonly"  && expanded_options) %]
295
<div class="yui-u">
309
<div class="yui-u">
296
<!-- RANK LIMITS -->
310
<!-- RANK LIMITS -->
297
    <div id="sortby" class="container"><fieldset><legend>Sorting: </legend>
311
    <div id="sortby" class="container"><fieldset><legend>Sorting: </legend>
Lines 301-306 Link Here
301
<!-- RANK LIMITS -->
315
<!-- RANK LIMITS -->
302
</div>
316
</div>
303
</div>
317
</div>
318
[% END %]
304
319
305
<div class="yui-g"><div class="container" style="text-align: center;"><!-- SEARCH BUTTONS -->
320
<div class="yui-g"><div class="container" style="text-align: center;"><!-- SEARCH BUTTONS -->
306
321
(-)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('OpacAdvSeachSorting'),
136
    'OpacAdvSeachSubtype'   => C4::Context->preference('OpacAdvSeachSubtype'),
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