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

(-)a/installer/data/mysql/en/mandatory/sysprefs.sql (+1 lines)
Lines 310-312 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
310
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
310
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsField','','The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).',NULL,'free');
311
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
311
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
312
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
312
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacHiddenItems','','This syspref allows to define custom rules for hiding specific items at opac. See docs/opac/OpacHiddenItems.txt for more informations.','','Textarea');
313
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
(-)a/installer/data/mysql/updatedatabase.pl (+9 lines)
Lines 4304-4309 if (C4::Context->preference("Version") < TransformToNum($DBversion)) { Link Here
4304
    SetVersion ($DBversion);
4304
    SetVersion ($DBversion);
4305
}
4305
}
4306
4306
4307
$DBversion = "XXX";
4308
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
4309
    $dbh->do(qq{
4310
    INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
4311
    });
4312
    print "Upgrade to $DBversion done (Adds New System preference numSearchRSSResults)\n";
4313
    SetVersion($DBversion);
4314
}
4315
4307
=head1 FUNCTIONS
4316
=head1 FUNCTIONS
4308
4317
4309
=head2 DropAllForeignKeys($table)
4318
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (+4 lines)
Lines 257-262 OPAC: Link Here
257
                  yes: Allow
257
                  yes: Allow
258
                  no: "Don't allow"
258
                  no: "Don't allow"
259
            - patrons to place holds on items from the OPAC.
259
            - patrons to place holds on items from the OPAC.
260
        -
261
            - pref: numSearchRSSResults
262
              class: long
263
            - Specify the maximum number of results to display on a RSS page of results.
260
    Policy:
264
    Policy:
261
        -
265
        -
262
            - pref: singleBranchMode
266
            - pref: singleBranchMode
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc (-1 / +1 lines)
Lines 176-182 Link Here
176
</div>
176
</div>
177
<div id="breadcrumbs" class="yui-g">
177
<div id="breadcrumbs" class="yui-g">
178
[% IF ( searchdesc ) %]<p>[% IF ( total ) %]<strong>&ldquo;[% query_desc |html %] [% limit_desc |html %]&rdquo; </strong>returned [% total |html %] results. [% IF ( related ) %] (related searches: [% FOREACH relate IN related %][% relate.related_search %][% END %]). [% END %]
178
[% IF ( searchdesc ) %]<p>[% IF ( total ) %]<strong>&ldquo;[% query_desc |html %] [% limit_desc |html %]&rdquo; </strong>returned [% total |html %] results. [% IF ( related ) %] (related searches: [% FOREACH relate IN related %][% relate.related_search %][% END %]). [% END %]
179
<a href="[% OPACBaseurl %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |html %][% END %]&amp;format=rss2"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" /></a>
179
<a href="[% OPACBaseurl %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss2"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" /></a>
180
[% ELSE %]
180
[% ELSE %]
181
<strong>No Results Found!</strong>
181
<strong>No Results Found!</strong>
182
<p>
182
<p>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt (-1 / +1 lines)
Lines 6-12 Link Here
6
    You did not specify any search criteria.
6
    You did not specify any search criteria.
7
[% END %]
7
[% END %]
8
[% INCLUDE 'doc-head-close.inc' %]
8
[% INCLUDE 'doc-head-close.inc' %]
9
<link rel="alternate" type="application/rss+xml" title="[% LibraryName |html %] Search RSS Feed" href="[% OPACBaseurl %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |html %][% END %]&amp;format=rss2" />
9
<link rel="alternate" type="application/rss+xml" title="[% LibraryName |html %] Search RSS Feed" href="[% OPACBaseurl %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss2" />
10
10
11
11
12
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
12
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
(-)a/kohaversion.pl (-1 / +1 lines)
Lines 16-22 the kohaversion is divided in 4 parts : Link Here
16
use strict;
16
use strict;
17
17
18
sub kohaversion {
18
sub kohaversion {
19
    our $VERSION = '3.03.00.051';
19
    our $VERSION = 'XXX';
20
    # version needs to be set this way
20
    # version needs to be set this way
21
    # so that it can be picked up by Makefile.PL
21
    # so that it can be picked up by Makefile.PL
22
    # during install
22
    # during install
(-)a/opac/opac-search.pl (-1 / +2 lines)
Lines 348-353 if ($params->{'limit-yr'}) { Link Here
348
# Params that can only have one value
348
# Params that can only have one value
349
my $scan = $params->{'scan'};
349
my $scan = $params->{'scan'};
350
my $count = C4::Context->preference('OPACnumSearchResults') || 20;
350
my $count = C4::Context->preference('OPACnumSearchResults') || 20;
351
my $countRSS         = C4::Context->preference('numSearchRSSResults') || 50;
351
my $results_per_page = $params->{'count'} || $count;
352
my $results_per_page = $params->{'count'} || $count;
352
my $offset = $params->{'offset'} || 0;
353
my $offset = $params->{'offset'} || 0;
353
my $page = $cgi->param('page') || 1;
354
my $page = $cgi->param('page') || 1;
Lines 546-551 for (my $i=0;$i<@servers;$i++) { Link Here
546
            $limit_cgi_not_availablity =~ s/&limit=available//g if defined $limit_cgi_not_availablity;
547
            $limit_cgi_not_availablity =~ s/&limit=available//g if defined $limit_cgi_not_availablity;
547
            $template->param(limit_cgi_not_availablity => $limit_cgi_not_availablity);
548
            $template->param(limit_cgi_not_availablity => $limit_cgi_not_availablity);
548
            $template->param(limit_cgi => $limit_cgi);
549
            $template->param(limit_cgi => $limit_cgi);
550
            $template->param(countrss  => $countRSS );
549
            $template->param(query_cgi => $query_cgi);
551
            $template->param(query_cgi => $query_cgi);
550
            $template->param(query_desc => $query_desc);
552
            $template->param(query_desc => $query_desc);
551
            $template->param(limit_desc => $limit_desc);
553
            $template->param(limit_desc => $limit_desc);
552
- 

Return to bug 6143