From 92742425ddc048eb9796d8bb4d4544138c5f1dde Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 10 Jun 2020 16:56:40 +0100 Subject: [PATCH] Bug 22807: Ensure .maincontent appears on all pages Signed-off-by: Hayley Mapley Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit c5b173f7dec5d94c29249dfa00e61861d5645998) Signed-off-by: Lucas Gass (cherry picked from commit 0923ccef50d5052d6e14812eaa20e1e4c37dec89) Signed-off-by: Aleisha Amohia --- .../bootstrap/en/modules/maintenance.tt | 2 +- .../en/modules/opac-addbybiblionumber.tt | 2 +- .../en/modules/opac-alert-subscribe.tt | 2 +- .../bootstrap/en/modules/opac-blocked.tt | 2 +- .../bootstrap/en/modules/opac-browser.tt | 2 +- .../en/modules/opac-course-details.tt | 141 +++++++++--------- .../en/modules/opac-course-reserves.tt | 3 +- .../bootstrap/en/modules/opac-discharge.tt | 2 +- .../bootstrap/en/modules/opac-imageviewer.tt | 2 +- .../bootstrap/en/modules/opac-main.tt | 8 +- .../opac-memberentry-update-submitted.tt | 2 +- .../bootstrap/en/modules/opac-memberentry.tt | 4 +- .../bootstrap/en/modules/opac-messaging.tt | 2 +- .../bootstrap/en/modules/opac-passwd.tt | 2 +- .../en/modules/opac-password-recovery.tt | 2 +- .../en/modules/opac-patron-consent.tt | 2 +- .../bootstrap/en/modules/opac-privacy.tt | 2 +- .../en/modules/opac-readingrecord.tt | 2 +- .../modules/opac-registration-confirmation.tt | 2 +- .../modules/opac-registration-email-sent.tt | 2 +- .../en/modules/opac-registration-invalid.tt | 2 +- .../bootstrap/en/modules/opac-reserve.tt | 2 +- .../en/modules/opac-results-grouped.tt | 2 +- .../bootstrap/en/modules/opac-review.tt | 2 +- .../en/modules/opac-serial-issues.tt | 2 +- .../bootstrap/en/modules/opac-tags_subject.tt | 2 +- 26 files changed, 101 insertions(+), 99 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt index b15bfbcf3e..9e15008040 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt @@ -27,7 +27,7 @@
-
+
[% IF Koha.Preference( 'OpacMaintenanceNotice' ) %] [% Koha.Preference( 'OpacMaintenanceNotice' ) | $raw %] [% ELSE %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt index 21f2c11adb..16672bb87a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt @@ -8,7 +8,7 @@
-
+
[% IF ( authorized ) %] [% UNLESS ( newshelf ) %] [% IF ( multiple ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt index bf83086bfe..a98f791ad8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt @@ -17,7 +17,7 @@
-
+
[% IF ( typeissue ) %]

Subscribe to a subscription alert

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 ec0a35f46e..48b46b554d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt @@ -15,7 +15,7 @@
-
+

Blocked

You are not authorized to view this record.

[% IF ( OpacSuppressionMessage ) %] 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 71bac82e51..42d32b05c0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt @@ -20,7 +20,7 @@ [% IF ( OpacNav ) %]
[% ELSE %]
[% END %] -
+

Browse our catalog

[% IF ( have_hierarchy ) %] 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 6ab523fca8..88122f70f0 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 @@ -26,79 +26,80 @@
- -

Course reserves for [% course.course_name | html %]

-
-
    - [% IF ( course.term ) %]
  1. Term: [% AuthorisedValues.GetByCode( 'TERM', course.term, 1 ) | html %]
    2. [% END %] -
  2. Department: [% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department, 1 ) | html %]
    3. - [% IF ( course.course_number ) %]
  3. Course number: [% course.course_number | html %]
    4. [% END %] - [% IF ( course.section ) %]
  4. Section: [% course.section | html %]
    5. [% END %] - [% IF ( course.instructors ) %] -
  5. Instructors: -
      - [% FOREACH i IN course.instructors %] -
    • [% i.firstname | html %] [% i.surname | html %]
      • - [% END %] -
    -
    6. - [% END %] - [% IF ( course.public_note ) %]
  6. Notes: [% course.public_note | $raw %]
    7. [% END %] -
-
- - [% IF ( course_reserves ) %] - - - - - - - - - - - - - - - - - - - [% FOREACH cr IN course_reserves %] - - - - - - - - - - - - - + + [% END %] - -
TitleAuthorItem typeLocationCollectionCall numberCopy numberStatusDate dueNotesLink
[% INCLUDE 'biblio-title-head.inc' biblio=cr.biblio %][% cr.biblio.author | html %][% ItemTypes.GetDescription( cr.item.itype ) | html %][% Branches.GetName( cr.item.holdingbranch ) | html %]
[% AuthorisedValues.GetByCode( 'LOC', cr.item.location, 1 ) | html %]		[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode, 1 ) | html %][% cr.item.itemcallnumber | html %][% cr.item.copynumber | html %][% INCLUDE 'item-status.inc' item=cr.item issue=cr.issue %][% cr.issue.date_due | $KohaDates as_due_date => 1 %][% IF ( cr.public_note ) %] - [% cr.public_note | $raw %] - [% ELSIF ( cr.item.itemnotes ) %] - [% cr.item.itemnotes | $raw %] - [% END %] - [% IF (cr.item.uri) %] - Item URI - [% ELSIF (cr.biblioitem.url) %] - Record URL +
+

Course reserves for [% course.course_name | html %]

+
+
    + [% IF ( course.term ) %]
  1. Term: [% AuthorisedValues.GetByCode( 'TERM', course.term, 1 ) | html %]
    2. [% END %] +
  2. Department: [% AuthorisedValues.GetByCode( 'DEPARTMENT', course.department, 1 ) | html %]
    3. + [% IF ( course.course_number ) %]
  3. Course number: [% course.course_number | html %]
    4. [% END %] + [% IF ( course.section ) %]
  4. Section: [% course.section | html %]
    5. [% END %] + [% IF ( course.instructors ) %] +
  5. Instructors: +
      + [% FOREACH i IN course.instructors %] +
    • [% i.firstname | html %] [% i.surname | html %]
      • [% END %] -
- [% ELSE %] -
-
-

No reserves have been selected for this course.

+ [% IF ( course.public_note ) %]
  • Notes: [% course.public_note | $raw %]
    • [% END %] +
    - [% END %] + + [% IF ( course_reserves ) %] + + + + + + + + + + + + + + + + + + + [% FOREACH cr IN course_reserves %] + + + + + + + + + + + + + + [% END %] + +
    TitleAuthorItem typeLocationCollectionCall numberCopy numberStatusDate dueNotesLink
    [% INCLUDE 'biblio-title-head.inc' biblio=cr.biblio %][% cr.biblio.author | html %][% ItemTypes.GetDescription( cr.item.itype ) | html %][% Branches.GetName( cr.item.holdingbranch ) | html %]
    [% AuthorisedValues.GetByCode( 'LOC', cr.item.location, 1 ) | html %]    		[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode, 1 ) | html %][% cr.item.itemcallnumber | html %][% cr.item.copynumber | html %][% INCLUDE 'item-status.inc' item=cr.item issue=cr.issue %][% cr.issue.date_due | $KohaDates as_due_date => 1 %][% IF ( cr.public_note ) %] + [% cr.public_note | $raw %] + [% ELSIF ( cr.item.itemnotes ) %] + [% cr.item.itemnotes | $raw %] + [% END %] + [% IF (cr.item.uri) %] + Item URI + [% ELSIF (cr.biblioitem.url) %] + Record URL + [% END %] +
    + [% ELSE %] +
    +
    +

    No reserves have been selected for this course.

    +
    + [% END %] +
    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 9f3b430ce3..801c0f9cbb 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 @@ -23,7 +23,7 @@
    - +

    Courses

    @@ -56,6 +56,7 @@ [% END %]
    +
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt index 92479accdf..e8a2db76c4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-discharge.tt @@ -21,7 +21,7 @@
    -
    +

    Discharge

    [% FOR message IN messages %]
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt index 2a098baeb0..eeb453e4d0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt @@ -65,7 +65,7 @@
    [% END %]
    -
    +

    Images for [% IF ( BiblioDefaultViewmarc ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt index 0150881623..970893b17a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt @@ -44,13 +44,13 @@ [% SET OpacNavRight = KohaNews.get( location => "OpacNavRight", lang => news_lang, library => branchcode ) %] [% IF ( OpacNav || OpacNavBottom ) && (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %] -
    +
    [% ELSIF (Koha.Preference( 'opacuserlogin' ) == 1 || OpacNavRight) %] -
    +
    [% ELSIF ( OpacNav || OpacNavBottom ) %] -
    +
    [% ELSE %] -
    +
    [% END %] [% IF Koha.Preference( 'OpacNewsLibrarySelect' ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt index acb4725462..3e602e652b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry-update-submitted.tt @@ -22,7 +22,7 @@
    -
    +

    Thank you

    Your updates have been submitted. A librarian will review your updates before applying them.

    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt index 8761cc88ae..74b75594d6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt @@ -55,9 +55,9 @@
    [% IF action == 'edit' %] -
    +
    [% ELSE %] -
    +
    [% END %] [% IF action == 'edit' %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt index 7fd4786503..d7c1161949 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt @@ -23,7 +23,7 @@
    [% IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' ) %] -
    +

    Your messaging settings

    [% IF ( settings_updated ) %]

    Settings updated

    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt index 3dbd997344..5c1816f89c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt @@ -24,7 +24,7 @@
    -
    +

    Change your password

    [% IF ( Error_messages ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt index 6d2e5d2ad4..6e8ff8ae95 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt @@ -44,7 +44,7 @@
    [% END %]
    -
    +

    Forgotten password recovery

    [% IF (hasError) %]
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt index f40597198a..80b96031b8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-patron-consent.tt @@ -23,7 +23,7 @@
    -
    +
    [% IF Koha.Preference('GDPR_Policy') %]
    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt index 789a23739a..605137a703 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt @@ -22,7 +22,7 @@
    -
    +

    Your privacy management

    [% IF deleted %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt index d82843073f..012c9b3ec2 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -34,7 +34,7 @@
    -
    +

    Checkout history

    [% IF READING_RECORD.size == 0 %] 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 2fc4493983..8a151024b8 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 @@ -31,7 +31,7 @@
    [% END %] -
    +

    Registration Complete!

    You have successfully registered your new account.

    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 1a4bdce4d4..2258bb5e68 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 @@ -25,7 +25,7 @@ [% ELSE %]
    [% END %] -
    +

    Please confirm your registration

    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 7647b0d4ed..d72914c30c 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 @@ -25,7 +25,7 @@ [% ELSE %]
    [% END %] -
    +

    Registration invalid!

    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 44ae45e733..090f1e2660 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -20,7 +20,7 @@
    -
    +
    [% IF ( message ) %]

    Sorry, you cannot place holds.

    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 1001aab19d..aaf473cf54 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 @@ -57,7 +57,7 @@ [% ELSE %]
    [% END %] -
    +
    [% IF ( total ) %] [% IF ( scan ) %] 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 863e4ac696..423dcb0318 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt @@ -8,7 +8,7 @@
    -
    +
    [% IF ( cgi_debug ) %]
    CGI debug is on.
    [% 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 6f6e879ca6..4be2764a6b 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 @@ -26,7 +26,7 @@ [% ELSE %]
    [% END %] -
    +

    Issues for a subscription

    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt index d28db08d1f..beccebaacf 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt @@ -28,7 +28,7 @@ [% ELSE %]
    [% END %] -
    +

    Subject cloud

    [% IF Koha.Preference( 'OpacCloud' ) == 1 %] [% IF ( LOOP ) %] -- 2.20.1