From 17369714ce393b9568238e2b899717ac4ac206ed Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Tue, 19 Mar 2024 16:12:49 +0000
Subject: [PATCH] Bug 36359: [23.05.x] Fix bad rebase of opac-main.tt

To test:
1. Add a OPAC news item
2. Go to the OPAC home page, view source, and copy that into an HTML validator. See errors.
3. APPLY PATCH
4. Try step 2 again, errors should be fixed.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../bootstrap/en/modules/opac-main.tt         | 30 +------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

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 b49d4b6c78..d37ea16c22 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -89,34 +89,6 @@
         [% END %]
 
         [% IF koha_news.count %]
-            [% SET koha_news = AdditionalContents.get( category => 'news', location => ['opac_only', 'staff_and_opac'], lang => lang, news_id => news_id ) %]
-        [% ELSE %]
-            [% SET koha_news = AdditionalContents.get( category => 'news', location => ['opac_only', 'staff_and_opac'], lang => lang, library => branchcode ) %]
-        [% END %]
-        [% IF koha_news.content.count %]
-            <div id="news" class="newscontainer">
-                [% SET show_author = Koha.Preference('NewsAuthorDisplay') == 'opac' || Koha.Preference('NewsAuthorDisplay') == 'both' %]
-                [% FOREACH koha_new IN koha_news.content %]
-                    <div class="newsitem">
-                        <h4 class="newsheader">
-                            [% IF ( news_item ) %]
-                                [% koha_new.title | html %]
-                            [% ELSE %]
-                                <a id="newsitem[% koha_new.id | html %]" href="/cgi-bin/koha/opac-main.pl?news_id=[% koha_new.id | uri %]">[% koha_new.title | html %]</a>
-                            [% END %]
-                        </h4>
-                        <div class="newsbody">[% koha_new.content | $raw %]</div>
-                        <div class="newsfooter">
-                            Published on [% koha_new.published_on | $KohaDates %]
-                            [% IF ( show_author && koha_new.author ) %]
-                                by <span class="newsauthor">[% INCLUDE 'patron-title.inc' patron=koha_new.author %]</span>
-                            [% END %]
-                            [% IF ( news_id ) %]
-                                &bull; <a href="/cgi-bin/koha/opac-main.pl">Show all news</a>
-                            [% END %]
-                        </div>
-                    </div>
-                [% END %]
 
             [% IF single_news_error %]
 
@@ -135,7 +107,7 @@
                                 [% IF ( news_item ) %]
                                     [% koha_new.title | html %]
                                 [% ELSE %]
-                                    <a name="newsitem[% koha_new.idnew | html %]" href="/cgi-bin/koha/opac-main.pl?news_id=[% koha_new.idnew | uri %]">[% koha_new.title | html %]</a>
+                                    <a id="newsitem[% koha_new.idnew | html %]" href="/cgi-bin/koha/opac-main.pl?news_id=[% koha_new.idnew | uri %]">[% koha_new.title | html %]</a>
                                 [% END %]
                             </h4>
                             <div class="newsbody">[% koha_new.content | $raw %]</div>
-- 
2.39.5