SAK-31341 add the ability for a tool to suppress it's own title (saka…

…iproject#2789)
Spencerx · Jun 10, 2016 · f3c47d3 · f3c47d3
1 parent ac95f68
commit f3c47d3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java b/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/SkinnableCharonPortal.java
@@ -741,6 +741,11 @@ public Map includeTool(HttpServletResponse res, HttpServletRequest req,
 		toolMap.put("toolRenderResult", renderResult);
 		toolMap.put("hasRenderResult", Boolean.TRUE);
 		toolMap.put("toolUrl", toolUrl);
+
+		// Allow a tool to suppress the rendering of its title nav. Defaults to false if not specified, and title nav is rendered.
+		// Set suppressTitle = true to suppress
+		boolean suppressTitle = BooleanUtils.toBoolean(placement.getConfig().getProperty("suppressTitle"));
+		toolMap.put("suppressTitle", suppressTitle);
 
 		Session s = SessionManager.getCurrentSession();
 		ToolSession ts = s.getToolSession(placement.getId());

diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includePageBody.vm b/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includePageBody.vm
@@ -215,6 +215,12 @@
 
                         <!-- start include tool -->
                         <!-- start Tool Col2 -->
+
+                        <!-- start Tool Header -->
+
+                      #if (${tool.suppressTitle}) 
+                   		<!-- Tool has requested the title be suppressed -->
+                      #else
 
                         #if (${tool.hasRenderResult})
                             <nav class="Mrphs-toolTitleNav Mrphs-container Mrphs-container--toolTitleNav">
@@ -299,19 +305,22 @@
                             </nav><!-- End of nav.portlet portlet-title wrapper -->
 
                         #end ## END of IF (${tool.hasRenderResult})
-
-                        <!-- end Tool Col2 -->
-                        <!-- start Tool Body -->
-
-                        #parse("/vm/morpheus/snippets/toolBody-snippet.vm")
-
-                        <!-- end Tool Body -->
-
-                        <!-- end include tool -->
-
-                        </div>
+
+                      #end ## END of IF ( ${tool.suppressTitle} )
+
+	                  <!-- end Tool Col2 -->
+	                  <!-- start Tool Body -->
+
+	                  #parse("/vm/morpheus/snippets/toolBody-snippet.vm")
+
+	                  <!-- end Tool Body -->
+
+	                  <!-- end include tool -->
+
+	                  </div>
+
+	                  <!-- end Tool Container -->
 
-                        <!-- end Tool Container -->
 
                     #end ## END of IF ($tool)