Attachment #127363 for bug #24224

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




use Modern::Perl;

return {
    bug_number => "24224",
    description => "Move contents of OpacNavBottom system preference into additional contents",
    up => sub {
        my ($args) = @_;
        my ($dbh, $out) = @$args{qw(dbh out)};

        # Get any existing value from the OpacNavBottom system preference
        my ($opacnavbottom) = $dbh->selectrow_array( q|
            SELECT value FROM systempreferences WHERE variable='OpacNavBottom';
        |);
        if( $opacnavbottom ){
            # If there is a value in the OpacNavBottom preference, insert it into additional_contents
            foreach my $lang ( 'default' ) {
                say $out "Inserting OpacNavBottom contents into default";
                $dbh->do( "INSERT INTO additional_contents ( category, code, location, branchcode, title, content, lang, published_on ) VALUES ('html_customizations', 'OpacNavBottom', 'OpacNavBottom', NULL, ?, ?, ?, CAST(NOW() AS date) )", undef, "OpacNavBottom $lang", $opacnavbottom, $lang );
            }

            # Remove the OpacNavBottom system preference
            $dbh->do("DELETE FROM systempreferences WHERE variable='OpacNavBottom'");
            say $out "Bug 24223 update done";
        } else {
            say $out "No OpacNavBottom preference found. Update has already been run.";
        }

    },
}

Lines 441-447 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (-1 lines)
441	('OpacMoreSearches', '', NULL, 'Add additional elements to the OPAC more searches bar', 'Textarea'),	441	('OpacMoreSearches', '', NULL, 'Add additional elements to the OPAC more searches bar', 'Textarea'),
442	('OPACMySummaryHTML','','70\|10','Enter the HTML that will appear in a column on the \'my summary\' and \'my checkout history\' tabs when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','Textarea'),	442	('OPACMySummaryHTML','','70\|10','Enter the HTML that will appear in a column on the \'my summary\' and \'my checkout history\' tabs when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','Textarea'),
443	('OPACMySummaryNote','','','Note to display on the patron summary page. This note only appears if the patron is connected.','Free'),	443	('OPACMySummaryNote','','','Note to display on the patron summary page. This note only appears if the patron is connected.','Free'),
444	('OpacNavBottom','Important links here.','70\|10','Use HTML tags to add navigational links to the left-hand navigational bar in OPAC','Textarea'),
445	('OpacNewsLibrarySelect','0','','Show selector for branches on OPAC news page','YesNo'),	444	('OpacNewsLibrarySelect','0','','Show selector for branches on OPAC news page','YesNo'),
446	('OpacNoItemTypeImages','0',NULL,'If ON, disables itemtype images in the OPAC','YesNo'),	445	('OpacNoItemTypeImages','0',NULL,'If ON, disables itemtype images in the OPAC','YesNo'),
447	('OPACNoResultsFound','','70\|10','Display this HTML when no results are found for a search in the OPAC','Textarea'),	446	('OPACNoResultsFound','','70\|10','Display this HTML when no results are found for a search in the OPAC','Textarea'),




              type: textarea
              syntax: css
              class: code
        -
            - 'Show the following HTML on the left hand column of the main page and patron account on the OPAC, after <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">OpacNav</a>, and before patron account links if available:'
            - pref: OpacNavBottom
              type: textarea
              syntax: text/html
              class: code
        -
            - 'Include a "More Searches" box on the detail pages of items on the OPAC, with the following HTML (leave blank to disable):'
            - '<br />Note: The placeholders {BIBLIONUMBER}, {CONTROLNUMBER}, {TITLE}, {ISBN}, {ISSN} and {AUTHOR} will be replaced with information from the displayed record.'

Lines 436-442 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt (-1 / +1 lines)
436	<option value="slip">Slip</option>	436	<option value="slip">Slip</option>
437	[% END %]	437	[% END %]
438	[% ELSE %]	438	[% ELSE %]
439	[% FOREACH l IN [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText' ] %]	439	[% FOREACH l IN [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText' ] %]
440	[% IF l == location %]	440	[% IF l == location %]
441	<option value="[% l \| html %]" selected="selected">[% l \| html %]</option>	441	<option value="[% l \| html %]" selected="selected">[% l \| html %]</option>
442	[% ELSE %]	442	[% ELSE %]

