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

(-)a/installer/data/mysql/en/mandatory/sysprefs.sql (+1 lines)
Lines 308-311 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
308 
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Display856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','OFF|Details|Results|Both','Choice');
 308 
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('Display856uAsImage','OFF','Display the URI in the 856u field as an image, the corresponding Staff Client XSLT option must be on','OFF|Details|Results|Both','Choice');
309 
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');
 309 
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('AlternateHoldingsSeparator','','The string to use to separate subfields in alternate holdings displays.',NULL,'free');
 310 
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('numSearchRSSResults',50,'Specify the maximum number of results to display on a RSS page of results',NULL,'Integer');
311 

          312
          

        



(-)a/installer/data/mysql/updatedatabase.pl
      (+9 lines)




  

    
      
            Lines 4259-4264
          if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
      
      
        Link Here
      
    
  

        

          4259
          
    SetVersion($DBversion);

          4259
          
    SetVersion($DBversion);

        

        

          4260
          
}

          4260
          
}

        

        

          4261
          

          4261
          

        

            

              
              
              4262
              
$DBversion = "XXX";

            

            

              4263
              
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {

            

            

              4264
              
    $dbh->do(qq{

            

            

              4265
              
    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');

            

            

              4266
              
    });

            

            

              4267
              
    print "Upgrade to $DBversion done (Adds New System preference numSearchRSSResults)\n";

            

            

              4268
              
    SetVersion($DBversion);

            

            

              4269
              
}

            

            

              4270
              

            

        

          4262
          
=head1 FUNCTIONS

          4271
          
=head1 FUNCTIONS

        

        

          4263
          

          4272
          

        

        

          4264
          
=head2 DropAllForeignKeys($table)

          4273
          
=head2 DropAllForeignKeys($table)

        



(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
      (+4 lines)




  

    
      
            Lines 251-256
          OPAC:
      
      
        Link Here
      
    
  

        

          251
          
                  yes: Allow

          251
          
                  yes: Allow

        

        

          252
          
                  no: "Don't allow"

          252
          
                  no: "Don't allow"

        

        

          253
          
            - patrons to place holds on items from the OPAC.

          253
          
            - patrons to place holds on items from the OPAC.

        

            

              
              
              254
              
        -

            

            

              255
              
            - pref: numSearchRSSResults

            

            

              256
              
              class: long

            

            

              257
              
            - Specify the maximum number of results to display on a RSS page of results.

            

        

          254
          
    Policy:

          258
          
    Policy:

        

        

          255
          
        -

          259
          
        -

        

        

          256
          
            - pref: singleBranchMode

          260
          
            - 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
          
<!-- TMPL_IF NAME="searchdesc" --><p><!-- TMPL_IF name="total" --><strong>&ldquo;<!-- TMPL_VAR NAME="query_desc" ESCAPE="HTML"--> <!-- TMPL_VAR NAME="limit_desc" ESCAPE="HTML"-->&rdquo; </strong>returned <!-- TMPL_VAR NAME="total" ESCAPE="HTML"--> results. <!-- TMPL_IF NAME="related" --> (related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->). <!-- /TMPL_IF -->

          178
          
<!-- TMPL_IF NAME="searchdesc" --><p><!-- TMPL_IF name="total" --><strong>&ldquo;<!-- TMPL_VAR NAME="query_desc" ESCAPE="HTML"--> <!-- TMPL_VAR NAME="limit_desc" ESCAPE="HTML"-->&rdquo; </strong>returned <!-- TMPL_VAR NAME="total" ESCAPE="HTML"--> results. <!-- TMPL_IF NAME="related" --> (related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->). <!-- /TMPL_IF -->

        

          
            

              179
              
<a href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi"  ESCAPE="HTML" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" ESCAPE="HTML" --><!-- /TMPL_IF -->&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="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" ESCAPE="HTML" -->&amp;count=<!-- TMPL_VAR NAME="countrss" ESCAPE="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
          
<!-- TMPL_ELSE -->

          180
          
<!-- TMPL_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.tmpl
      (-1 lines)




  

    
      
            Lines 8-14
          
      
      
        Link Here
      
    
  

        

          8
          
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

          8
          
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->

        

        

          9
          
<link rel="alternate" type="application/rss+xml" title="<!-- TMPL_VAR NAME="LibraryName" ESCAPE="HTML" --> Search RSS Feed" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" ESCAPE="HTML" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" ESCAPE="HTML" --><!-- /TMPL_IF -->&amp;format=rss2" />

          9
          
<link rel="alternate" type="application/rss+xml" title="<!-- TMPL_VAR NAME="LibraryName" ESCAPE="HTML" --> Search RSS Feed" href="<!-- TMPL_VAR NAME="OPACBaseURL" -->/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR name="query_cgi" ESCAPE="HTML" --><!-- TMPL_VAR NAME="limit_cgi" ESCAPE="HTML" --><!-- TMPL_IF NAME="sort_by" -->&amp;sort_by=<!-- TMPL_VAR NAME="sort_by" ESCAPE="HTML" --><!-- /TMPL_IF -->&amp;format=rss2" />

        

        

          10
          

          10
          

        

            

              11
              

              
              
            

        

          12
          
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>

          11
          
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>

        

        

          13
          
<!-- TMPL_IF NAME="OpacHighlightedWords" --><script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.highlight-3.js"></script>

          12
          
<!-- TMPL_IF NAME="OpacHighlightedWords" --><script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.highlight-3.js"></script>

        

        

          14
          
<!-- /TMPL_IF --><script type="text/javascript">

          13
          
<!-- /TMPL_IF --><script type="text/javascript">

        



(-)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.046';


              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