@@ -, +, @@ --- C4/Auth.pm | 6 +++--- .../opac-tmpl/bootstrap/en/includes/masthead-sci.inc | 2 +- .../opac-tmpl/bootstrap/en/includes/masthead-sco.inc | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 6 +++--- .../opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 2 +- .../opac-tmpl/bootstrap/en/modules/errors/errorpage.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/maintenance.tt | 2 +- .../bootstrap/en/modules/opac-account-pay-error.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-account.tt | 4 ++-- .../bootstrap/en/modules/opac-auth-MARCdetail.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt | 2 +- .../bootstrap/en/modules/opac-authorities-home.tt | 4 ++-- .../en/modules/opac-authoritiessearchresultlist.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-browse.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-browser.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-discharge.tt | 4 ++-- .../bootstrap/en/modules/opac-downloadshelf.tt | 4 ++-- .../bootstrap/en/modules/opac-full-serial-issues.tt | 4 ++-- .../bootstrap/en/modules/opac-holdshistory.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-illrequests.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-issue-note.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-library.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt | 10 +++++----- .../en/modules/opac-memberentry-update-submitted.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-messaging.tt | 4 ++-- .../bootstrap/en/modules/opac-overdrive-search.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 4 ++-- .../bootstrap/en/modules/opac-password-recovery.tt | 4 ++-- .../bootstrap/en/modules/opac-patron-consent.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-privacy.tt | 4 ++-- .../bootstrap/en/modules/opac-readingrecord.tt | 4 ++-- .../bootstrap/en/modules/opac-recordedbooks-search.tt | 4 ++-- .../en/modules/opac-registration-confirmation.tt | 6 +++--- .../en/modules/opac-registration-email-sent.tt | 4 ++-- .../bootstrap/en/modules/opac-registration-invalid.tt | 4 ++-- .../bootstrap/en/modules/opac-reportproblem.tt | 4 ++-- .../bootstrap/en/modules/opac-request-article.tt | 2 +- .../bootstrap/en/modules/opac-restrictedpage.tt | 4 ++-- .../bootstrap/en/modules/opac-routing-lists.tt | 4 ++-- .../bootstrap/en/modules/opac-search-history.tt | 4 ++-- .../bootstrap/en/modules/opac-serial-issues.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-showreviews.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-suggestions.tt | 6 +++--- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt | 4 ++-- .../bootstrap/en/modules/opac-tags_subject.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/opac-topissues.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++-- .../opac-tmpl/bootstrap/en/modules/sci/sci-main.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/svc/suggestion.tt | 4 ++-- 55 files changed, 110 insertions(+), 110 deletions(-) --- a/C4/Auth.pm +++ a/C4/Auth.pm @@ -439,10 +439,10 @@ sub get_template_and_user { $template->param( some_public_shelves => $some_public_shelves, ); + + # Set default branch if one has been passed by the environment. + $template->param( default_branch => $ENV{OPAC_BRANCH_DEFAULT} ) if $ENV{OPAC_BRANCH_DEFAULT}; } - - # Set default branch if one has been passed by the environment. - $template->param( branchcode => $ENV{OPAC_BRANCH_DEFAULT} ) if $ENV{OPAC_BRANCH_DEFAULT}; } # Sysprefs disabled via URL param --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc +++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead-sci.inc @@ -3,7 +3,7 @@ [% USE AdditionalContents %] [% PROCESS 'html_helpers.inc' %] [% SET OpacLangSelectorMode = Koha.Preference('OpacLangSelectorMode') %] -[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode, blocktitle => 0 ) %] +[% SET OpacHeader = AdditionalContents.get( location => "opacheader", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]