Lines 9-15 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/navigation.inc (-3 / +1 lines)
9	[% END %]	9	[% END %]
10		10
11	[% IF ( OpacNavBottom ) %]	11	[% IF ( OpacNavBottom ) %]
12	<div id="opacnavbottom">	12	[% PROCESS koha_news_block news => OpacNavBottom %]
13	[% OpacNavBottom \| $raw %]
14	</div>
15	[% END %]	13	[% END %]

Lines 1-5 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt (+1 lines)
1	[% USE AdditionalContents %]	1	[% USE AdditionalContents %]
2	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	2	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		3	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
3	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
4	<title>An error has occurred &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	5	<title>An error has occurred &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
5	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-5 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	2	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		3	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
3	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
4	<title>	5	<title>
5	[% IF ( GetAvailability ) %]	6	[% IF ( GetAvailability ) %]

Lines 1-5 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account-pay-error.tt (+1 lines)
1	[% USE AdditionalContents %]	1	[% USE AdditionalContents %]
2	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	2	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		3	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
3	[% INCLUDE 'doc-head-open.inc' %]	4	[% INCLUDE 'doc-head-open.inc' %]
4	[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your payment	5	[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your payment
5	[% INCLUDE 'doc-head-close.inc' %]	6	[% INCLUDE 'doc-head-close.inc' %]

Lines 8-13 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt (+1 lines)
8	[% USE AdditionalContents %]	8	[% USE AdditionalContents %]
9	[% SET DISPLAY_PAYMENT_BLOCK = 0 %]	9	[% SET DISPLAY_PAYMENT_BLOCK = 0 %]
10	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	10	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		11	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
11	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
12	<title>Your charges &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	13	<title>Your charges &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
13	[% INCLUDE 'doc-head-close.inc' %]	14	[% INCLUDE 'doc-head-close.inc' %]

Lines 4-9 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt (+1 lines)
4	[% USE AdditionalContents %]	4	[% USE AdditionalContents %]
5	[% PROCESS 'opac-authorities.inc' %]	5	[% PROCESS 'opac-authorities.inc' %]
6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		7	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
7	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Entry [% authtypetext \| html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	9	<title>Entry [% authtypetext \| html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
9	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]

Lines 4-9 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt (+1 lines)
4	[% USE AdditionalContents %]	4	[% USE AdditionalContents %]
5	[% PROCESS 'opac-authorities.inc' %]	5	[% PROCESS 'opac-authorities.inc' %]
6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		7	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
7	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
8	<title>[% summary.mainentry \| html %][% IF authtypetext %] ([% authtypetext \| html %])[% END %] &rsaquo; Authority search &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	9	<title>[% summary.mainentry \| html %][% IF authtypetext %] ([% authtypetext \| html %])[% END %] &rsaquo; Authority search &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
9	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AdditionalContents %]	2	[% USE AdditionalContents %]
3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		4	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Authority search &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	6	<title>Authority search &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
6	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]

Lines 2-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt (+1 lines)
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE AdditionalContents %]	3	[% USE AdditionalContents %]
4	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	4	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		5	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
5	[% PROCESS 'opac-authorities.inc' %]	6	[% PROCESS 'opac-authorities.inc' %]
6	[% PROCESS 'authorities-search-results.inc' %]	7	[% PROCESS 'authorities-search-results.inc' %]
7	[% BLOCK pagination %]	8	[% BLOCK pagination %]

