From 46bc558c8ec29321a746e0c804d100f0b4cfc125 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 28 Aug 2023 10:59:29 +0000 Subject: [PATCH] Bug 34627: CMS pages do not correctly display the opaccredits footer This patch corrects the page structure of CMS pages in the OPAC so that the contents of the footer, including opaccredits, OpacKohaUrl, and the language selection bar, are displayed correctly. This patch contains indentation changes, so ignore whitespace when viewing the diff. To test you should have these settings: - OpacKohaUrl enabled in system preferences - Some content in the opaccredits HTML customization region - Some content in the OpacNav HTML customization region - At least one translation installed and enabled - The opaclanguagesdisplay preference enabled - The OpacLangSelectorMode set to "only footer" or "both top and footer" - Apply the patch and go to Tools -> Pages and create a page with the display location "OPAC." - Open the OPAC link for your newly-created page and confirm that the page looks correct: - The "main" region with the white background should contain the breadcrumb navigation, the sidebar OpacNav content, and the contents of your CMS page. - The opaccredits and OpacKohaUrl content should appear below that region. - The language selection footer should be at the bottom of the page. Signed-off-by: Pedro Amorim Signed-off-by: Aleisha Amohia Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 7d5dc65867a55045fa32189d177379e70ecf5725) Signed-off-by: Fridolin Somers (cherry picked from commit 0b12a5fa840c665a0ad2721ef3f3fe3c19a6dd55) Signed-off-by: Matt Blenkinsop --- .../bootstrap/en/modules/opac-page.tt | 42 +++++++++---------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-page.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-page.tt index e9d0c89c70..5b4742da93 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-page.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-page.tt @@ -32,40 +32,36 @@
- [% IF ( OpacNav || OpacNavBottom ) %] -
+ [% IF ( OpacNav || OpacNavBottom ) %] +
-
+
[% ELSE %] -
+
[% END %] -
[% IF page %] +
+

[% page.title | html %]

-

[% page.title | html %]

+
+ [% page.content | $raw %] +
-
- [% page.content | $raw %] -
+ [% ELSE %] - [% ELSE %] - -
- This page does not exist. -
- - [% END %] - -
+
+ This page does not exist. +
-
-
+ [% END %] +
+
+
+
[% INCLUDE 'opac-bottom.inc' %] -- 2.39.5