From ab8f43293a973d2c68b81642a73828089868e706 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Tue, 16 Jun 2015 04:39:31 +0000 Subject: [PATCH] My rebase attempt http://bugs.koha-community.org/show_bug.cgi?id=5025 --- koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc | 1 - koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-open.inc | 1 - koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/400.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/401.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/402.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/403.tt | 5 +++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/404.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/500.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt | 3 +-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt | 3 ++- .../bootstrap/en/modules/opac-authoritiessearchresultlist.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadcart.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +- .../bootstrap/en/modules/opac-memberentry-update-submitted.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 4 ++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasketform.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelfform.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showmarc.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt | 5 +++-- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 3 ++- koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt | 3 ++- 63 files changed, 101 insertions(+), 70 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc index a063346..bce0da2 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc @@ -1,4 +1,3 @@ - diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-open.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-open.inc index b288c18..9931159 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-open.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-open.inc @@ -2,4 +2,3 @@ [% IF ( bidi ) %][% ELSE %][% END %] - diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/400.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/400.tt index 3e123f9..d0bd247 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/400.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/400.tt @@ -1,4 +1,5 @@ -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › An error has occurred +[% INCLUDE 'doc-head-open.inc' %] +<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › An error has occurred [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/401.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/401.tt index caee39f..96221cb 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/401.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/401.tt @@ -1,4 +1,5 @@ -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › An error has occurred +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › An error has occurred [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/402.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/402.tt index 73c8558..6d53062 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/402.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/402.tt @@ -1,4 +1,5 @@ -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › An error has occurred +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › An error has occurred [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/403.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/403.tt index 68d2459..4a886f0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/403.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/403.tt @@ -1,4 +1,5 @@ -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › An error has occurred +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › An error has occurred [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] @@ -40,4 +41,4 @@ [% INCLUDE 'opac-bottom.inc' %] [% BLOCK jsinclude %] -[% END %] \ No newline at end of file +[% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/404.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/404.tt index eb176f8..232ecd1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/404.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/404.tt @@ -1,4 +1,5 @@ -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › An error has occurred +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › An error has occurred [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/500.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/500.tt index 38a4d45..51dcf01 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/500.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/500.tt @@ -1,4 +1,5 @@ -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › An error has occurred +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › An error has occurred [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt index b6c56c3..e6544cc 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt @@ -1,6 +1,6 @@ [% USE Koha %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › [% IF ( GetAvailability ) %] ILS-DI › GetAvailability [% ELSIF ( GetRecords ) %] @@ -27,7 +27,7 @@ ILS-DI › CancelHold [% ELSE %] ILS-DI - [% END %] + [% END %] [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt index b8efad4..62fc15f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt index 03f630c..be4776c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt index 0b4df82..635f8d8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt @@ -1,5 +1,6 @@ [% USE Koha %] -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Browse our catalog +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Browse our catalog [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt index a313598..3241c3c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt @@ -4,7 +4,7 @@ [% USE ItemTypes %] [% USE Branches %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Course reserves for [% course.course_name %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Course reserves for [% course.course_name %] [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt index db33aac..3aaa8b9 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt @@ -2,7 +2,7 @@ [% USE AuthorisedValues %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Courses +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Courses [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index 840f6ec..d7e42c8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -23,7 +23,8 @@ [% ELSE %] [% SET protocol = "http://" %] [% END %] -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Details for: [% title |html %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield |html %][% END %] +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Details for: [% title |html %][% FOREACH subtitl IN subtitle %], [% subtitl.subfield |html %][% END %] [% INCLUDE 'doc-head-close.inc' %] [% IF ( bidi ) %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadcart.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadcart.tt index 9f1f65d..f7eebd8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadcart.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadcart.tt @@ -1,4 +1,5 @@ -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Download cart +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Download cart [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt index a9c53f9..1aa3a4b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt @@ -1,6 +1,7 @@ [% USE Koha %] [% IF ( fullpage ) %] - [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Download list [% shelfname %][% INCLUDE 'doc-head-close.inc' %] + [% INCLUDE 'doc-head-open.inc' %] + [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Download list [% shelfname %][% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] [% INCLUDE 'bodytag.inc' bodyid='opac-downloadlist' %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt index 18e1894..160d868 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt @@ -1,7 +1,8 @@ [% USE Koha %] [% USE KohaDates %] [% USE Branches %] -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Full subscription history for [% bibliotitle %] +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Full subscription history for [% bibliotitle %] [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt index be4d08f..eb74172 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt @@ -1,6 +1,6 @@ [% USE Koha %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt index 2fac057..7b4238a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-email-sent.tt @@ -1,6 +1,6 @@ [% USE Koha %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Please confirm your registration +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Please confirm your registration [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt index b82b587..92a28ae 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt @@ -1,6 +1,6 @@ [% USE Koha %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt index a52ad0d..546cb24 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -1,7 +1,7 @@ [% USE Koha %] [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Placing a hold +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Placing a hold [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt index 05d022a..68c543c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt @@ -1,11 +1,11 @@ [% USE Koha %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › [% IF ( searchdesc ) %] Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %] [% ELSE %] You did not specify any search criteria. -[% END %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › [% IF ( searchdesc ) %] Results of search [% IF ( query_desc ) %]for '[% query_desc | html%]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %] [% ELSE %] You did not specify any search criteria. -[% END %] +[% END %] [% INCLUDE 'doc-head-close.inc' %] [% IF ( OpacStarRatings == 'all' || Koha.Preference('Babeltheque') ) %] [% BLOCK cssinclude %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt index 3a78dfa..44792a5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Comments on [% title |html %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Comments on [% title |html %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt index a14f25c..d8d6c57 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt @@ -1,7 +1,7 @@ [% USE Koha %] [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] -[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your search history +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your search history [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasketform.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasketform.tt index a2f4bcc..ad4ce33 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasketform.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasketform.tt @@ -1,4 +1,5 @@ -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Sending your cart +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Sending your cart [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelfform.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelfform.tt index 30ad182..3b38535 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelfform.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelfform.tt @@ -1,4 +1,5 @@ -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Sending your list +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Sending your list [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt index 0b88d2f..4517ffc 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt @@ -1,5 +1,6 @@ [% USE Koha %] -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Issues for a subscription +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Issues for a subscription [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt index 19ee4b5..6421138 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt @@ -1,5 +1,6 @@ [% USE Koha %] -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Share a list +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Share a list [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index eb2c143..333bdbc 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -2,7 +2,8 @@ [% SET TagsShowEnabled = ( ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsShowOnList ) %] [% SET TagsInputEnabled = ( ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'TagsEnabled' ) == 1 ) && TagsInputOnList ) %] -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › [% IF ( viewshelf ) %]Contents of [% shelfname |html %][% ELSE %]Your lists[% END %][% INCLUDE 'doc-head-close.inc' %] +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › [% IF ( viewshelf ) %]Contents of [% shelfname |html %][% ELSE %]Your lists[% END %][% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] [% IF ( loggedinusername ) %][% INCLUDE 'bodytag.inc' bodyid='opac-userlists' bodyclass='scrollto' %][% ELSE %][% INCLUDE 'bodytag.inc' bodyid='opac-lists' bodyclass='scrollto' %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showmarc.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showmarc.tt index 559d4fe..f2b3c8e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showmarc.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showmarc.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -MARC view +MARC view [% INCLUDE 'bodytag.inc' bodyid='opac-showmarc' %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt index bfdc397..6fca7ec 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt @@ -1,7 +1,8 @@ [% USE Koha %] [% USE KohaDates %] -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Recent comments +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Recent comments [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt index 8ae9214..f35f49b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt @@ -1,8 +1,9 @@ [% USE Koha %] [% USE AuthorisedValues %] -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › [% IF ( op_add ) %]Enter a new purchase suggestion[% END %] -[% IF ( op_else ) %]Purchase Suggestions[% END %] +[% IF ( op_else ) %]Purchase Suggestions[% END %] [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %][% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt index b9a7072..1065c09 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt @@ -1,7 +1,8 @@ [% USE Koha %] [% USE KohaDates %] -[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Tags +[% INCLUDE 'doc-head-open.inc' %] +[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Tags [% INCLUDE 'doc-head-close.inc' %] [% BLOCK cssinclude %]