Lines 3-8 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browse.tt (+1 lines)
3	[% USE raw %]	3	[% USE raw %]
4	[% USE AdditionalContents %]	4	[% USE AdditionalContents %]
5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		6	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
7	<title>Browse our catalog &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	8	<title>Browse our catalog &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
8	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AdditionalContents %]	2	[% USE AdditionalContents %]
3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		4	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Browse our catalog &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	6	<title>Browse our catalog &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
6	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AdditionalContents %]	2	[% USE AdditionalContents %]
3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		4	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Discharge &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	6	<title>Discharge &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
6	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AdditionalContents %]	2	[% USE AdditionalContents %]
3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		4	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4	[% IF ( fullpage ) %]	5	[% IF ( fullpage ) %]
5	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Download list [% shelf.shelfname \| html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>[% INCLUDE 'doc-head-close.inc' %]	7	<title>Download list [% shelf.shelfname \| html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>[% INCLUDE 'doc-head-close.inc' %]

Lines 3-8 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt (+1 lines)
3	[% USE Branches %]	3	[% USE Branches %]
4	[% USE AdditionalContents %]	4	[% USE AdditionalContents %]
5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		6	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
7	<title>Full subscription history for [% bibliotitle \| html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	8	<title>Full subscription history for [% bibliotitle \| html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
8	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]

Lines 4-9 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt (+5 lines)
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% USE TablesSettings %]	5	[% USE TablesSettings %]
6	[% USE ItemTypes %]	6	[% USE ItemTypes %]
		7	[% USE AdditionalContents %]
		8	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		9	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		10
		11
7	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Your holds history &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	13	<title>Your holds history &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
9	[% INCLUDE 'doc-head-close.inc' %]	14	[% INCLUDE 'doc-head-close.inc' %]

Lines 4-9 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt (+1 lines)
4	[% USE Branches %]	4	[% USE Branches %]
5	[% USE AdditionalContents %]	5	[% USE AdditionalContents %]
6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		7	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
7	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Your interlibrary loan requests &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	9	<title>Your interlibrary loan requests &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
9	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AdditionalContents %]	2	[% USE AdditionalContents %]
3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		4	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Images for: [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	6	<title>Images for: [% INCLUDE 'biblio-title-head.inc' %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
6	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]

Lines 3-8 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-issue-note.tt (+1 lines)
3	[% USE Branches %]	3	[% USE Branches %]
4	[% USE AdditionalContents %]	4	[% USE AdditionalContents %]
5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		6	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
7	<title>Editing issue note for [% title \| html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	8	<title>Editing issue note for [% title \| html %] &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
8	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]

Lines 4-9 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt (+1 lines)
4	[% PROCESS 'display-library-address.inc' %]	4	[% PROCESS 'display-library-address.inc' %]
5	[% USE AdditionalContents %]	5	[% USE AdditionalContents %]
6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		7	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
7	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
8	<title>	9	<title>
9	[% IF ( library ) %]	10	[% IF ( library ) %]

Lines 7-12 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (+1 lines)
7	[% USE AdditionalContents %]	7	[% USE AdditionalContents %]
8	[% PROCESS 'i18n.inc' %]	8	[% PROCESS 'i18n.inc' %]
9	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	9	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		10	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
10	[% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => lang, library => branchcode ) %]	11	[% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => lang, library => branchcode ) %]
11	[% SET OpacMainUserBlock = AdditionalContents.get( location => "OpacMainUserBlock", lang => lang, library => branchcode ) %]	12	[% SET OpacMainUserBlock = AdditionalContents.get( location => "OpacMainUserBlock", lang => lang, library => branchcode ) %]
12	[% SET OpacLoginInstructions = AdditionalContents.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]	13	[% SET OpacLoginInstructions = AdditionalContents.get( location => "OpacLoginInstructions", lang => lang, library => branchcode ) %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AdditionalContents %]	2	[% USE AdditionalContents %]
3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		4	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Updates submitted &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	6	<title>Updates submitted &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
6	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]

Lines 8-13 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (+1 lines)
8	[% USE Math %]	8	[% USE Math %]
9	[% USE AdditionalContents %]	9	[% USE AdditionalContents %]
10	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	10	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		11	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
11	[% SET userupdateview = 1 %]	12	[% SET userupdateview = 1 %]
12	[% BLOCK streetnumber %]	13	[% BLOCK streetnumber %]
13	[% UNLESS hidden.defined('streetnumber') %]	14	[% UNLESS hidden.defined('streetnumber') %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AdditionalContents %]	2	[% USE AdditionalContents %]
3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		4	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Your messaging settings &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	6	<title>Your messaging settings &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
6	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]

Lines 3-8 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt (+1 lines)
3	[% USE Koha %]	3	[% USE Koha %]
4	[% USE AdditionalContents %]	4	[% USE AdditionalContents %]
5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		6	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
7	<title>OverDrive search for '[% q \| html %]' &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	8	<title>OverDrive search for '[% q \| html %]' &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
8	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]

Lines 3-8 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt (+1 lines)
3	[% USE Koha %]	3	[% USE Koha %]
4	[% USE AdditionalContents %]	4	[% USE AdditionalContents %]
5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		6	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
7	<title>Change your password &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	8	<title>Change your password &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
8	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]

