SAK-40511 Adding Rubric icon in some screens on Forums (sakaiproject#…

…6099)
stetsche · Oct 5, 2018 · 41ff676 · 41ff676
1 parent 58c5b10
commit 41ff676
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/forum/dfForumDetail.jsp b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/forum/dfForumDetail.jsp
@@ -31,6 +31,8 @@
 				<h:outputText id="draft_space" value=" -  " rendered="#{ForumTool.selectedForum.forum.draft == 'true'}" styleClass="title"/>
 				<h:graphicImage url="/images/silk/date_delete.png" title="#{msgs.forum_restricted_message}" alt="#{msgs.forum_restricted_message}" rendered="#{ForumTool.selectedForum.forum.availability == 'false'}" style="margin-right:.5em"/>
 				<h:graphicImage url="/images/silk/lock.png" alt="#{msgs.cdfm_forum_locked}" rendered="#{ForumTool.selectedForum.forum.locked == 'true'}" style="margin-right:.5em"/>	
+				<%-- Rubrics marker --%>
+				<h:outputText styleClass="fa fa-table" id="rubrics-forum-icon" rendered="#{ForumTool.selectedForum.hasRubric == 'true'}" style="margin-right:.5em" title="#{msgs.cdfm_forum_rubric}"/>
 				<h:outputText value="#{ForumTool.selectedForum.forum.title}" styleClass="title"/>
 				<h:outputText value=" "  styleClass="actionLinks"/>
         		<h:commandLink action="#{ForumTool.processActionNewTopic}"  value="#{msgs.cdfm_new_topic}" rendered="#{ForumTool.selectedForum.newTopic}" 
@@ -106,11 +108,12 @@
 						<h:graphicImage url="/images/folder.gif" alt="Topic Folder" rendered="#{topic.unreadNoMessages == 0 }" styleClass="topicIcon" style="margin-right:.5em"/>
 						<h:graphicImage url="/images/folder_unread.gif" alt="Topic Folder" rendered="#{topic.unreadNoMessages > 0 }" styleClass="topicIcon" style="margin-right:.5em"/>
 
-
 						<h:outputText styleClass="highlight title" id="draft" value="#{msgs.cdfm_draft}" rendered="#{topic.topic.draft == 'true'}"/>
 						<h:outputText id="draft_space" value="  - " rendered="#{topic.topic.draft == 'true'}" styleClass="title"/>
 						<h:graphicImage url="/images/silk/date_delete.png" title="#{msgs.topic_restricted_message}" alt="#{msgs.topic_restricted_message}" rendered="#{topic.availability == 'false'}" style="margin-right:.5em"/>
 						<h:graphicImage url="/images/silk/lock.png" alt="#{msgs.cdfm_forum_locked}" rendered="#{ForumTool.selectedForum.forum.locked == 'true' || topic.locked == 'true'}" style="margin-right:.5em"/>
+						<%-- Rubrics marker --%>
+						<h:outputText styleClass="fa fa-table" id="rubrics-topic-icon" rendered="#{topic.hasRubric == 'true'}" style="margin-right:.5em" title="#{msgs.cdfm_topic_rubric}"/>
 
 						<h:commandLink action="#{ForumTool.processActionDisplayTopic}" id="topic_title" title=" #{topic.topic.title}" styleClass="title">
 						  <f:param value="#{topic.topic.id}" name="topicId"/>

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfAllMessages.jsp b/msgcntr/messageforums-app/src/webapp/jsp/discussionForum/message/dfAllMessages.jsp
@@ -189,12 +189,10 @@
 					<h:outputText id="draft_space" value="  - " rendered="#{ForumTool.selectedTopic.topic.draft == 'true'}" styleClass="title"/>
 					<h:graphicImage url="/images/silk/date_delete.png" title="#{msgs.topic_restricted_message}" alt="#{msgs.topic_restricted_message}" rendered="#{ForumTool.selectedTopic.topic.availability == 'false'}" style="margin-right:.5em"/>
 					<h:graphicImage url="/images/silk/lock.png" alt="#{msgs.cdfm_forum_locked}" rendered="#{ForumTool.selectedForum.forum.locked == 'true' || ForumTool.selectedTopic.topic.locked == 'true'}" style="margin-right:.5em"/>
-
-
-
+					<%-- Rubrics marker --%>
+					<h:outputText styleClass="fa fa-table" id="rubrics-forum-icon" rendered="#{ForumTool.selectedTopic.hasRubric == 'true'}" style="margin-right:.5em" title="#{msgs.cdfm_forum_rubric}"/>
 					<h:outputText value="#{ForumTool.selectedTopic.topic.title}" styleClass="title"/>
-
-
+
 			         <h:outputText id="topic_moderated" value=" #{msgs.cdfm_forum_moderated_flag}" styleClass="childrenNewZero" rendered="#{ForumTool.selectedTopic.moderated == 'true' }" />
 
 					  <%--//designNote: for paralellism to other views, need to add read/unread count here as well as Moderated attribute--%>