From bcffd266ec8f41d71d976255dcc03a74f2cbe273 Mon Sep 17 00:00:00 2001
From: "Code Hugger (Matthew Jones)" <matthew.jones@learnxp.com>
Date: Mon, 12 Apr 2021 10:36:19 -0400
Subject: [PATCH] SAK-43977 - Menu navigation in Topic is not working (#9173)

Also fixes: SAK-43976 - Menu Navigation in Statistics & Grading (dfStatisticsListByTopic) is not working

Issue was that these needed to be in the form component and were outside of it.
---
 .../src/webapp/jsp/discussionForum/message/dfAllMessages.jsp    | 2 +-
 .../jsp/discussionForum/statistics/dfStatisticsListByTopic.jsp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfAllMessages.jsp b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfAllMessages.jsp
index 39533d4cf782..ca7fd38eee7e 100644
--- a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfAllMessages.jsp
+++ b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfAllMessages.jsp
@@ -92,7 +92,6 @@
          }
 
  		</script>
-		<%@ include file="/jsp/discussionForum/menu/forumsMenu.jsp" %>
 		<h:outputText styleClass="showMoreText"  style="display:none" value="#{msgs.cdfm_show_more_full_description}"  />
 
 	<%--//
@@ -127,6 +126,7 @@
 		<span class="highlight"  id="maxthreaddepth" class="skip"><h:outputText value="#{msgs.cdfm_maxthreaddepth}" /></span>
 //--%>
 	<h:form id="msgForum" rendered="#{!ForumTool.selectedTopic.topic.draft || ForumTool.selectedTopic.topic.createdBy == ForumTool.userId}">
+        <%@ include file="/jsp/discussionForum/menu/forumsMenu.jsp" %>
         <f:subview id="picker2">
             <%@ include file="moveThreadPicker.jsp" %>
         </f:subview>
diff --git a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsListByTopic.jsp b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsListByTopic.jsp
index 37456cda638b..b40fe6160c72 100644
--- a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsListByTopic.jsp
+++ b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/statistics/dfStatisticsListByTopic.jsp
@@ -27,7 +27,6 @@
 %>
 <f:view>
   <sakai:view >
-    <%@ include file="/jsp/discussionForum/menu/forumsMenu.jsp" %>
   	<h:form id="dfStatisticsForm" rendered="#{ForumTool.instructor}">
 <!-- discussionForum/statistics/dfStatisticsList.jsp-->
 	<script>
@@ -158,6 +157,7 @@
 				menuLinkSpan.html(menuLink.text());
 			});
 		</script>
+        <%@ include file="/jsp/discussionForum/menu/forumsMenu.jsp" %>
 		
 		<div id="dialogDiv" title="Grade Messages" style="display:none">
 			<h:commandButton type="button" styleClass="closeDialogFrame" onclick="dialogutil.closeDialog($(this).parent().attr('id'), $('#dialogFrame').attr('id'));" value="#{msgs.close_window}"/>