Lines 2-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt (+1 lines)
2	[% USE Categories %]	2	[% USE Categories %]
3	[% USE AdditionalContents %]	3	[% USE AdditionalContents %]
4	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	4	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		5	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
5	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Forgotten password recovery &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	7	<title>Forgotten password recovery &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
7	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AdditionalContents %]	2	[% USE AdditionalContents %]
3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		4	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4	[% SET consentview = 1 %]	5	[% SET consentview = 1 %]
5	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Your consents &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	7	<title>Your consents &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AdditionalContents %]	2	[% USE AdditionalContents %]
3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		4	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Your privacy management &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	6	<title>Your privacy management &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
6	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]

Lines 4-9 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt (+1 lines)
4	[% USE TablesSettings %]	4	[% USE TablesSettings %]
5	[% USE AdditionalContents %]	5	[% USE AdditionalContents %]
6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		7	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
7	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Your checkout history &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	9	<title>Your checkout history &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
9	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]

Lines 3-8 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recordedbooks-search.tt (+1 lines)
3	[% USE Koha %]	3	[% USE Koha %]
4	[% USE AdditionalContents %]	4	[% USE AdditionalContents %]
5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		6	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
7	<title>RecordedBooks search for '[% q \| html %]' &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	8	<title>RecordedBooks search for '[% q \| html %]' &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
8	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]

Lines 3-8 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt (+1 lines)
3	[% USE AdditionalContents %]	3	[% USE AdditionalContents %]
4	[% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %]	4	[% SET OpacNavRight = AdditionalContents.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %]
5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		6	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
7	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	8	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
8	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AdditionalContents %]	2	[% USE AdditionalContents %]
3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		4	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Please confirm your registration &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	6	<title>Please confirm your registration &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
6	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AdditionalContents %]	2	[% USE AdditionalContents %]
3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		4	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	6	<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
6	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reportproblem.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AdditionalContents %]	2	[% USE AdditionalContents %]
3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		4	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Report a problem &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	6	<title>Report a problem &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
6	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]

Lines 2-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt (+1 lines)
2	[% USE Koha %]	2	[% USE Koha %]
3	[% USE AdditionalContents %]	3	[% USE AdditionalContents %]
4	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	4	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		5	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
5	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
6	<title>	7	<title>
7	[% IF RestrictedPageTitle %]	8	[% IF RestrictedPageTitle %]

Lines 4-9 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-routing-lists.tt (+1 lines)
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% USE AdditionalContents %]	5	[% USE AdditionalContents %]
6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		7	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
7	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Your routing lists &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	9	<title>Your routing lists &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
9	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]

Lines 4-9 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt (+1 lines)
4	[% USE KohaDates %]	4	[% USE KohaDates %]
5	[% USE AdditionalContents %]	5	[% USE AdditionalContents %]
6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		7	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
7	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Your search history &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	9	<title>Your search history &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
9	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AdditionalContents %]	2	[% USE AdditionalContents %]
3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		4	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Issues for a subscription &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	6	<title>Issues for a subscription &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
6	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AdditionalContents %]	2	[% USE AdditionalContents %]
3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		4	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Share a list &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	6	<title>Share a list &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
6	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]

Lines 3-8 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt (+1 lines)
3	[% USE Koha %]	3	[% USE Koha %]
4	[% USE AdditionalContents %]	4	[% USE AdditionalContents %]
5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		6	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6	[% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && Koha.Preference('TagsShowOnList') ) %]	7	[% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && Koha.Preference('TagsShowOnList') ) %]
7	[% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && Koha.Preference('TagsInputOnList') ) %]	8	[% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && Koha.Preference('TagsInputOnList') ) %]
8		9

Lines 2-7 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt (+1 lines)
2	[% USE KohaDates %]	2	[% USE KohaDates %]
3	[% USE AdditionalContents %]	3	[% USE AdditionalContents %]
4	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	4	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		5	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
5	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Recent comments &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	7	<title>Recent comments &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
7	[% INCLUDE 'doc-head-close.inc' %]	8	[% INCLUDE 'doc-head-close.inc' %]

