From 23e0c8ffb50c97553dfbc368b78f1d3e7a29bacc Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 10 Oct 2016 08:10:29 -0400
Subject: [PATCH] Bug 17417 [Revised] Correct invalid markup around news on the
 staff client home page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch fixes two minor errors in the markup around displaying news
on the staff client home page: Adding a missing "class" attribute, and
changing the container around news items from <p> to <div> (because news
items might contain <p> and nesting them is incorrect).

To test, apply the patch and view the staff client home page with news
items showing. Validate the page and confirm that there are no errors.

Signed-off-by: Marc <veron@veron.ch>

Revision for QA removes an extra </div> from elsewhere in the template
to make the validator return no errors.

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit d08076e7e55a7c78a7ab3d79c33151dd4c469101)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
index b251d9b465..ca7699dd1e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -180,11 +180,11 @@ var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this news item? This
     <div class="yui-b"><!-- YOUR NAVIGATION GOES HERE -->
     [% IF ( koha_news_count ) %]
         <div id="area-news">
-            <h3><span="news_title">News</span></h3>
+            <h3><span class="news_title">News</span></h3>
             [% SET newsdisp = Koha.Preference('NewsAuthorDisplay') %]
             [% FOREACH koha_new IN koha_news %]
                 <div class="newsitem" id="news[% koha_new.idnew %]"><h4>[% koha_new.title %]</h4>
-                    <p>[% koha_new.new %]</p>
+                    <div class="newsbody">[% koha_new.new %]</div>
                     <p class="newsfooter"> Posted on [% koha_new.newdate %][% IF( ( newsdisp == 'staff' || newsdisp == 'both' ) && koha_new.borrowernumber ) %] by <span class="newsauthor_title">[% koha_new.author_title %] </span>[% koha_new.author_firstname %] [% koha_new.author_surname %]<br />[% END %]
                         [% IF ( CAN_user_tools ) %]
                             <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% koha_new.idnew %]">Edit</a>
@@ -197,7 +197,6 @@ var MSG_CONFIRM_DELETE = _("Are you sure you want to delete this news item? This
         </div><!-- /koha-news -->
     [% END %]
     </div>
-    </div>
 </div>
 
 <!-- the main div is closed in intranet-bottom.inc -->