SAK-31288 Previous Topic / Next Topic buttons overlap (sakaiproject#4232

)
DaweiXia · Apr 13, 2017 · f93ff8d · f93ff8d
1 parent 7821c78
commit f93ff8d
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfFlatView.jsp b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfFlatView.jsp
@@ -73,8 +73,8 @@
 					<h:graphicImage url="/../../library/image/silk/printer.png" alt="#{msgs.print_friendly}" title="#{msgs.print_friendly}" />
 				</h:outputLink>
  		</sakai:tool_bar>
-			<h:panelGrid columns="2" width="100%" styleClass="navPanel specialLink">
-			    <h:panelGroup>
+		<div class="row">
+			<div class="col-md-9 col-xs-12">
 					<f:verbatim><div class="breadCrumb specialLink"><h3></f:verbatim>
 			      <h:commandLink action="#{ForumTool.processActionHome}" value="#{msgs.cdfm_message_forums}" title=" #{msgs.cdfm_message_forums}"
 			      		rendered="#{ForumTool.messagesandForums}" />
@@ -88,8 +88,8 @@
 				  <f:verbatim><h:outputText value=" " /><h:outputText value=" / " /><h:outputText value=" " /></f:verbatim>
 				  	  <h:outputText value="#{ForumTool.selectedTopic.topic.title}" />
 					  <f:verbatim></h3></div></f:verbatim>
-				 </h:panelGroup>
-				 <h:panelGroup styleClass="itemNav">
+			</div>
+			<div class="pull-right">
 				   <h:outputText  styleClass="button formButtonDisabled"  value="#{msgs.cdfm_previous_topic}"  rendered="#{!ForumTool.selectedTopic.hasPreviousTopic}" />
 					 <h:commandLink  styleClass="button" action="#{ForumTool.processActionDisplayPreviousTopic}" value="#{msgs.cdfm_previous_topic}"  rendered="#{ForumTool.selectedTopic.hasPreviousTopic}" 
 					                title=" #{msgs.cdfm_previous_topic}">
@@ -102,8 +102,8 @@
 						<f:param value="#{ForumTool.selectedTopic.nextTopicId}" name="nextTopicId"/>
 						<f:param value="#{ForumTool.selectedForum.forum.id}" name="forumId"/>
 					 </h:commandLink>
-				 </h:panelGroup>
-			</h:panelGrid>
+ 			</div>
+ 		</div>
 
 		<%--rjlowe: Expanded View to show the message bodies, threaded --%>
 	<span class="skip" id="firstNewItemTitleHolder"><h:outputText value="#{msgs.cdfm_gotofirstnewtitle}" /></span>