Lines 7-12 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt (+1 lines)
7	[% USE AdditionalContents %]	7	[% USE AdditionalContents %]
8	[% SET opacsuggestion = AdditionalContents.get( location => "OpacSuggestioninstructions", lang => lang, library => logged_in_user.branchcode ) %]	8	[% SET opacsuggestion = AdditionalContents.get( location => "OpacSuggestioninstructions", lang => lang, library => logged_in_user.branchcode ) %]
9	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	9	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		10	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
10	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
11	<title>[% IF ( op_add ) %]Enter a new purchase suggestion[% END %]	12	<title>[% IF ( op_add ) %]Enter a new purchase suggestion[% END %]
12	[% IF ( op_else ) %]Purchase suggestions[% END %] &rsaquo;	13	[% IF ( op_else ) %]Purchase suggestions[% END %] &rsaquo;

Lines 3-8 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt (+1 lines)
3	[% USE KohaDates %]	3	[% USE KohaDates %]
4	[% USE AdditionalContents %]	4	[% USE AdditionalContents %]
5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	5	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		6	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
6	[% INCLUDE 'doc-head-open.inc' %]	7	[% INCLUDE 'doc-head-open.inc' %]
7	<title>Tags &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	8	<title>Tags &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
8	[% INCLUDE 'doc-head-close.inc' %]	9	[% INCLUDE 'doc-head-close.inc' %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt (+1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AdditionalContents %]	2	[% USE AdditionalContents %]
3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		4	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4	[% INCLUDE 'doc-head-open.inc' %]	5	[% INCLUDE 'doc-head-open.inc' %]
5	<title>Subject cloud &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	6	<title>Subject cloud &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
6	[% INCLUDE 'doc-head-close.inc' %]	7	[% INCLUDE 'doc-head-close.inc' %]

Lines 4-9 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt (+1 lines)
4	[% USE ItemTypes %]	4	[% USE ItemTypes %]
5	[% USE AdditionalContents %]	5	[% USE AdditionalContents %]
6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	6	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		7	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
7	[% INCLUDE 'doc-head-open.inc' %]	8	[% INCLUDE 'doc-head-open.inc' %]
8	<title>Most popular titles &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>	9	<title>Most popular titles &rsaquo; [% IF ( LibraryNameTitle ) %][% LibraryNameTitle \| html %][% ELSE %]Koha online[% END %] catalog</title>
9	[% INCLUDE 'doc-head-close.inc' %]	10	[% INCLUDE 'doc-head-close.inc' %]

Lines 8-13 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (+1 lines)
8	[% USE AuthorisedValues %]	8	[% USE AuthorisedValues %]
9	[% USE AdditionalContents %]	9	[% USE AdditionalContents %]
10	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	10	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		11	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
11		12
12	[% SET borrower_club_enrollments = logged_in_user.get_club_enrollments(1) %]	13	[% SET borrower_club_enrollments = logged_in_user.get_club_enrollments(1) %]
13	[% SET borrower_enrollable_clubs = logged_in_user.get_enrollable_clubs(1,1) %]	14	[% SET borrower_enrollable_clubs = logged_in_user.get_enrollable_clubs(1,1) %]

Lines 1-6 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt (-1 / +1 lines)
1	[% USE Koha %]	1	[% USE Koha %]
2	[% USE AdditionalContents %]	2	[% USE AdditionalContents %]
3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]	3	[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
		4	[% SET OpacNavBottom = AdditionalContents.get( location => "OpacNavBottom", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %]
4	[% IF (render=='standalone') %]	5	[% IF (render=='standalone') %]
5	[% INCLUDE 'doc-head-open.inc' %]	6	[% INCLUDE 'doc-head-open.inc' %]
6	<title>Search suggestions</title>	7	<title>Search suggestions</title>
7	-

Return to bug 24224

Lines 225-236 OPAC: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref (-6 lines)
225	type: textarea	225	type: textarea
226	syntax: css	226	syntax: css
227	class: code	227	class: code
228	-
229	- 'Show the following HTML on the left hand column of the main page and patron account on the OPAC, after <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">OpacNav</a>, and before patron account links if available:'
230	- pref: OpacNavBottom
231	type: textarea
232	syntax: text/html
233	class: code
234	-	228	-
235	- 'Include a "More Searches" box on the detail pages of items on the OPAC, with the following HTML (leave blank to disable):'	229	- 'Include a "More Searches" box on the detail pages of items on the OPAC, with the following HTML (leave blank to disable):'
236	- '<br />Note: The placeholders {BIBLIONUMBER}, {CONTROLNUMBER}, {TITLE}, {ISBN}, {ISSN} and {AUTHOR} will be replaced with information from the displayed record.'	230	- '<br />Note: The placeholders {BIBLIONUMBER}, {CONTROLNUMBER}, {TITLE}, {ISBN}, {ISSN} and {AUTHOR} will be replaced with information from the displayed record.'

Lines 590-596 sub get_template_and_user { Link Here

(-)a/C4/Auth.pm (-2 lines)
590	OpacBrowser => C4::Context->preference("OpacBrowser"),	590	OpacBrowser => C4::Context->preference("OpacBrowser"),
591	OpacCloud => C4::Context->preference("OpacCloud"),	591	OpacCloud => C4::Context->preference("OpacCloud"),
592	OpacKohaUrl => C4::Context->preference("OpacKohaUrl"),	592	OpacKohaUrl => C4::Context->preference("OpacKohaUrl"),
593	OpacNavBottom => "" . C4::Context->preference("OpacNavBottom"),
594	OpacPasswordChange => C4::Context->preference("OpacPasswordChange"),	593	OpacPasswordChange => C4::Context->preference("OpacPasswordChange"),
595	OPACPatronDetails => C4::Context->preference("OPACPatronDetails"),	594	OPACPatronDetails => C4::Context->preference("OPACPatronDetails"),
596	OPACPrivacy => C4::Context->preference("OPACPrivacy"),	595	OPACPrivacy => C4::Context->preference("OPACPrivacy"),
Lines 1292-1298 sub checkauth { Link Here
1292	LibraryName => "" . C4::Context->preference("LibraryName"),	1291	LibraryName => "" . C4::Context->preference("LibraryName"),
1293	LibraryNameTitle => "" . $LibraryNameTitle,	1292	LibraryNameTitle => "" . $LibraryNameTitle,
1294	opacuserlogin => C4::Context->preference("opacuserlogin"),	1293	opacuserlogin => C4::Context->preference("opacuserlogin"),
1295	OpacNavBottom => C4::Context->preference("OpacNavBottom"),
1296	OpacFavicon => C4::Context->preference("OpacFavicon"),	1294	OpacFavicon => C4::Context->preference("OpacFavicon"),
1297	opacreadinghistory => C4::Context->preference("opacreadinghistory"),	1295	opacreadinghistory => C4::Context->preference("opacreadinghistory"),
1298	opaclanguagesdisplay => C4::Context->preference("opaclanguagesdisplay"),	1296	opaclanguagesdisplay => C4::Context->preference("opaclanguagesdisplay"),

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_24224-move-opacnavbottom-to-news.pl (+29 lines)
	1	use Modern::Perl;
	2
	3	return {
	4	bug_number => "24224",
	5	description => "Move contents of OpacNavBottom system preference into additional contents",
	6	up => sub {
	7	my ($args) = @_;
	8	my ($dbh, $out) = @$args{qw(dbh out)};
	9
	10	# Get any existing value from the OpacNavBottom system preference
	11	my ($opacnavbottom) = $dbh->selectrow_array( q\|
	12	SELECT value FROM systempreferences WHERE variable='OpacNavBottom';
	13	\|);
	14	if( $opacnavbottom ){
	15	# If there is a value in the OpacNavBottom preference, insert it into additional_contents
	16	foreach my $lang ( 'default' ) {
	17	say $out "Inserting OpacNavBottom contents into default";
	18	$dbh->do( "INSERT INTO additional_contents ( category, code, location, branchcode, title, content, lang, published_on ) VALUES ('html_customizations', 'OpacNavBottom', 'OpacNavBottom', NULL, ?, ?, ?, CAST(NOW() AS date) )", undef, "OpacNavBottom $lang", $opacnavbottom, $lang );
	19	}
	20
	21	# Remove the OpacNavBottom system preference
	22	$dbh->do("DELETE FROM systempreferences WHERE variable='OpacNavBottom'");
	23	say $out "Bug 24223 update done";
	24	} else {
	25	say $out "No OpacNavBottom preference found. Update has already been run.";
	26	}
	27
	28	},
	29	}