@@ -, +, @@ --- .../atomicupdate/bug_14567_add_es_catalog_browse_syspref.perl | 10 ++++++++++ installer/data/mysql/sysprefs.sql | 1 + .../prog/en/modules/admin/preferences/searching.pref | 7 +++++++ koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 1 + koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt | 6 +++++- opac/opac-browse.pl | 2 +- 7 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_14567_add_es_catalog_browse_syspref.perl --- a/installer/data/mysql/atomicupdate/bug_14567_add_es_catalog_browse_syspref.perl +++ a/installer/data/mysql/atomicupdate/bug_14567_add_es_catalog_browse_syspref.perl @@ -0,0 +1,10 @@ +$DBversion = 'XXX'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) + VALUES + ('BrowseInterface', '0',NULL, "Elasticsearch only: add a page allowing users to 'browse' all items in the collection",'YesNo') + }); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 14567: Add BrowseInterface syspref)\n"; +} --- a/installer/data/mysql/sysprefs.sql +++ a/installer/data/mysql/sysprefs.sql @@ -99,6 +99,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('BorrowersTitles','Mr|Mrs|Miss|Ms',NULL,'Define appropriate Titles for patrons','free'), ('BorrowerUnwantedField','',NULL,'Name the fields you don\'t need to store for a patron\'s account','free'), ('BranchTransferLimitsType','ccode','itemtype|ccode','When using branch transfer limits, choose whether to limit by itemtype or collection code.','Choice'), +('BrowseInterface', '0',NULL, "Elasticsearch only: add a page allowing users to 'browse' all items in the collection",'YesNo'), ('BrowseResultSelection','0',NULL,'Enable/Disable browsing search results fromt the bibliographic record detail page in staff client','YesNo'), ('CalculateFinesOnReturn','1','','Switch to control if overdue fines are calculated on return or not','YesNo'), ('CalendarFirstDayOfWeek','0','0|1|2|3|4|5|6','Select the first day of week to use in the calendar.','Choice'), --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref @@ -85,6 +85,13 @@ Searching: yes: Enable no: Disable - "browsing search results from the bibliographic record detail page in staff client." + - + - pref: BrowseInterface + default: 0 + choices: + yes: Enable + no: Disable + - "(Elasticsearch only) Enable the interface allowing to browse all holdings." Search Form: - - Load the unlogged history to the next user. --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss +++ a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss @@ -3364,7 +3364,7 @@ $star-selected: #EDB867; } #browse-searchresults, #browse-selectionsearch { border: 1px solid #E3E3E3; - .border-radius-all(4px); + border-radius: 4px; padding: 0; overflow-y: auto; max-height: 31em; @@ -3424,7 +3424,7 @@ $star-selected: #EDB867; border: 1px solid #E8E8E8; text-align: left; padding: 0.5em; - .border-radius-all(3px); + border-radius: 3px; } .loading { text-align: center; --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc +++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc @@ -277,6 +277,7 @@ [% IF Koha.Preference( 'TagsEnabled' ) == 1 %]
  • Tag cloud
  • [% END %] [% IF Koha.Preference( 'OpacCloud' ) == 1 %]
  • Subject cloud
  • [% END %] [% IF Koha.Preference( 'OpacTopissue' ) == 1 %]
  • Most popular
  • [% END %] + [% IF Koha.Preference('SearchEngine') == 'Elasticsearch' && Koha.Preference( 'BrowseInterface' ) == 1 %]
  • Browse interface
  • [% END %] [% IF Koha.Preference( 'suggestion' ) == 1 %] [% IF Koha.Preference( 'AnonSuggestions' ) == 1 %]
  • Purchase suggestions
  • --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt @@ -8,7 +8,6 @@ [% INCLUDE 'bodytag.inc' bodyid='opac-browser' %] [% INCLUDE 'masthead.inc' %] -
    +
    [% INCLUDE 'opac-bottom.inc' %] [% BLOCK jsinclude %] --- a/opac/opac-browse.pl +++ a/opac/opac-browse.pl @@ -20,7 +20,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. use Modern::Perl; -use CGI; +use CGI qw ( -utf8 ); use C4::Auth; use C4::Context; --